Merge remote branch 'origin/terencehill/misc_bugfixes'

diff --git a/models/player/erebus.iqm_0.sounds b/models/player/erebus.iqm_0.sounds
new file mode 100644 (file)
index 0000000..831cc46
--- /dev/null
+++ b/models/player/erebus.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: soldier
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/soldier/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/soldier/coms/attackinfive 0
+coverme sound/player/soldier/coms/coverme 0
+defend sound/player/soldier/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/soldier/coms/freelance 2
+getflag sound/player/soldier/player/getflag 0
+incoming sound/player/soldier/coms/incoming 0
+meet sound/player/soldier/coms/meet 0
+needhelp sound/player/soldier/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/soldier/coms/seenflag 0
+taunt sound/player/soldier/coms/taunt 3
+teamshoot sound/player/soldier/coms/teamshoot 3
+death sound/player/soldier/player/death 3
+drown sound/player/soldier/player/drown 0
+fall sound/player/soldier/player/fall 0
+falling sound/player/soldier/player/falling 0
+gasp sound/player/soldier/player/gasp 0
+jump sound/player/soldier/player/jump 0
+pain25 sound/player/soldier/player/pain25 0
+pain50 sound/player/soldier/player/pain50 0
+pain75 sound/player/soldier/player/pain75 0
+pain100 sound/player/soldier/player/pain100 0

diff --git a/models/player/gak.iqm_0.sounds b/models/player/gak.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gak.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/gakarmored.iqm_0.sounds b/models/player/gakarmored.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gakarmored.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/gakmasked.iqm_0.sounds b/models/player/gakmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..fb5b767
--- /dev/null
+++ b/models/player/gakmasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: reptilian
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/reptilian/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/reptilian/coms/attackinfive 0
+coverme sound/player/reptilian/coms/coverme 0
+defend sound/player/reptilian/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/reptilian/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/reptilian/coms/incoming 0
+meet sound/player/reptilian/coms/meet 0
+needhelp sound/player/reptilian/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/reptilian/coms/seenflag 0
+taunt sound/player/reptilian/coms/taunt 3
+teamshoot sound/player/reptilian/coms/teamshoot 3
+death sound/player/reptilian/player/death 3
+drown sound/player/reptilian/player/drown 0
+fall sound/player/reptilian/player/fall 0
+falling sound/player/reptilian/player/falling 0
+gasp sound/player/reptilian/player/gasp 0
+jump sound/player/reptilian/player/jump 0
+pain25 sound/player/reptilian/player/pain25 0
+pain50 sound/player/reptilian/player/pain50 0
+pain75 sound/player/reptilian/player/pain75 0
+pain100 sound/player/reptilian/player/pain100 0

diff --git a/models/player/ignis.iqm_0.sounds b/models/player/ignis.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
+++ b/models/player/ignis.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0

diff --git a/models/player/ignishalfmasked.iqm_0.sounds b/models/player/ignishalfmasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..952ba1c
--- /dev/null
+++ b/models/player/ignishalfmasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: insurrectionist
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/insurrectionist/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/insurrectionist/coms/attackinfive 0
+coverme sound/player/insurrectionist/coms/coverme 0
+defend sound/player/insurrectionist/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/insurrectionist/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/insurrectionist/coms/incoming 0
+meet sound/player/insurrectionist/coms/meet 0
+needhelp sound/player/insurrectionist/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/insurrectionist/coms/seenflag 0
+taunt sound/player/insurrectionist/coms/taunt 4
+teamshoot sound/player/insurrectionist/coms/teamshoot 3
+death sound/player/insurrectionist/player/death 3
+drown sound/player/insurrectionist/player/drown 0
+fall sound/player/insurrectionist/player/fall 0
+falling sound/player/insurrectionist/player/falling 0
+gasp sound/player/insurrectionist/player/gasp 0
+jump sound/player/insurrectionist/player/jump 0
+pain25 sound/player/insurrectionist/player/pain25 0
+pain50 sound/player/insurrectionist/player/pain50 0
+pain75 sound/player/insurrectionist/player/pain75 0
+pain100 sound/player/insurrectionist/player/pain100 0

diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt
index 39c488c83f4aa2a869b8ee93c0da91047eb87f86..fd72a02f3f7a74c818b01a1479017bca6fdb9501 100644 (file)
--- a/models/player/ignishalfmasked.iqm_0.txt
+++ b/models/player/ignishalfmasked.iqm_0.txt
@@ -1,4 +1,4 @@
-name Ignis - HalfMasked
+name Ignis - Half Masked
 species human
 sex Male
 weight 90

diff --git a/models/player/ignismasked.iqm_0.sounds b/models/player/ignismasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..37d416d
--- /dev/null
+++ b/models/player/ignismasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: marine
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/marine/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/marine/coms/attackinfive 0
+coverme sound/player/marine/coms/coverme 0
+defend sound/player/marine/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/marine/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/marine/coms/incoming 0
+meet sound/player/marine/coms/meet 0
+needhelp sound/player/marine/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/marine/coms/seenflag 0
+taunt sound/player/marine/coms/taunt 3
+teamshoot sound/player/marine/coms/teamshoot 4
+death sound/player/marine/player/death 3
+drown sound/player/marine/player/drown 0
+fall sound/player/marine/player/fall 0
+falling sound/player/marine/player/falling 0
+gasp sound/player/marine/player/gasp 0
+jump sound/player/marine/player/jump 0
+pain25 sound/player/marine/player/pain25 0
+pain50 sound/player/marine/player/pain50 0
+pain75 sound/player/marine/player/pain75 0
+pain100 sound/player/marine/player/pain100 0

diff --git a/models/player/nyx.iqm_0.sounds b/models/player/nyx.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/nyx.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/models/player/pyria.iqm_0.sounds b/models/player/pyria.iqm_0.sounds
index 691c58f6c88eda7618a326c7f5a9eec268fba54f..3953ebc93539db597b4d1c9941b5742056e0d262 100644 (file)
--- a/models/player/pyria.iqm_0.sounds
+++ b/models/player/pyria.iqm_0.sounds
@@ -3,14 +3,14 @@
 attack sound/player/pyria-skadi/coms/attack 2
 //attacking sound/player/carni-lycan/player/attacking 0
 attackinfive sound/player/pyria-skadi/coms/attackinfive 0
-//coverme sound/player/pyria-skadi/coms/coverme 0
-//defend sound/player/pyria-skadi/coms/defend 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
 //defending sound/player/carni-lycan/player/defending 0
 //droppedflag sound/player/carni-lycan/player/droppedflag 0
 //flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
 freelance sound/player/pyria-skadi/coms/freelance 2
 //getflag sound/player/carni-lycan/player/getflag 0
-//incoming sound/player/pyria-skadi/coms/incoming 0
+incoming sound/player/pyria-skadi/coms/incoming 0
 meet sound/player/pyria-skadi/coms/meet 0
 needhelp sound/player/pyria-skadi/coms/needhelp 2
 //negative sound/player/carni-lycan/player/negative 0
@@ -22,7 +22,7 @@ taunt sound/player/pyria-skadi/coms/taunt 5
 teamshoot sound/player/pyria-skadi/coms/teamshoot 4
 death sound/player/pyria-skadi/player/death 3
 drown sound/player/pyria-skadi/player/drown 0
-//fall sound/player/carni-lycan/player/fall 0
+fall sound/player/pyria-skadi/player/fall 0
 falling sound/player/pyria-skadi/player/falling 0
 gasp sound/player/pyria-skadi/player/gasp 0
 jump sound/player/pyria-skadi/player/jump 0

diff --git a/models/player/seraphina.iqm_0.sounds b/models/player/seraphina.iqm_0.sounds
new file mode 100644 (file)
index 0000000..3953ebc
--- /dev/null
+++ b/models/player/seraphina.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: pyria-skadi
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/pyria-skadi/coms/attack 2
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/pyria-skadi/coms/attackinfive 0
+coverme sound/player/pyria-skadi/coms/coverme 0
+defend sound/player/pyria-skadi/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/carni-lycan/player/flagcarriertakingdamage 0
+freelance sound/player/pyria-skadi/coms/freelance 2
+//getflag sound/player/carni-lycan/player/getflag 0
+incoming sound/player/pyria-skadi/coms/incoming 0
+meet sound/player/pyria-skadi/coms/meet 0
+needhelp sound/player/pyria-skadi/coms/needhelp 2
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/pyria-skadi/coms/seenflag 0
+taunt sound/player/pyria-skadi/coms/taunt 5
+teamshoot sound/player/pyria-skadi/coms/teamshoot 4
+death sound/player/pyria-skadi/player/death 3
+drown sound/player/pyria-skadi/player/drown 0
+fall sound/player/pyria-skadi/player/fall 0
+falling sound/player/pyria-skadi/player/falling 0
+gasp sound/player/pyria-skadi/player/gasp 0
+jump sound/player/pyria-skadi/player/jump 0
+pain25 sound/player/pyria-skadi/player/pain25 0
+pain50 sound/player/pyria-skadi/player/pain50 0
+pain75 sound/player/pyria-skadi/player/pain75 0
+pain100 sound/player/pyria-skadi/player/pain100 0

diff --git a/models/player/seraphinamasked.iqm_0.sounds b/models/player/seraphinamasked.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/seraphinamasked.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/models/player/umbra.iqm_0.sounds b/models/player/umbra.iqm_0.sounds
new file mode 100644 (file)
index 0000000..00eabbd
--- /dev/null
+++ b/models/player/umbra.iqm_0.sounds
@@ -0,0 +1,32 @@
+//TAG: specop
+//affirmative sound/player/carni-lycan/player/affirmative 0
+attack sound/player/specop/coms/attack 0
+//attacking sound/player/carni-lycan/player/attacking 0
+attackinfive sound/player/specop/coms/attackinfive 0
+coverme sound/player/specop/coms/coverme 0
+defend sound/player/specop/coms/defend 0
+//defending sound/player/carni-lycan/player/defending 0
+//droppedflag sound/player/carni-lycan/player/droppedflag 0
+//flagcarriertakingdamage sound/player/soldier/player/flagcarriertakingdamage 0
+freelance sound/player/specop/coms/freelance 2
+//getflag sound/player/soldier/player/getflag 0
+incoming sound/player/specop/coms/incoming 0
+meet sound/player/specop/coms/meet 0
+needhelp sound/player/specop/coms/needhelp 0
+//negative sound/player/carni-lycan/player/negative 0
+//onmyway sound/player/carni-lycan/player/onmyway 0
+//roaming sound/player/carni-lycan/player/roaming 0
+//seenenemy sound/player/carni-lycan/player/seenenemy 0
+seenflag sound/player/specop/coms/seenflag 0
+taunt sound/player/specop/coms/taunt 4
+teamshoot sound/player/specop/coms/teamshoot 4
+death sound/player/specop/player/death 3
+drown sound/player/specop/player/drown 0
+fall sound/player/specop/player/fall 0
+falling sound/player/specop/player/falling 0
+gasp sound/player/specop/player/gasp 0
+jump sound/player/specop/player/jump 0
+pain25 sound/player/specop/player/pain25 0
+pain50 sound/player/specop/player/pain50 0
+pain75 sound/player/specop/player/pain75 0
+pain100 sound/player/specop/player/pain100 0

diff --git a/sound/player/insurrectionist/player/fall.ogg b/sound/player/insurrectionist/player/fall.ogg
new file mode 100644 (file)
index 0000000..37ed50a
Binary files /dev/null and b/sound/player/insurrectionist/player/fall.ogg differ

diff --git a/sound/player/insurrectionist/player/fall1.ogg b/sound/player/insurrectionist/player/fall1.ogg
deleted file mode 100644 (file)
index 37ed50a..0000000
Binary files a/sound/player/insurrectionist/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/marine/player/fall.ogg b/sound/player/marine/player/fall.ogg
new file mode 100644 (file)
index 0000000..b076a65
Binary files /dev/null and b/sound/player/marine/player/fall.ogg differ

diff --git a/sound/player/marine/player/fall1.ogg b/sound/player/marine/player/fall1.ogg
deleted file mode 100644 (file)
index b076a65..0000000
Binary files a/sound/player/marine/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/pyria-skadi/player/fall.ogg b/sound/player/pyria-skadi/player/fall.ogg
new file mode 100644 (file)
index 0000000..eecf14a
Binary files /dev/null and b/sound/player/pyria-skadi/player/fall.ogg differ

diff --git a/sound/player/pyria-skadi/player/fall1.ogg b/sound/player/pyria-skadi/player/fall1.ogg
deleted file mode 100644 (file)
index eecf14a..0000000
Binary files a/sound/player/pyria-skadi/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/reptilian/player/fall.ogg b/sound/player/reptilian/player/fall.ogg
new file mode 100644 (file)
index 0000000..f6e8bc3
Binary files /dev/null and b/sound/player/reptilian/player/fall.ogg differ

diff --git a/sound/player/reptilian/player/fall1.ogg b/sound/player/reptilian/player/fall1.ogg
deleted file mode 100644 (file)
index f6e8bc3..0000000
Binary files a/sound/player/reptilian/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/soldier/coms/flagcarriertakingdamage.ogg b/sound/player/soldier/coms/flagcarriertakingdamage.ogg
new file mode 100644 (file)
index 0000000..63ba47c
Binary files /dev/null and b/sound/player/soldier/coms/flagcarriertakingdamage.ogg differ

diff --git a/sound/player/soldier/coms/getflag.ogg b/sound/player/soldier/coms/getflag.ogg
new file mode 100644 (file)
index 0000000..a32e04d
Binary files /dev/null and b/sound/player/soldier/coms/getflag.ogg differ

diff --git a/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg b/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg
deleted file mode 100644 (file)
index 63ba47c..0000000
Binary files a/sound/player/soldier/coms/ideas/flagcarriertakingdamage.ogg and /dev/null differ

diff --git a/sound/player/soldier/coms/ideas/getourflagback.ogg b/sound/player/soldier/coms/ideas/getourflagback.ogg
deleted file mode 100644 (file)
index a32e04d..0000000
Binary files a/sound/player/soldier/coms/ideas/getourflagback.ogg and /dev/null differ

diff --git a/sound/player/soldier/player/fall.ogg b/sound/player/soldier/player/fall.ogg
new file mode 100644 (file)
index 0000000..6a75952
Binary files /dev/null and b/sound/player/soldier/player/fall.ogg differ

diff --git a/sound/player/soldier/player/fall1.ogg b/sound/player/soldier/player/fall1.ogg
deleted file mode 100644 (file)
index 6a75952..0000000
Binary files a/sound/player/soldier/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/specop/coms/needhelp.ogg b/sound/player/specop/coms/needhelp.ogg
new file mode 100644 (file)
index 0000000..729e100
Binary files /dev/null and b/sound/player/specop/coms/needhelp.ogg differ

diff --git a/sound/player/specop/coms/needhelp1.ogg b/sound/player/specop/coms/needhelp1.ogg
deleted file mode 100644 (file)
index 729e100..0000000
Binary files a/sound/player/specop/coms/needhelp1.ogg and /dev/null differ

diff --git a/sound/player/specop/player/fall.ogg b/sound/player/specop/player/fall.ogg
new file mode 100644 (file)
index 0000000..d6c1940
Binary files /dev/null and b/sound/player/specop/player/fall.ogg differ

diff --git a/sound/player/specop/player/fall1.ogg b/sound/player/specop/player/fall1.ogg
deleted file mode 100644 (file)
index d6c1940..0000000
Binary files a/sound/player/specop/player/fall1.ogg and /dev/null differ

diff --git a/sound/player/torus/attack.ogg b/sound/player/torus/attack.ogg
deleted file mode 100644 (file)
index ec85b07..0000000
Binary files a/sound/player/torus/attack.ogg and /dev/null differ

diff --git a/sound/player/torus/coms/attack.ogg b/sound/player/torus/coms/attack.ogg
new file mode 100644 (file)
index 0000000..ec85b07
Binary files /dev/null and b/sound/player/torus/coms/attack.ogg differ

diff --git a/sound/player/torus/coms/coverme.ogg b/sound/player/torus/coms/coverme.ogg
new file mode 100644 (file)
index 0000000..81be7a3
Binary files /dev/null and b/sound/player/torus/coms/coverme.ogg differ

diff --git a/sound/player/torus/coms/incoming.ogg b/sound/player/torus/coms/incoming.ogg
new file mode 100644 (file)
index 0000000..dd3fdd8
Binary files /dev/null and b/sound/player/torus/coms/incoming.ogg differ

diff --git a/sound/player/torus/coms/jump.ogg b/sound/player/torus/coms/jump.ogg
new file mode 100644 (file)
index 0000000..fbb0d64
Binary files /dev/null and b/sound/player/torus/coms/jump.ogg differ

diff --git a/sound/player/torus/coms/letsgo.ogg b/sound/player/torus/coms/letsgo.ogg
new file mode 100644 (file)
index 0000000..8bf3d29
Binary files /dev/null and b/sound/player/torus/coms/letsgo.ogg differ

diff --git a/sound/player/torus/coms/needhelp.ogg b/sound/player/torus/coms/needhelp.ogg
new file mode 100644 (file)
index 0000000..5f6bd6d
Binary files /dev/null and b/sound/player/torus/coms/needhelp.ogg differ

diff --git a/sound/player/torus/coms/seenflag.ogg b/sound/player/torus/coms/seenflag.ogg
new file mode 100644 (file)
index 0000000..a295614
Binary files /dev/null and b/sound/player/torus/coms/seenflag.ogg differ

diff --git a/sound/player/torus/coms/taunt1.ogg b/sound/player/torus/coms/taunt1.ogg
new file mode 100644 (file)
index 0000000..197c462
Binary files /dev/null and b/sound/player/torus/coms/taunt1.ogg differ

diff --git a/sound/player/torus/coms/taunt2.ogg b/sound/player/torus/coms/taunt2.ogg
new file mode 100644 (file)
index 0000000..b9de0af
Binary files /dev/null and b/sound/player/torus/coms/taunt2.ogg differ

diff --git a/sound/player/torus/coms/teamshoot.ogg b/sound/player/torus/coms/teamshoot.ogg
new file mode 100644 (file)
index 0000000..51e1410
Binary files /dev/null and b/sound/player/torus/coms/teamshoot.ogg differ

diff --git a/sound/player/torus/coms/waypoint.ogg b/sound/player/torus/coms/waypoint.ogg
new file mode 100644 (file)
index 0000000..45bfb16
Binary files /dev/null and b/sound/player/torus/coms/waypoint.ogg differ

diff --git a/sound/player/torus/coverme.ogg b/sound/player/torus/coverme.ogg
deleted file mode 100644 (file)
index 81be7a3..0000000
Binary files a/sound/player/torus/coverme.ogg and /dev/null differ

diff --git a/sound/player/torus/death.ogg b/sound/player/torus/death.ogg
deleted file mode 100644 (file)
index 43ef547..0000000
Binary files a/sound/player/torus/death.ogg and /dev/null differ

diff --git a/sound/player/torus/drown.ogg b/sound/player/torus/drown.ogg
deleted file mode 100644 (file)
index 0b7bd8d..0000000
Binary files a/sound/player/torus/drown.ogg and /dev/null differ

diff --git a/sound/player/torus/fall.ogg b/sound/player/torus/fall.ogg
deleted file mode 100644 (file)
index 88e62ff..0000000
Binary files a/sound/player/torus/fall.ogg and /dev/null differ

diff --git a/sound/player/torus/flagseen.ogg b/sound/player/torus/flagseen.ogg
deleted file mode 100644 (file)
index a295614..0000000
Binary files a/sound/player/torus/flagseen.ogg and /dev/null differ

diff --git a/sound/player/torus/gasp.ogg b/sound/player/torus/gasp.ogg
deleted file mode 100644 (file)
index 6551083..0000000
Binary files a/sound/player/torus/gasp.ogg and /dev/null differ

diff --git a/sound/player/torus/hooah.ogg b/sound/player/torus/hooah.ogg
deleted file mode 100644 (file)
index b9de0af..0000000
Binary files a/sound/player/torus/hooah.ogg and /dev/null differ

diff --git a/sound/player/torus/incoming.ogg b/sound/player/torus/incoming.ogg
deleted file mode 100644 (file)
index dd3fdd8..0000000
Binary files a/sound/player/torus/incoming.ogg and /dev/null differ

diff --git a/sound/player/torus/jump.ogg b/sound/player/torus/jump.ogg
deleted file mode 100644 (file)
index fbb0d64..0000000
Binary files a/sound/player/torus/jump.ogg and /dev/null differ

diff --git a/sound/player/torus/letsgo.ogg b/sound/player/torus/letsgo.ogg
deleted file mode 100644 (file)
index 8bf3d29..0000000
Binary files a/sound/player/torus/letsgo.ogg and /dev/null differ

diff --git a/sound/player/torus/needhelp.ogg b/sound/player/torus/needhelp.ogg
deleted file mode 100644 (file)
index 5f6bd6d..0000000
Binary files a/sound/player/torus/needhelp.ogg and /dev/null differ

diff --git a/sound/player/torus/pain100.ogg b/sound/player/torus/pain100.ogg
deleted file mode 100644 (file)
index eec5acc..0000000
Binary files a/sound/player/torus/pain100.ogg and /dev/null differ

diff --git a/sound/player/torus/pain25.ogg b/sound/player/torus/pain25.ogg
deleted file mode 100644 (file)
index ab2a226..0000000
Binary files a/sound/player/torus/pain25.ogg and /dev/null differ

diff --git a/sound/player/torus/pain50.ogg b/sound/player/torus/pain50.ogg
deleted file mode 100644 (file)
index 023d7a6..0000000
Binary files a/sound/player/torus/pain50.ogg and /dev/null differ

diff --git a/sound/player/torus/pain75.ogg b/sound/player/torus/pain75.ogg
deleted file mode 100644 (file)
index 65b45cf..0000000
Binary files a/sound/player/torus/pain75.ogg and /dev/null differ

diff --git a/sound/player/torus/player/death.ogg b/sound/player/torus/player/death.ogg
new file mode 100644 (file)
index 0000000..43ef547
Binary files /dev/null and b/sound/player/torus/player/death.ogg differ

diff --git a/sound/player/torus/player/drown.ogg b/sound/player/torus/player/drown.ogg
new file mode 100644 (file)
index 0000000..0b7bd8d
Binary files /dev/null and b/sound/player/torus/player/drown.ogg differ

diff --git a/sound/player/torus/player/fall.ogg b/sound/player/torus/player/fall.ogg
new file mode 100644 (file)
index 0000000..88e62ff
Binary files /dev/null and b/sound/player/torus/player/fall.ogg differ

diff --git a/sound/player/torus/player/gasp.ogg b/sound/player/torus/player/gasp.ogg
new file mode 100644 (file)
index 0000000..6551083
Binary files /dev/null and b/sound/player/torus/player/gasp.ogg differ

diff --git a/sound/player/torus/player/pain100.ogg b/sound/player/torus/player/pain100.ogg
new file mode 100644 (file)
index 0000000..eec5acc
Binary files /dev/null and b/sound/player/torus/player/pain100.ogg differ

diff --git a/sound/player/torus/player/pain25.ogg b/sound/player/torus/player/pain25.ogg
new file mode 100644 (file)
index 0000000..ab2a226
Binary files /dev/null and b/sound/player/torus/player/pain25.ogg differ

diff --git a/sound/player/torus/player/pain50.ogg b/sound/player/torus/player/pain50.ogg
new file mode 100644 (file)
index 0000000..023d7a6
Binary files /dev/null and b/sound/player/torus/player/pain50.ogg differ

diff --git a/sound/player/torus/player/pain75.ogg b/sound/player/torus/player/pain75.ogg
new file mode 100644 (file)
index 0000000..65b45cf
Binary files /dev/null and b/sound/player/torus/player/pain75.ogg differ

diff --git a/sound/player/torus/taunt.ogg b/sound/player/torus/taunt.ogg
deleted file mode 100644 (file)
index 197c462..0000000
Binary files a/sound/player/torus/taunt.ogg and /dev/null differ

diff --git a/sound/player/torus/teamshoot.ogg b/sound/player/torus/teamshoot.ogg
deleted file mode 100644 (file)
index 51e1410..0000000
Binary files a/sound/player/torus/teamshoot.ogg and /dev/null differ

diff --git a/sound/player/torus/waypoint.ogg b/sound/player/torus/waypoint.ogg
deleted file mode 100644 (file)
index 45bfb16..0000000
Binary files a/sound/player/torus/waypoint.ogg and /dev/null differ