summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-01-13 17:43:04 +0100
committerAki <nthirtyone@gmail.com>2017-01-13 17:43:04 +0100
commit76f31d8be8c310f97a39d6c6f953dbccbddb2cdd (patch)
tree0a44b4f88fbcaa3e7aff20cdf321ec5d2678c189
parent2e6c19b8cf9267a608746a62f935046a0c2a39ba (diff)
downloadroflnauts-76f31d8be8c310f97a39d6c6f953dbccbddb2cdd.zip
roflnauts-76f31d8be8c310f97a39d6c6f953dbccbddb2cdd.tar.gz
roflnauts-76f31d8be8c310f97a39d6c6f953dbccbddb2cdd.tar.bz2
music revised
-rw-r--r--assets/music/aiguillon.mp3bin0 -> 3503432 bytes
-rw-r--r--assets/music/okeanos.mp3bin0 -> 2387679 bytes
-rw-r--r--assets/music/ribbit.mp3bin0 -> 2602908 bytes
-rw-r--r--assets/music/rill.mp3bin0 -> 2808009 bytes
-rw-r--r--assets/music/rill.oggbin2755347 -> 0 bytes
-rw-r--r--assets/music/russia.mp3bin0 -> 1699167 bytes
-rw-r--r--assets/music/solar_drill.mp3bin0 -> 2204228 bytes
-rw-r--r--assets/music/sorona.mp3bin0 -> 2357341 bytes
-rw-r--r--assets/music/sorona.oggbin3242397 -> 0 bytes
-rw-r--r--assets/music/starstorm.mp3bin0 -> 3359823 bytes
-rw-r--r--assets/music/starstorm.oggbin6117961 -> 0 bytes
-rw-r--r--nautslist.lua3
12 files changed, 2 insertions, 1 deletions
diff --git a/assets/music/aiguillon.mp3 b/assets/music/aiguillon.mp3
new file mode 100644
index 0000000..fb6b928
--- /dev/null
+++ b/assets/music/aiguillon.mp3
Binary files differ
diff --git a/assets/music/okeanos.mp3 b/assets/music/okeanos.mp3
new file mode 100644
index 0000000..b657886
--- /dev/null
+++ b/assets/music/okeanos.mp3
Binary files differ
diff --git a/assets/music/ribbit.mp3 b/assets/music/ribbit.mp3
new file mode 100644
index 0000000..11906e5
--- /dev/null
+++ b/assets/music/ribbit.mp3
Binary files differ
diff --git a/assets/music/rill.mp3 b/assets/music/rill.mp3
new file mode 100644
index 0000000..a82542b
--- /dev/null
+++ b/assets/music/rill.mp3
Binary files differ
diff --git a/assets/music/rill.ogg b/assets/music/rill.ogg
deleted file mode 100644
index b36a2dd..0000000
--- a/assets/music/rill.ogg
+++ /dev/null
Binary files differ
diff --git a/assets/music/russia.mp3 b/assets/music/russia.mp3
new file mode 100644
index 0000000..d3e2c5c
--- /dev/null
+++ b/assets/music/russia.mp3
Binary files differ
diff --git a/assets/music/solar_drill.mp3 b/assets/music/solar_drill.mp3
new file mode 100644
index 0000000..818cb65
--- /dev/null
+++ b/assets/music/solar_drill.mp3
Binary files differ
diff --git a/assets/music/sorona.mp3 b/assets/music/sorona.mp3
new file mode 100644
index 0000000..8edb51e
--- /dev/null
+++ b/assets/music/sorona.mp3
Binary files differ
diff --git a/assets/music/sorona.ogg b/assets/music/sorona.ogg
deleted file mode 100644
index 5b2bb2f..0000000
--- a/assets/music/sorona.ogg
+++ /dev/null
Binary files differ
diff --git a/assets/music/starstorm.mp3 b/assets/music/starstorm.mp3
new file mode 100644
index 0000000..bcddfc0
--- /dev/null
+++ b/assets/music/starstorm.mp3
Binary files differ
diff --git a/assets/music/starstorm.ogg b/assets/music/starstorm.ogg
deleted file mode 100644
index 9cf6fb9..0000000
--- a/assets/music/starstorm.ogg
+++ /dev/null
Binary files differ
diff --git a/nautslist.lua b/nautslist.lua
index 3ff6023..b77610c 100644
--- a/nautslist.lua
+++ b/nautslist.lua
@@ -20,6 +20,7 @@ return {
"calamari", -- swiggins
"quack", -- rocco
"scissors", -- ksenia
+ "link", -- ix
"marine", -- ted
"scooter", -- penny
"phonebooth", -- sentry
@@ -28,5 +29,5 @@ return {
"gramps", -- yoolip
"biker", -- chucho
"vrooom", -- lux
- "link", -- ix
+ "shutter", -- max
}