Merge branch 'master' into mirceakitsune/voretemple_updates

diff --git a/data/maps/voretemple.map b/data/maps/voretemple.map
index ee7105a6de899532d27f60dab857df6676630139..954261cbedb8b90cb66413a66544545578f5724f 100644 (file)
--- a/data/maps/voretemple.map
+++ b/data/maps/voretemple.map
@@ -345,19 +345,19 @@ e7/e7steptop2
 {\r
 ( 384 -1216 896 ) ( 384 -1280 896 ) ( 256 -1216 896 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( 384 -1248 768 ) ( 256 -1248 768 ) ( 384 -1248 0 ) e7/e7beam01 0 0 0 1.5 1.5 134217728 0 0\r
-( 384 -1216 768 ) ( 384 -1216 0 ) ( 384 -1280 768 ) e7/e7beam01 0 0 0 0.5 0.5 134217728 0 0\r
+( 384 -1216 768 ) ( 384 -1216 0 ) ( 384 -1280 768 ) e7/e7brnmetal 0 0 0 0.5 0.5 134217728 0 0\r
 ( 256 -1280 0 ) ( 384 -1280 0 ) ( 256 -1216 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( 256 -1280 0 ) ( 256 -1280 768 ) ( 384 -1280 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
-( 288 -1248 192 ) ( 256 -1280 64 ) ( 288 -1248 64 ) e7/e7beam01 0 0 0 0.5 0.5 134217728 0 0\r
+( 288 -1248 192 ) ( 256 -1280 64 ) ( 288 -1248 64 ) e7/e7brnmetal 0 0 0 0.5 0.5 134217728 0 0\r
 }\r
 // brush 28\r
 {\r
 ( -256 -1216 896 ) ( -384 -1280 896 ) ( -384 -1216 896 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( -384 -1248 0 ) ( -256 -1248 768 ) ( -384 -1248 768 ) e7/e7beam01 0 0 0 1.5 1.5 134217728 0 0\r
-( -384 -1280 768 ) ( -384 -1216 0 ) ( -384 -1216 768 ) e7/e7beam01 0 0 0 0.5 0.5 134217728 0 0\r
+( -384 -1280 768 ) ( -384 -1216 0 ) ( -384 -1216 768 ) e7/e7brnmetal 0 0 0 0.5 0.5 134217728 0 0\r
 ( -256 -1216 0 ) ( -384 -1280 0 ) ( -256 -1280 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
 ( -384 -1280 0 ) ( -256 -1280 768 ) ( -256 -1280 0 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0\r
-( -288 -1248 -64 ) ( -256 -1280 -64 ) ( -288 -1248 64 ) e7/e7beam01 0 0 0 0.5 0.5 134217728 0 0\r
+( -288 -1248 -64 ) ( -256 -1280 -64 ) ( -288 -1248 64 ) e7/e7brnmetal 0 0 0 0.5 0.5 134217728 0 0\r
 }\r
 // brush 29\r
 {\r
@@ -5345,7 +5345,7 @@ e7/e7panelwood
 // entity 30\r
 {\r
 "classname" "trigger_multiple"\r
-"message" "^3Gate guardian: ^7Welcome to Vore Town. Enjoy your stay... in our town or its inhabitants."\r
+"message" "^3Gate guardian: ^7Welcome to Vore Temple. Enjoy your stay... in our temple or its visitors."\r
 "wait" "2"\r
 "target" "disarm"\r
 // brush 0\r
@@ -5469,7 +5469,7 @@ e7/e7panelwood
 // entity 34\r
 {\r
 "classname" "trigger_multiple"\r
-"message" "^3Operator: ^7Ah yes. I upgraded this computer to a 32-core 16Ghz processor, and it's still so slow! Oh wait... we're in a medieval town!"\r
+"message" "^3Operator: ^7Ah yes. I upgraded this computer to a 32-core 16Ghz processor, and it's still so slow! Oh wait... we're in a medieval temple!"\r
 "wait" "2"\r
 // brush 0\r
 {\r
@@ -5586,7 +5586,7 @@ e7/e7panelwood
 {\r
 "classname" "target_speaker"\r
 "origin" "-576.000000 640.000000 48.000000"\r
-"noise" "sound/player/pyria-skadi/player/regurgitate_prepare.ogg"\r
+"noise" "sound/player/female/player/regurgitate_prepare.ogg"\r
 }\r
 // entity 44\r
 {\r
@@ -5648,7 +5648,7 @@ e7/e7panelwood
 {\r
 "classname" "target_speaker"\r
 "origin" "-32.000000 1232.000000 96.000000"\r
-"noise" "sound/player/pyria-skadi/player/regurgitate_prepare.ogg"\r
+"noise" "sound/player/female/player/regurgitate_prepare.ogg"\r
 }\r
 // entity 49\r
 {\r
@@ -5680,13 +5680,13 @@ e7/e7panelwood
 {\r
 "classname" "target_speaker"\r
 "origin" "-576.000000 -320.000000 48.000000"\r
-"noise" "sound/player/pyria-skadi/player/pain25.ogg"\r
+"noise" "sound/player/female/player/pain25.ogg"\r
 }\r
 // entity 52\r
 {\r
 "classname" "target_speaker"\r
 "origin" "-576.000000 -320.000000 64.000000"\r
-"noise" "sound/player/digest.wav"\r
+"noise" "sound/player/female/player/digest.ogg"\r
 }\r
 // entity 53\r
 {\r
@@ -10090,7 +10090,7 @@ common/invisible
 // entity 272\r
 {\r
 "classname" "trigger_multiple"\r
-"message" "^3Full vixen: ^7Ugh, sorry for my belly blocking the way. This is a vore town after all, and like everyone else I must eat."\r
+"message" "^3Full vixen: ^7Ugh, sorry for my belly blocking the way. This is a vore temple after all, and like everyone else I must eat."\r
 "wait" "2"\r
 "target" "disarm4"\r
 // brush 0\r
@@ -22391,3 +22391,187 @@ common/invisible
 }\r
 }\r
 }\r
+// entity 779\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-576.000000 640.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 780\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-576.000000 -320.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 781\r
+{\r
+"classname" "target_speaker"\r
+"origin" "1760.000000 192.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 782\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3392.000000 64.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 783\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3456.000000 64.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 784\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3520.000000 -384.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 785\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-352.000000 320.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 786\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-1024.000000 -1248.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 787\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-1024.000000 -1024.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 788\r
+{\r
+"classname" "target_speaker"\r
+"origin" "1024.000000 -800.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 789\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-1216.000000 -1024.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.33"\r
+}\r
+// entity 790\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-2176.000000 288.000000 288.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 791\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-32.000000 1232.000000 80.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 792\r
+{\r
+"classname" "target_speaker"\r
+"origin" "2944.000000 -448.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 793\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3456.000000 192.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 794\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3456.000000 288.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 795\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3264.000000 384.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 796\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3136.000000 384.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 797\r
+{\r
+"classname" "target_speaker"\r
+"origin" "-992.000000 -832.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "0.66"\r
+}\r
+// entity 798\r
+{\r
+"classname" "target_speaker"\r
+"origin" "640.000000 1216.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "1"\r
+}\r
+// entity 799\r
+{\r
+"classname" "target_speaker"\r
+"origin" "1152.000000 288.000000 40.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "1"\r
+}\r
+// entity 800\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3392.000000 -192.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "1"\r
+}\r
+// entity 801\r
+{\r
+"classname" "target_speaker"\r
+"origin" "3456.000000 448.000000 32.000000"\r
+"noise" "sound/player/female/player/gurgle.ogg"\r
+"atten" "3.9"\r
+"volume" "1"\r
+}\r