Merge branch 'master' into fruitiex/g-23sounds

[xonotic/xonotic-maps.pk3dir.git] / maps / g-23.map

diff --git a/maps/g-23.map b/maps/g-23.map
index e96386cad78c64d1afce9d2db4a7a8a5568ab369..ce54e7634cae41cda1bc2df3ddb72df44cad176a 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -11726,6 +11726,7 @@ exx/wall-metalrib01
 {
 "classname" "func_plat"
 "speed" "300"
+"sound1" "sounds/machines/Elevator_Up.wav"
 {
 ( 576 -192 0 ) ( 576 -256 0 ) ( 512 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( 576 -192 -32 ) ( 512 -192 -32 ) ( 576 -192 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
@@ -11890,10 +11891,10 @@ exx/wall-metalrib01
 }
 {
 "classname" "misc_model"
-"origin" "520.000000 -1248.000000 112.000000"
+"origin" "528.000000 -1244.000000 120.000000"
 "model" "models/it/pc.md3"
-"angle" "-180.000000"
 "spawnflags" "2"
+"angles" "90.000000 0.000000 150.000000"
 }
 {
 "classname" "misc_model"
@@ -12088,7 +12089,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "2240.000000 -960.000000 160.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.ogg"
 "angle" "-179.999985"
 "atten" "1.5"
 "volume" "1"
@@ -12096,7 +12097,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "128.000000 -1024.000000 -224.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.ogg"
 "angle" "-179.999985"
 "atten" "3"
 "volume" "0.5"
@@ -12318,7 +12319,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "1472.000000 960.000000 176.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.wav"
 "angle" "-179.999985"
 "atten" "1.25"
 "volume" "1"
@@ -12609,7 +12610,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "-1152.000000 0.000000 -368.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.ogg"
 "angle" "-179.999985"
 "atten" "3"
 "volume" "0.5"
@@ -12617,7 +12618,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "-896.000000 1024.000000 -112.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.ogg"
 "angle" "-179.999985"
 "atten" "3"
 "volume" "0.5"
@@ -12625,7 +12626,7 @@ exx/wall-metalrib01
 {
 "classname" "target_speaker"
 "origin" "-896.000000 -1024.000000 -272.000000"
-"noise" "sound/wind/ac_duct_wind.ogg"
+"noise" "sounds/wind/ac_duct_wind.ogg"
 "angle" "-179.999985"
 "atten" "3"
 "volume" "0.5"
@@ -14428,3 +14429,43 @@ exx/wall-metalrib01
 ( -392 928 64 ) ( -512 928 48 ) ( -512 928 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
+{
+"classname" "target_speaker"
+"origin" "664.000000 344.000000 -352.000000"
+"noise" "sounds/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-1648.000000 0.000000 -544.000000"
+"noise" "sounds/supernatural/space-loop.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1536.000000 -1024.000000 240.000000"
+"noise" "sounds/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "832.000000 -1024.000000 240.000000"
+"noise" "sounds/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "320.000000 0.000000 240.000000"
+"noise" "sounds/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "320.000000 -1024.000000 240.000000"
+"noise" "sounds/machines/Lights(Mono).wav"
+"volume" "0.6"
+}
+{
+"classname" "target_speaker"
+"origin" "524.000000 -1256.000000 136.000000"
+"noise" "sounds/machines/Electric-Arcs2.wav"
+"volume" "0.3"
+}