Cut down on the number of target_speakers.

Due to some autistic engine design, every speaker needs its own configstring
to know what to play (even though it's in the .bsp). This causes *serious*
in large games if there are too many speakers on the map. Gamestate can
get too long to send to clients, effectively killing the server.

5 files changed, 256 insertions, 516 deletions

diff --git a/maps/p10_nexus.map b/maps/p10_nexus.map
index 08c188d..81ad289 100644
--- a/maps/p10_nexus.map
+++ b/maps/p10_nexus.map
@@ -7234,53 +7234,25 @@ nexus6/pipe02_64
 // entity 47
 {
 "classname" "target_speaker"
-"origin" "856.000000 -560.000000 -16.000000"
-"spawnflags" "1"
-"noise" "sound/analmango/ambient_1.wav"
-}
-// entity 48
-{
-"classname" "target_speaker"
 "origin" "992.000000 496.000000 -184.000000"
 "spawnflags" "1"
 "noise" "sound/ambient/water_rush.wav"
 }
-// entity 49
+// entity 48
 {
 "classname" "target_speaker"
 "origin" "864.000000 96.000000 144.000000"
 "spawnflags" "1"
 "noise" "sound/analmango/ambient_1.wav"
 }
-// entity 50
-{
-"classname" "target_speaker"
-"origin" "1104.000000 -264.000000 144.000000"
-"spawnflags" "1"
-"noise" "sound/analmango/ambient_1.wav"
-}
-// entity 51
-{
-"classname" "target_speaker"
-"origin" "1120.000000 -608.000000 -152.000000"
-"spawnflags" "1"
-"noise" "sound/ambient/water_rush.wav"
-}
-// entity 52
+// entity 49
 {
 "classname" "target_speaker"
 "origin" "816.000000 -408.000000 -152.000000"
 "spawnflags" "1"
 "noise" "sound/ambient/water_rush.wav"
 }
-// entity 53
-{
-"classname" "target_speaker"
-"origin" "976.000000 16.000000 -152.000000"
-"spawnflags" "1"
-"noise" "sound/ambient/water_rush.wav"
-}
-// entity 54
+// entity 50
 {
 "classname" "func_door"
 "angle" "-2"
@@ -7304,7 +7276,7 @@ nexus6/pipe02_64
 ( 1408 1048 -128 ) ( 1408 1088 -128 ) ( 1408 1048 88 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 55
+// entity 51
 {
 "classname" "misc_particle_system"
 "origin" "1536.000000 1968.000000 -56.000000"
@@ -7312,14 +7284,14 @@ nexus6/pipe02_64
 "psName" "analmango_rocket"
 "targetname" "rocket_ps"
 }
-// entity 56
+// entity 52
 {
 "classname" "target_relay"
 "origin" "1472.000000 1224.000000 -16.000000"
 "target" "explosion_ps"
 "targetname" "explosion"
 }
-// entity 57
+// entity 53
 {
 "classname" "target_delay"
 "origin" "1472.000000 1176.000000 -16.000000"
@@ -7327,7 +7299,7 @@ nexus6/pipe02_64
 "target" "explosion_ps"
 "wait" "1"
 }
-// entity 58
+// entity 54
 {
 "classname" "misc_particle_system"
 "origin" "1536.000000 1096.000000 -56.000000"
@@ -7335,7 +7307,7 @@ nexus6/pipe02_64
 "psName" "analmango_explosion"
 "targetname" "explosion_ps"
 }
-// entity 59
+// entity 55
 {
 "classname" "target_delay"
 "origin" "1504.000000 1832.000000 -56.000000"
@@ -7343,14 +7315,14 @@ nexus6/pipe02_64
 "target" "rocket_ps"
 "targetname" "rocket"
 }
-// entity 60
+// entity 56
 {
 "classname" "target_relay"
 "origin" "1504.000000 1800.000000 -56.000000"
 "targetname" "rocket"
 "target" "rocket_ps"
 }
-// entity 61
+// entity 57
 {
 "classname" "target_delay"
 "origin" "1472.000000 1760.000000 -56.000000"
@@ -7358,7 +7330,7 @@ nexus6/pipe02_64
 "target" "explosion"
 "wait" "0.4"
 }
-// entity 62
+// entity 58
 {
 "classname" "target_speaker"
 "origin" "1760.000000 1216.000000 -216.000000"
@@ -7366,14 +7338,14 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 63
+// entity 59
 {
 "classname" "target_speaker"
 "origin" "1536.000000 1968.000000 -56.000000"
 "targetname" "rocket"
 "noise" "sound/analmango/cannon.wav"
 }
-// entity 64
+// entity 60
 {
 "classname" "func_door"
 "targetname" "rocket"
@@ -7471,7 +7443,7 @@ nexus6/pipe02_64
 ( 1526.75 1920 -56 ) ( 1531.25 1984 -48 ) ( 1526.75 1984 -56 ) nexus6/e8_base1b 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 65
+// entity 61
 {
 "classname" "target_speaker"
 "origin" "1432.000000 1936.000000 -56.000000"
@@ -7479,7 +7451,7 @@ nexus6/pipe02_64
 "targetname" "spell"
 "spawnflags" "8"
 }
-// entity 66
+// entity 62
 {
 "classname" "target_delay"
 "origin" "1472.000000 1936.000000 -56.000000"
@@ -7487,7 +7459,7 @@ nexus6/pipe02_64
 "target" "rocket"
 "wait" "4"
 }
-// entity 67
+// entity 63
 {
 "classname" "trigger_multiple"
 "wait" "-1"
@@ -7502,7 +7474,7 @@ nexus6/pipe02_64
 ( 1534 1992 8 ) ( 1534 2013 -8 ) ( 1534 2013 8 ) common/trigger 48 20 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 68
+// entity 64
 {
 "classname" "target_speaker"
 "origin" "1440.000000 1016.000000 -168.000000"
@@ -7510,120 +7482,92 @@ nexus6/pipe02_64
 "noise" "sound/analmango/thunder_strike_far.wav"
 "spawnflags" "4"
 }
-// entity 69
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 70
-{
-"classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 71
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "speaker"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 72
+// entity 65
 {
 "classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
+"origin" "1536.000000 1032.000000 -168.000000"
 "targetname" "speaker"
 "noise" "sound/analmango/explosion.wav"
 }
-// entity 73
+// entity 66
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 96.000000"
 "light" "1000"
 }
-// entity 74
+// entity 67
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 -168.000000"
 "light" "1000"
 }
-// entity 75
+// entity 68
 {
 "classname" "light"
 "origin" "1288.000000 1032.000000 -40.000000"
 "light" "1000"
 }
-// entity 76
+// entity 69
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 96.000000"
 "light" "1000"
 }
-// entity 77
+// entity 70
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 -40.000000"
 "light" "1000"
 }
-// entity 78
+// entity 71
 {
 "classname" "light"
 "origin" "1744.000000 1328.000000 -168.000000"
 "light" "1000"
 }
-// entity 79
+// entity 72
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 96.000000"
 "light" "1000"
 }
-// entity 80
+// entity 73
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 -40.000000"
 "light" "1000"
 }
-// entity 81
+// entity 74
 {
 "classname" "light"
 "origin" "1800.000000 1328.000000 -168.000000"
 "light" "1000"
 }
-// entity 82
+// entity 75
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 96.000000"
 "light" "1000"
 }
-// entity 83
+// entity 76
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 -40.000000"
 "light" "1000"
 }
-// entity 84
+// entity 77
 {
 "classname" "light"
 "origin" "1288.000000 976.000000 -168.000000"
 "light" "1000"
 }
-// entity 85
+// entity 78
 {
 "classname" "target_location"
 "origin" "1512.000000 1472.000000 40.000000"
 "message" "Cannon room"
 }
-// entity 86
-{
-"classname" "target_speaker"
-"origin" "1600.000000 1000.000000 -168.000000"
-"targetname" "explosion"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 87
+// entity 79
 {
 "classname" "target_speaker"
 "origin" "1408.000000 992.000000 -216.000000"
@@ -7631,7 +7575,7 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 88
+// entity 80
 {
 "classname" "target_speaker"
 "origin" "1704.000000 984.000000 -216.000000"
@@ -7639,7 +7583,7 @@ nexus6/pipe02_64
 "noise" "sound/ambient/water_rush.wav"
 "spawnflags" "2"
 }
-// entity 89
+// entity 81
 {
 "classname" "target_rumble"
 "origin" "1608.000000 1984.000000 -48.000000"
@@ -7647,14 +7591,7 @@ nexus6/pipe02_64
 "count" "1"
 "targetname" "explosion"
 }
-// entity 90
-{
-"classname" "target_speaker"
-"origin" "1480.000000 1000.000000 -168.000000"
-"targetname" "explosion"
-"noise" "sound/analmango/explosion.wav"
-}
-// entity 91
+// entity 82
 {
 "classname" "target_speaker"
 "origin" "1318.000000 2074.000000 -18.000000"
@@ -7662,13 +7599,13 @@ nexus6/pipe02_64
 "noise" "sound/analmango/computer2.wav"
 "angle" "-24.582417"
 }
-// entity 92
+// entity 83
 {
 "classname" "light"
 "origin" "1390.000000 2018.000000 -10.000000"
 "light" "30"
 }
-// entity 93
+// entity 84
 {
 "classname" "target_speaker"
 "origin" "1400.000000 2018.000000 -10.000000"
@@ -7676,7 +7613,7 @@ nexus6/pipe02_64
 "noise" "sound/analmango/computer6.wav"
 "angle" "-24.582417"
 }
-// entity 94
+// entity 85
 {
 "classname" "target_speaker"
 "origin" "1536.000000 2168.000000 -56.000000"
diff --git a/maps/p3_dretchpwner.map b/maps/p3_dretchpwner.map
index 1338005..509e929 100644
--- a/maps/p3_dretchpwner.map
+++ b/maps/p3_dretchpwner.map
@@ -2599,29 +2599,6 @@ nexus6/brown_hose_s
 }
 // entity 74
 {
-"classname" "func_button"
-"target" "wtf_1"
-// brush 0
-{
-( -1560 -104 -224 ) ( -1552 -120 -224 ) ( -1560 -120 -224 ) niveus/achtung_clang_128 32 48 90 0.5 0.5 134217728 0 0
-( -1552 -104 -240 ) ( -1560 -104 -224 ) ( -1560 -104 -240 ) niveus/achtung_clang_128 0 48 90 0.5 0.5 134217728 0 0
-( -1552 -104 -224 ) ( -1552 -120 -240 ) ( -1552 -120 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
-( -1552 -104 -240 ) ( -1560 -120 -240 ) ( -1552 -120 -240 ) niveus/achtung_clang_128 32 48 90 0.5 0.5 134217728 0 0
-( -1552 -120 -224 ) ( -1560 -120 -240 ) ( -1560 -120 -224 ) niveus/achtung_clang_128 0 48 90 0.5 0.5 134217728 0 0
-( -1560 -104 -240 ) ( -1560 -120 -224 ) ( -1560 -120 -240 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
-}
-}
-// entity 75
-{
-"classname" "target_speaker"
-"origin" "-1592.000000 -40.000000 -232.000000"
-"noise" "sound/analmango/the_cia_niggers.wav"
-"targetname" "wtf_12"
-"angle" "-90.000000"
-"spawnflags" "4"
-}
-// entity 76
-{
 "classname" "target_speaker"
 "origin" "-1568.000000 -144.000000 -232.000000"
 "noise" "sound/analmango/der_fuhrer.wav"
@@ -2629,16 +2606,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 77
-{
-"classname" "target_speaker"
-"origin" "-1568.000000 -112.000000 -232.000000"
-"spawnflags" "4"
-"noise" "sound/analmango/o_kurwa.wav"
-"angle" "-179.999985"
-"targetname" "wtf_1"
-}
-// entity 78
+// entity 75
 {
 "classname" "func_door"
 "targetname" "pwner_end_2"
@@ -2655,7 +2623,7 @@ nexus6/brown_hose_s
 ( -1712 -344 -208 ) ( -1712 -304 -208 ) ( -1712 -344 -160 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 79
+// entity 76
 {
 "classname" "func_door"
 "angle" "90"
@@ -2679,7 +2647,7 @@ nexus6/brown_hose_s
 ( -1940 -92 -400 ) ( -1940 -60 -400 ) ( -1940 -92 -384 ) common/nodrawnonsolid 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 80
+// entity 77
 {
 "classname" "func_button"
 "speed" "13337"
@@ -2695,7 +2663,7 @@ nexus6/brown_hose_s
 ( -2088 -8 -412 ) ( -2104 -8 -412 ) ( -2088 -8 -364 ) nexus6/proto_lightred_64_300 32 48 0 -0.25 0.25 134217728 0 0
 }
 }
-// entity 81
+// entity 78
 {
 "classname" "target_relay"
 "origin" "-2048.000000 -48.000000 -380.000000"
@@ -2703,7 +2671,7 @@ nexus6/brown_hose_s
 "target" "target_print1"
 "spawnflags" "2"
 }
-// entity 82
+// entity 79
 {
 "classname" "trigger_hurt"
 "spawnflags" "20"
@@ -2727,7 +2695,7 @@ nexus6/brown_hose_s
 ( -1672 -344 -248 ) ( -1672 -24 -248 ) ( -1672 -344 -208 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 83
+// entity 80
 {
 "classname" "target_relay"
 "origin" "-2048.000000 -16.000000 -380.000000"
@@ -2735,7 +2703,7 @@ nexus6/brown_hose_s
 "target" "func_door11"
 "spawnflags" "1"
 }
-// entity 84
+// entity 81
 {
 "classname" "target_print"
 "origin" "-2048.000000 -80.000000 -384.000000"
@@ -2743,14 +2711,14 @@ nexus6/brown_hose_s
 "message" "A human is needed to activate this."
 "spawnflags" "4"
 }
-// entity 85
+// entity 82
 {
 "classname" "target_position"
 "origin" "-1936.000000 36.000000 -292.000000"
 "angle" "-90.000000"
 "targetname" "target_position3"
 }
-// entity 86
+// entity 83
 {
 "classname" "trigger_multiple"
 "target" "pwner_start"
@@ -2773,14 +2741,14 @@ nexus6/brown_hose_s
 ( -1868 192 -312 ) ( -1868 228 -312 ) ( -1868 192 -272 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 87
+// entity 84
 {
 "classname" "target_teleporter"
 "origin" "-1936.000000 84.000000 -292.000000"
 "target" "target_position3"
 "targetname" "pwner_start"
 }
-// entity 88
+// entity 85
 {
 "classname" "target_speaker"
 "origin" "-1568.000000 -176.000000 -232.000000"
@@ -2789,7 +2757,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 89
+// entity 86
 {
 "classname" "func_button"
 "target" "wtf_5"
@@ -2803,21 +2771,7 @@ nexus6/brown_hose_s
 ( -1560 -248 -224 ) ( -1560 -232 -240 ) ( -1560 -232 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 90
-{
-"classname" "func_button"
-"target" "wtf_6"
-// brush 0
-{
-( -1552 -280 -224 ) ( -1560 -264 -224 ) ( -1552 -264 -224 ) niveus/achtung_clang_128 96 48 90 0.5 0.5 134217728 0 0
-( -1552 -264 -240 ) ( -1560 -264 -224 ) ( -1560 -264 -240 ) niveus/achtung_clang_128 0 48 90 0.5 0.5 134217728 0 0
-( -1552 -280 -240 ) ( -1552 -264 -224 ) ( -1552 -264 -240 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
-( -1560 -280 -240 ) ( -1552 -264 -240 ) ( -1560 -264 -240 ) niveus/achtung_clang_128 96 48 90 0.5 0.5 134217728 0 0
-( -1552 -280 -224 ) ( -1560 -280 -240 ) ( -1560 -280 -224 ) niveus/achtung_clang_128 0 48 90 0.5 0.5 134217728 0 0
-( -1560 -280 -224 ) ( -1560 -264 -240 ) ( -1560 -264 -224 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
-}
-}
-// entity 91
+// entity 87
 {
 "classname" "func_button"
 "target" "wtf_7"
@@ -2831,7 +2785,7 @@ nexus6/brown_hose_s
 ( -1560 -312 -224 ) ( -1560 -296 -240 ) ( -1560 -296 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 92
+// entity 88
 {
 "classname" "func_button"
 "target" "wtf_4"
@@ -2845,7 +2799,7 @@ nexus6/brown_hose_s
 ( -1560 -216 -224 ) ( -1560 -200 -240 ) ( -1560 -200 -224 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 93
+// entity 89
 {
 "classname" "target_speaker"
 "origin" "-1568.000000 -208.000000 -232.000000"
@@ -2854,7 +2808,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 94
+// entity 90
 {
 "classname" "target_speaker"
 "origin" "-1568.000000 -240.000000 -232.000000"
@@ -2863,16 +2817,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 95
-{
-"classname" "target_speaker"
-"origin" "-1568.000000 -272.000000 -232.000000"
-"noise" "sound/analmango/sosantilife.wav"
-"targetname" "wtf_6"
-"angle" "-179.999985"
-"spawnflags" "4"
-}
-// entity 96
+// entity 91
 {
 "classname" "target_speaker"
 "origin" "-1568.000000 -304.000000 -232.000000"
@@ -2881,7 +2826,7 @@ nexus6/brown_hose_s
 "angle" "-179.999985"
 "spawnflags" "4"
 }
-// entity 97
+// entity 92
 {
 "classname" "func_button"
 "angle" "270"
@@ -2896,7 +2841,7 @@ nexus6/brown_hose_s
 ( -1600 -336 -224 ) ( -1584 -336 -240 ) ( -1584 -336 -224 ) niveus/achtung_clang_128 32 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 98
+// entity 93
 {
 "classname" "func_button"
 "angle" "270"
@@ -2911,22 +2856,7 @@ nexus6/brown_hose_s
 ( -1632 -336 -224 ) ( -1616 -336 -240 ) ( -1616 -336 -224 ) niveus/achtung_clang_128 96 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 99
-{
-"classname" "func_button"
-"angle" "90"
-"target" "wtf_10"
-// brush 0
-{
-( -1664 -32 -224 ) ( -1648 -24 -224 ) ( -1648 -32 -224 ) niveus/achtung_clang_128 96 80 180 0.5 0.5 134217728 0 0
-( -1664 -24 -240 ) ( -1664 -32 -224 ) ( -1664 -32 -240 ) niveus/achtung_clang_128 0 80 90 0.5 0.5 134217728 0 0
-( -1664 -24 -224 ) ( -1648 -24 -240 ) ( -1648 -24 -224 ) niveus/achtung_clang_128 96 0 0 -0.5 0.5 134217728 0 0
-( -1664 -24 -240 ) ( -1648 -32 -240 ) ( -1648 -24 -240 ) niveus/achtung_clang_128 96 80 180 0.5 0.5 134217728 0 0
-( -1648 -24 -224 ) ( -1648 -32 -240 ) ( -1648 -32 -224 ) niveus/achtung_clang_128 0 80 90 0.5 0.5 134217728 0 0
-( -1664 -32 -240 ) ( -1648 -32 -224 ) ( -1648 -32 -240 ) niveus/achtung_clang_128 96 0 0 -0.5 0.5 134217728 0 0
-}
-}
-// entity 100
+// entity 94
 {
 "classname" "target_speaker"
 "origin" "-1592.000000 -328.000000 -232.000000"
@@ -2935,7 +2865,7 @@ nexus6/brown_hose_s
 "angle" "90.000008"
 "spawnflags" "4"
 }
-// entity 101
+// entity 95
 {
 "classname" "target_speaker"
 "origin" "-1624.000000 -328.000000 -232.000000"
@@ -2944,30 +2874,21 @@ nexus6/brown_hose_s
 "angle" "90.000008"
 "spawnflags" "4"
 }
-// entity 102
+// entity 96
 {
 "classname" "light"
 "origin" "-1624.000000 -184.000000 -224.000000"
 "light" "30"
 "_color" "0 0.971344 0.667796"
 }
-// entity 103
+// entity 97
 {
 "classname" "light"
 "origin" "-1616.000000 -88.000000 -224.000000"
 "light" "30"
 "_color" "0 0.971344 0.667796"
 }
-// entity 104
-{
-"classname" "target_speaker"
-"origin" "-1656.000000 -40.000000 -232.000000"
-"noise" "sound/analmango/incantus_pulcher_imperio.wav"
-"targetname" "wtf_10"
-"angle" "-90.000000"
-"spawnflags" "4"
-}
-// entity 105
+// entity 98
 {
 "classname" "func_button"
 "target" "wtf_11"
@@ -2982,20 +2903,20 @@ nexus6/brown_hose_s
 ( -1632 -32 -240 ) ( -1616 -32 -224 ) ( -1616 -32 -240 ) niveus/achtung_clang_128 32 0 0 -0.5 0.5 134217728 0 0
 }
 }
-// entity 106
+// entity 99
 {
 "classname" "light"
 "origin" "-1624.000000 -280.000000 -224.000000"
 "light" "30"
 "_color" "0 0.971344 0.667796"
 }
-// entity 107
+// entity 100
 {
 "classname" "target_location"
 "origin" "-2024.000000 -184.000000 -280.000000"
 "message" "Dretch Pwner"
 }
-// entity 108
+// entity 101
 {
 "classname" "target_speaker"
 "origin" "-1624.000000 -40.000000 -232.000000"
@@ -3004,36 +2925,14 @@ nexus6/brown_hose_s
 "angle" "-90.000000"
 "spawnflags" "4"
 }
-// entity 109
-{
-"classname" "func_button"
-"angle" "90"
-"target" "wtf_12"
-// brush 0
-{
-( -1584 -24 -224 ) ( -1584 -32 -224 ) ( -1600 -24 -224 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-( -1584 -24 -224 ) ( -1600 -24 -224 ) ( -1584 -24 -240 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-( -1584 -24 -224 ) ( -1584 -24 -240 ) ( -1584 -32 -224 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-( -1600 -32 -240 ) ( -1584 -32 -240 ) ( -1600 -24 -240 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-( -1600 -32 -240 ) ( -1600 -32 -224 ) ( -1584 -32 -240 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-( -1600 -32 -240 ) ( -1600 -24 -240 ) ( -1600 -32 -224 ) niveus/achtung_clang_128 0 0 0 0.5 0.5 134217728 0 0
-}
-}
-// entity 110
-{
-"classname" "target_speaker"
-"origin" "-1896.000000 -264.000000 -240.000000"
-"spawnflags" "1"
-"noise" "sound/analmango/alter_mann.wav"
-}
-// entity 111
+// entity 102
 {
 "classname" "target_speaker"
-"origin" "-1896.000000 -64.000000 -240.000000"
+"origin" "-1896.000000 -184.000000 -240.000000"
 "spawnflags" "1"
 "noise" "sound/analmango/alter_mann.wav"
 }
-// entity 112
+// entity 103
 {
 "classname" "target_speaker"
 "origin" "-2152.000000 -192.000000 -280.000000"
@@ -3041,7 +2940,7 @@ nexus6/brown_hose_s
 "noise" "sound/analmango/co_za_pojeb.wav"
 "targetname" "target_speaker1"
 }
-// entity 113
+// entity 104
 {
 "classname" "trigger_multiple"
 "target" "target_speaker1"
diff --git a/maps/p4_thepress.map b/maps/p4_thepress.map
index dcbb4e4..75b9001 100644
--- a/maps/p4_thepress.map
+++ b/maps/p4_thepress.map
@@ -3092,13 +3092,6 @@ nexus6/barrel_rst_sign
 }
 // entity 10
 {
-"classname" "target_speaker"
-"origin" "-960.000000 -1472.000000 64.000000"
-"noise" "sound/analmango/hpc.wav"
-"targetname" "hpc_pre"
-}
-// entity 11
-{
 "classname" "func_door"
 "spawnflags" "4"
 "angle" "-2"
@@ -3332,7 +3325,7 @@ nexus6/barrel_rst_sign
 ( -1216 -1792 192 ) ( -1312 -1792 448 ) ( -1216 -1792 448 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 12
+// entity 11
 {
 "classname" "func_door"
 "spawnflags" "4"
@@ -3804,7 +3797,7 @@ nexus6/barrel_rst_sign
 ( -368 -1968 208 ) ( -368 -1648 208 ) ( -368 -1968 232 ) common/origin 32 -0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 13
+// entity 12
 {
 "classname" "func_button"
 "lip" "12"
@@ -3821,7 +3814,7 @@ nexus6/barrel_rst_sign
 ( -440 -2304 -72 ) ( -440 -2320 -112 ) ( -440 -2320 -72 ) nexus6/achtung_clang_128 0 16 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 14
+// entity 13
 {
 "classname" "func_button"
 "lip" "-12"
@@ -3838,56 +3831,56 @@ nexus6/barrel_rst_sign
 ( 94 -1780 296 ) ( 94 -1776 296 ) ( 94 -1780 300 ) niveus/e8_base1b 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 15
+// entity 14
 {
 "classname" "target_speaker"
 "origin" "-512.000000 -1472.000000 64.000000"
 "noise" "sound/analmango/hpc.wav"
 "targetname" "hpc_pre"
 }
-// entity 16
+// entity 15
 {
 "classname" "light"
 "origin" "-800.000000 -1376.000000 56.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 17
+// entity 16
 {
 "classname" "light"
 "origin" "-800.000000 -1376.000000 -64.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 18
+// entity 17
 {
 "classname" "light"
 "origin" "-800.000000 -1520.000000 -64.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 19
+// entity 18
 {
 "classname" "light"
 "origin" "-800.000000 -1408.000000 128.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 20
+// entity 19
 {
 "classname" "light"
 "origin" "-800.000000 -1520.000000 56.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 21
+// entity 20
 {
 "classname" "light"
 "origin" "-800.000000 -1472.000000 128.000000"
 "light" "15"
 "_color" "0.713726 0.505882 0.501961"
 }
-// entity 22
+// entity 21
 {
 "classname" "func_door_model"
 "model2" "models/mapobjects/analmango/falling_box.md3"
@@ -3913,7 +3906,7 @@ nexus6/barrel_rst_sign
 ( -568 -1624 8 ) ( -568 -1600 8 ) ( -568 -1624 16 ) common/nodrawnonsolid 16 48 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 23
+// entity 22
 {
 "classname" "trigger_multiple"
 "target" "global_painting_1"
@@ -3928,7 +3921,7 @@ nexus6/barrel_rst_sign
 ( -568 -1672 -32 ) ( -568 -1664 -32 ) ( -568 -1672 8 ) common/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 24
+// entity 23
 {
 "classname" "func_door_model"
 "wait" "360000"
@@ -3947,7 +3940,7 @@ nexus6/barrel_rst_sign
 ( -568 -1664 -16 ) ( -568 -1624 -16 ) ( -568 -1664 0 ) common/full_clip 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 25
+// entity 24
 {
 "classname" "target_delay"
 "origin" "-496.000000 -1624.000000 -16.000000"
@@ -3955,7 +3948,7 @@ nexus6/barrel_rst_sign
 "targetname" "global_painting_1"
 "target" "box_3"
 }
-// entity 26
+// entity 25
 {
 "classname" "func_door"
 "angle" "-2"
@@ -3977,7 +3970,7 @@ nexus6/barrel_rst_sign
 ( -564 -1592 -128 ) ( -564 -1552 -128 ) ( -564 -1592 -88 ) common/clip 48 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 27
+// entity 26
 {
 "classname" "target_delay"
 "origin" "-496.000000 -1664.000000 -16.000000"
@@ -3985,41 +3978,41 @@ nexus6/barrel_rst_sign
 "targetname" "global_painting_1"
 "target" "box_2"
 }
-// entity 28
+// entity 27
 {
 "classname" "target_speaker"
 "origin" "-544.000000 -1576.000000 -112.000000"
 "noise" "sound/buildables/human/damage2.wav"
 "targetname" "box_3"
 }
-// entity 29
+// entity 28
 {
 "classname" "misc_model"
 "origin" "-160.000000 -1824.000000 144.000000"
 "model" "models/mapobjects/analmango/speaker.md3"
 "angle" "-180.000000"
 }
-// entity 30
+// entity 29
 {
 "classname" "target_speaker"
 "origin" "-168.000000 -1824.000000 120.000000"
 "noise" "sound/analmango/analmango.wav"
 "targetname" "global_ann_analmango"
 }
-// entity 31
+// entity 30
 {
 "classname" "target_speaker"
 "origin" "-168.000000 -1824.000000 120.000000"
 "noise" "sound/analmango/pwner_in.wav"
 "targetname" "global_ann_pwner_in"
 }
-// entity 32
+// entity 31
 {
 "classname" "target_location"
 "origin" "-1024.000000 -1744.000000 -16.000000"
 "message" "Press room W"
 }
-// entity 33
+// entity 32
 {
 "classname" "target_location"
 "origin" "-320.000000 -1952.000000 16.000000"
diff --git a/maps/p8_outside.map b/maps/p8_outside.map
index fec497b..c7b63cc 100644
--- a/maps/p8_outside.map
+++ b/maps/p8_outside.map
@@ -10810,36 +10810,12 @@ niveus/base_yellow
 // entity 62
 {
 "classname" "target_speaker"
-"origin" "-312.000000 2400.000000 160.000000"
-"noise" "sound/analmango/radio_tower.wav"
-"targetname" "neverhood_sound1"
-"angle" "0.000010"
-}
-// entity 63
-{
-"classname" "target_speaker"
-"origin" "-312.000000 2400.000000 160.000000"
-"noise" "sound/analmango/radio_tower.wav"
-"targetname" "neverhood_sound1"
-"angle" "0.000010"
-}
-// entity 64
-{
-"classname" "target_speaker"
-"origin" "-312.000000 2400.000000 160.000000"
-"noise" "sound/analmango/radio_tower.wav"
-"targetname" "neverhood_sound1"
-"angle" "0.000010"
-}
-// entity 65
-{
-"classname" "target_speaker"
 "origin" "432.000000 1520.000000 -264.000000"
 "noise" "sound/analmango/de_sa_majeste.wav"
 "spawnflags" "1"
 "angle" "-90.000000"
 }
-// entity 66
+// entity 63
 {
 "classname" "target_speaker"
 "origin" "136.000000 1672.000000 -264.000000"
@@ -10847,7 +10823,7 @@ niveus/base_yellow
 "spawnflags" "1"
 "angle" "-90.000000"
 }
-// entity 67
+// entity 64
 {
 "classname" "target_speaker"
 "origin" "328.000000 1864.000000 -264.000000"
@@ -10855,32 +10831,32 @@ niveus/base_yellow
 "spawnflags" "1"
 "angle" "-90.000000"
 }
-// entity 68
+// entity 65
 {
 "classname" "target_speaker"
 "origin" "-872.000000 1816.000000 -64.000000"
 "noise" "sound/analmango/navras.wav"
 "spawnflags" "1"
 }
-// entity 69
+// entity 66
 {
 "classname" "light"
 "origin" "376.000000 1104.000000 -120.000000"
 "light" "85"
 }
-// entity 70
+// entity 67
 {
 "classname" "light"
 "origin" "168.000000 1032.000000 -168.000000"
 "light" "85"
 }
-// entity 71
+// entity 68
 {
 "classname" "light"
 "origin" "112.000000 856.000000 -264.000000"
 "light" "85"
 }
-// entity 72
+// entity 69
 {
 "classname" "trigger_multiple"
 "wait" "3.2"
@@ -10895,7 +10871,7 @@ niveus/base_yellow
 ( -1088 3056 -160 ) ( -1088 3072 -160 ) ( -1088 3056 472 ) common/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 73
+// entity 70
 {
 "classname" "target_speaker"
 "origin" "-896.000000 2984.000000 -96.000000"
@@ -10903,7 +10879,7 @@ niveus/base_yellow
 "spawnflags" "8"
 "targetname" "gather_your_party"
 }
-// entity 74
+// entity 71
 {
 "classname" "target_print"
 "origin" "-976.000000 2968.000000 -96.000000"
@@ -10911,19 +10887,19 @@ niveus/base_yellow
 "targetname" "gather_your_party"
 "spawnflags" "4"
 }
-// entity 75
+// entity 72
 {
 "classname" "team_human_reactor"
 "origin" "-1320.000000 2272.000000 -96.000000"
 "mapcat_discard" " "
 }
-// entity 76
+// entity 73
 {
 "classname" "team_human_armoury"
 "origin" "-1120.000000 2232.000000 -96.000000"
 "mapcat_discard" " "
 }
-// entity 77
+// entity 74
 {
 "classname" "func_group"
 // brush 0
@@ -11197,71 +11173,71 @@ niveus/base_yellow
 ( -360 1120 688 ) ( -344 1120 688 ) ( -344 1128 592 ) arachnid2/tin 128 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 78
+// entity 75
 {
 "classname" "light"
 "origin" "-552.000000 560.000000 -304.000000"
 "light" "45"
 "_color" "1 0.711223 0.17113"
 }
-// entity 79
+// entity 76
 {
 "classname" "light"
 "origin" "-256.000000 656.000000 -304.000000"
 "light" "45"
 "_color" "1 0.711223 0.17113"
 }
-// entity 80
+// entity 77
 {
 "classname" "light"
 "origin" "-456.000000 656.000000 -304.000000"
 "light" "45"
 "_color" "1 0.711223 0.17113"
 }
-// entity 81
+// entity 78
 {
 "classname" "light"
 "origin" "-80.000000 656.000000 -304.000000"
 "light" "45"
 "_color" "1 0.711223 0.17113"
 }
-// entity 82
+// entity 79
 {
 "classname" "target_location"
 "origin" "-640.000000 928.000000 64.000000"
 "message" "Outside bunker 2nd flr."
 }
-// entity 83
+// entity 80
 {
 "classname" "target_location"
 "origin" "56.000000 984.000000 -128.000000"
 "message" "Cave"
 }
-// entity 84
+// entity 81
 {
 "classname" "target_location"
 "origin" "-832.000000 1632.000000 160.000000"
 "message" "Outside"
 }
-// entity 85
+// entity 82
 {
 "classname" "target_location"
 "origin" "-640.000000 896.000000 -112.000000"
 "message" "Outside bunker"
 }
-// entity 86
+// entity 83
 {
 "classname" "target_location"
 "origin" "-328.000000 2408.000000 -64.000000"
 "message" "Radio tower"
 }
-// entity 87
+// entity 84
 {
 "classname" "target_location"
 "origin" "424.000000 1744.000000 -128.000000"
 "message" "Shit tunnel"
 }
-// entity 88
+// entity 85
 {
 "classname" "func_rotating"
 "speed" "1"
@@ -11321,7 +11297,7 @@ niveus/base_yellow
 ( -848 600 -160 ) ( -888 600 -160 ) ( -848 472 -160 ) common/caulk 16 48 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 89
+// entity 86
 {
 "classname" "target_speaker"
 "origin" "-232.606934 2344.840088 -69.000000"
@@ -11329,7 +11305,7 @@ niveus/base_yellow
 "spawnflags" "1"
 "angle" "-23.069773"
 }
-// entity 90
+// entity 87
 {
 "classname" "target_delay"
 "origin" "-412.199951 2313.199951 -108.839996"
@@ -11338,20 +11314,20 @@ niveus/base_yellow
 "killtarget" "target_speaker1"
 "target" "painting"
 }
-// entity 91
+// entity 88
 {
 "classname" "light"
 "origin" "724.000000 932.000000 124.000000"
 "light" "7"
 "_color" "0.955276 0.603937 0.395514"
 }
-// entity 92
+// entity 89
 {
 "classname" "team_alien_spawn"
 "origin" "440.000000 1176.000000 -128.000000"
 "mapcat_discard" " "
 }
-// entity 93
+// entity 90
 {
 "classname" "trigger_multiple"
 "wait" "-1"
@@ -11366,7 +11342,7 @@ niveus/base_yellow
 ( 716 828 80 ) ( 716 856 80 ) ( 716 828 152 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 94
+// entity 91
 {
 "classname" "target_speaker"
 "origin" "732.000000 844.000000 116.000000"
@@ -11374,14 +11350,14 @@ niveus/base_yellow
 "spawnflags" "2"
 "targetname" "sayori_2"
 }
-// entity 95
+// entity 92
 {
 "classname" "target_speaker"
 "origin" "-418.119995 2360.560059 -73.320000"
 "noise" "sound/analmango/painting-v4.wav"
 "targetname" "painting"
 }
-// entity 96
+// entity 93
 {
 "classname" "target_speaker"
 "origin" "-413.000000 2410.000000 -135.000000"
@@ -11389,20 +11365,20 @@ niveus/base_yellow
 "wait" "300"
 "random" "120"
 }
-// entity 97
+// entity 94
 {
 "classname" "light"
 "origin" "-1520.000000 1056.000000 -32.000000"
 "light" "45"
 "_color" "1 0.747662 0.747662"
 }
-// entity 98
+// entity 95
 {
 "classname" "target_kill"
 "origin" "728.000000 896.000000 112.000000"
 "targetname" "sayori"
 }
-// entity 99
+// entity 96
 {
 "classname" "target_speaker"
 "origin" "696.000000 896.000000 112.000000"
@@ -11410,7 +11386,7 @@ niveus/base_yellow
 "noise" "sound/analmango/absence_of_space.wav"
 "spawnflags" "4"
 }
-// entity 100
+// entity 97
 {
 "classname" "target_delay"
 "origin" "720.000000 800.000000 112.000000"
@@ -11418,21 +11394,21 @@ niveus/base_yellow
 "target" "sayori_2"
 "wait" "3"
 }
-// entity 101
+// entity 98
 {
 "classname" "target_speaker"
 "origin" "472.000000 944.000000 48.000000"
 "noise" "sound/analmango/ambient_2.wav"
 "spawnflags" "1"
 }
-// entity 102
+// entity 99
 {
 "classname" "target_speaker"
 "origin" "232.000000 648.000000 -328.000000"
 "noise" "sound/analmango/ambient_2.wav"
 "spawnflags" "1"
 }
-// entity 103
+// entity 100
 {
 "classname" "func_door_model"
 "model2" "models/mapobjects/analmango/speaker3.md3"
@@ -11455,25 +11431,25 @@ niveus/base_yellow
 ( -424.8800048828 2453.080078125 -157.6000061035 ) ( -424.8800048828 2488.6000976562 -157.6000061035 ) ( -424.8800048828 2453.080078125 -145.7599945068 ) common/nodrawnonsolid 58.0539550781 54.0540504456 0 0.3700000048 0.3700000048 134217728 0 0
 }
 }
-// entity 104
+// entity 101
 {
 "classname" "light"
 "origin" "-400.000000 2400.000000 -16.000000"
 "light" "30"
 }
-// entity 105
+// entity 102
 {
 "classname" "light"
 "origin" "-312.000000 2400.000000 -16.000000"
 "light" "30"
 }
-// entity 106
+// entity 103
 {
 "classname" "light"
 "origin" "-240.000000 2400.000000 -16.000000"
 "light" "30"
 }
-// entity 107
+// entity 104
 {
 "classname" "trigger_multiple"
 "wait" "15"
@@ -11488,14 +11464,14 @@ niveus/base_yellow
 ( -358.7600097656 2507.4399414062 -114.7599945068 ) ( -358.7600097656 2513.3598632812 -114.7599945068 ) ( -358.7600097656 2507.4399414062 -91.0800018311 ) common/trigger 7.1350097656 25.8378372192 0 0.3700000048 0.3700000048 134217728 0 0
 }
 }
-// entity 108
+// entity 105
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2508.000000 -102.000000"
 "targetname" "neverhood_1"
 "noise" "sound/movers/switches/button1.wav"
 }
-// entity 109
+// entity 106
 {
 "classname" "func_button"
 "sound1to2" "sound/null.wav"
@@ -11513,15 +11489,7 @@ niveus/base_yellow
 ( -433 2487 -103 ) ( -433 2455 -143 ) ( -433 2487 -143 ) common/weapclip 18 2 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 110
-{
-"classname" "target_speaker"
-"origin" "-284.766602 2451.598145 -69.000000"
-"noise" "sound/analmango/computer5.wav"
-"spawnflags" "1"
-"angle" "16.956316"
-}
-// entity 111
+// entity 107
 {
 "classname" "target_delay"
 "origin" "-360.000000 2472.000000 -104.000000"
@@ -11529,7 +11497,7 @@ niveus/base_yellow
 "targetname" "neverhood_1"
 "target" "neverhood_B2"
 }
-// entity 112
+// entity 108
 {
 "classname" "target_relay"
 "origin" "-360.000000 2440.000000 -104.000000"
@@ -11537,7 +11505,7 @@ niveus/base_yellow
 "target" "neverhood_B3"
 "spawnflags" "4"
 }
-// entity 113
+// entity 109
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11545,7 +11513,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 114
+// entity 110
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11553,7 +11521,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 115
+// entity 111
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11561,7 +11529,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 116
+// entity 112
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11569,7 +11537,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 117
+// entity 113
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11577,7 +11545,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 118
+// entity 114
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11585,7 +11553,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 119
+// entity 115
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11593,7 +11561,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 120
+// entity 116
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11601,7 +11569,7 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 121
+// entity 117
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
@@ -11609,245 +11577,245 @@ niveus/base_yellow
 "angle" "-90.000000"
 "targetname" "neverhood_B3"
 }
-// entity 122
+// entity 118
 {
 "classname" "misc_model"
 "origin" "-1602.235229 1833.151367 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-6.990033"
 }
-// entity 123
+// entity 119
 {
 "classname" "misc_model"
 "origin" "-1572.079224 1894.578247 -110.000008"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "157.203659"
 }
-// entity 124
+// entity 120
 {
 "classname" "misc_model"
 "origin" "-1599.743408 1901.267456 -109.999992"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "169.154739"
 }
-// entity 125
+// entity 121
 {
 "classname" "misc_model"
 "origin" "-1630.307617 1908.943359 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-169.121201"
 }
-// entity 126
+// entity 122
 {
 "classname" "misc_model"
 "origin" "-1637.331177 1841.567383 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-19.834778"
 }
-// entity 127
+// entity 123
 {
 "classname" "misc_model"
 "origin" "-1534.000244 1382.000366 -110.000015"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-99.949402"
 }
-// entity 128
+// entity 124
 {
 "classname" "misc_model"
 "origin" "-1467.405273 1366.258423 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "95.856941"
 }
-// entity 129
+// entity 125
 {
 "classname" "misc_model"
 "origin" "-1534.370850 1353.542725 -110.000008"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-87.998322"
 }
-// entity 130
+// entity 126
 {
 "classname" "misc_model"
 "origin" "-1467.807129 1330.169800 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "83.012146"
 }
-// entity 131
+// entity 127
 {
 "classname" "misc_model"
 "origin" "-1535.057861 1322.036377 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-66.274246"
 }
-// entity 132
+// entity 128
 {
 "classname" "misc_model"
 "origin" "-1473.934448 1461.263550 -110.000015"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "98.843430"
 }
-// entity 133
+// entity 129
 {
 "classname" "misc_model"
 "origin" "-1542.050537 1454.712769 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-65.350220"
 }
-// entity 134
+// entity 130
 {
 "classname" "misc_model"
 "origin" "-1482.750977 1488.323730 -110.000008"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "110.794510"
 }
-// entity 135
+// entity 131
 {
 "classname" "misc_model"
 "origin" "-1553.295898 1489.007202 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-78.195015"
 }
-// entity 136
+// entity 132
 {
 "classname" "misc_model"
 "origin" "-1492.250366 1518.371094 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "132.518585"
 }
-// entity 137
+// entity 133
 {
 "classname" "misc_model"
 "origin" "-1551.105835 1579.301025 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "140.498566"
 }
-// entity 138
+// entity 134
 {
 "classname" "misc_model"
 "origin" "-1597.645508 1529.133545 -110.000015"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-23.695097"
 }
-// entity 139
+// entity 135
 {
 "classname" "misc_model"
 "origin" "-1575.678589 1593.659302 -110.000008"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "152.449646"
 }
-// entity 140
+// entity 136
 {
 "classname" "misc_model"
 "origin" "-1628.841064 1547.282837 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-36.539871"
 }
-// entity 141
+// entity 137
 {
 "classname" "misc_model"
 "origin" "-1602.747192 1609.796143 -110.000038"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "174.173706"
 }
-// entity 142
+// entity 138
 {
 "classname" "misc_model"
 "origin" "-1778.217041 1566.914673 -110.000015"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-18.702887"
 }
-// entity 143
+// entity 139
 {
 "classname" "misc_model"
 "origin" "-1752.523315 1630.338013 -110.000015"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "177.103439"
 }
-// entity 144
+// entity 140
 {
 "classname" "misc_model"
 "origin" "-1750.146484 1562.217773 -110.000000"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-6.751806"
 }
-// entity 145
+// entity 141
 {
 "classname" "misc_model"
 "origin" "-1716.916504 1624.448853 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "164.258698"
 }
-// entity 146
+// entity 142
 {
 "classname" "misc_model"
 "origin" "-1719.111816 1556.744019 -110.000038"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "14.972258"
 }
-// entity 147
+// entity 143
 {
 "classname" "misc_model"
 "origin" "-1787.216309 1831.452271 -110.000008"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-4.851170"
 }
-// entity 148
+// entity 144
 {
 "classname" "misc_model"
 "origin" "-1777.453857 1899.182617 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "-169.044846"
 }
-// entity 149
+// entity 145
 {
 "classname" "misc_model"
 "origin" "-1758.837524 1833.612183 -109.999992"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "7.099912"
 }
-// entity 150
+// entity 146
 {
 "classname" "misc_model"
 "origin" "-1741.472656 1901.989258 -110.000023"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "178.110413"
 }
-// entity 151
+// entity 147
 {
 "classname" "misc_model"
 "origin" "-1727.394897 1835.727417 -110.000031"
 "model" "models/mapobjects/analmango/seat.md3"
 "angle" "28.823965"
 }
-// entity 152
+// entity 148
 {
 "classname" "light"
 "origin" "-1528.000000 1712.000000 -32.000000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 153
+// entity 149
 {
 "classname" "light"
 "origin" "-1608.000000 1688.000000 -32.000000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 154
+// entity 150
 {
 "classname" "light"
 "origin" "-1640.000000 1752.000000 -32.000000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 155
+// entity 151
 {
 "classname" "light"
 "origin" "-1490.750000 1681.625000 -97.500000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 156
+// entity 152
 {
 "classname" "func_group"
 // brush 0
@@ -11935,35 +11903,35 @@ niveus/base_yellow
 ( -1776 1055.7116699219 151.967376709 ) ( -1776 1055.7155761719 150.967376709 ) ( -1904 1055.7116699219 151.967376709 ) common/caulk 32 7.473118782 0 0.5 0.5000039935 134217728 0 0
 }
 }
-// entity 157
+// entity 153
 {
 "classname" "light"
 "origin" "-1560.000000 1776.000000 -32.000000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 158
+// entity 154
 {
 "classname" "light"
 "origin" "-1705.000000 1722.875000 -97.500000"
 "light" "70"
 "_color" "1 0.528435 0.477134"
 }
-// entity 159
+// entity 155
 {
 "classname" "light"
 "origin" "-1764.000000 1136.000000 196.000000"
 "light" "3"
 "_color" "0.843244 0.58088 0.219104"
 }
-// entity 160
+// entity 156
 {
 "classname" "info_player_intermission"
 "origin" "-591.996155 2825.100098 443.951569"
 "killtarget" "info_notnull1"
 "angles" "17.192350 -121.676010 0.000000"
 }
-// entity 161
+// entity 157
 {
 "classname" "target_speaker"
 "origin" "-1608.000000 3592.000000 336.000000"
@@ -11971,31 +11939,31 @@ niveus/base_yellow
 "wait" "360"
 "random" "240"
 }
-// entity 162
+// entity 158
 {
 "classname" "misc_particle_system"
 "origin" "-248.000000 672.000000 808.000000"
 "psName" "analmango_large_smoke"
 }
-// entity 163
+// entity 159
 {
 "classname" "misc_particle_system"
 "origin" "-248.000000 1152.000000 808.000000"
 "psName" "analmango_large_smoke"
 }
-// entity 164
+// entity 160
 {
 "classname" "misc_particle_system"
 "origin" "-248.000000 992.000000 808.000000"
 "psName" "analmango_large_smoke"
 }
-// entity 165
+// entity 161
 {
 "classname" "misc_particle_system"
 "origin" "-248.000000 832.000000 808.000000"
 "psName" "analmango_large_smoke"
 }
-// entity 166
+// entity 162
 {
 "classname" "target_speaker"
 "origin" "-352.000000 2528.000000 -104.000000"
diff --git a/maps/p9_reactor.map b/maps/p9_reactor.map
index a3f5b66..b7b7010 100644
--- a/maps/p9_reactor.map
+++ b/maps/p9_reactor.map
@@ -5459,93 +5459,51 @@ niveus/pewter
 }
 // entity 30
 {
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 16.000000"
-"noise" "sound/ambient/quickpulse.wav"
-"spawnflags" "1"
-}
-// entity 31
-{
 "classname" "light"
 "origin" "1792.000000 -304.000000 192.000000"
 "light" "500"
 }
-// entity 32
+// entity 31
 {
 "classname" "target_speaker"
 "origin" "1792.000000 -304.000000 320.000000"
 "noise" "sound/analmango/reactor.wav"
 "spawnflags" "1"
 }
-// entity 33
+// entity 32
 {
 "classname" "target_speaker"
 "origin" "1792.000000 -304.000000 576.000000"
 "noise" "sound/analmango/reactor.wav"
 "spawnflags" "1"
 }
-// entity 34
+// entity 33
 {
 "classname" "light"
 "origin" "1792.000000 -304.000000 448.000000"
 "light" "500"
 }
-// entity 35
+// entity 34
 {
 "classname" "light"
 "origin" "1792.000000 -304.000000 704.000000"
 "light" "500"
 }
-// entity 36
+// entity 35
 {
 "classname" "target_speaker"
 "origin" "1792.000000 -304.000000 832.000000"
 "noise" "sound/analmango/reactor.wav"
 "spawnflags" "1"
 }
-// entity 37
+// entity 36
 {
 "classname" "target_speaker"
 "origin" "1792.000000 -304.000000 64.000000"
 "noise" "sound/analmango/reactor.wav"
 "spawnflags" "1"
 }
-// entity 38
-{
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 -8.000000"
-"noise" "sound/ambient/slowpulse2.wav"
-"spawnflags" "1"
-}
-// entity 39
-{
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 16.000000"
-"noise" "sound/ambient/quickpulse.wav"
-"spawnflags" "1"
-}
-// entity 40
-{
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 -8.000000"
-"noise" "sound/ambient/slowpulse2.wav"
-"spawnflags" "1"
-}
-// entity 41
-{
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 16.000000"
-"noise" "sound/ambient/quickpulse.wav"
-"spawnflags" "1"
-}
-// entity 42
-{
-"classname" "target_speaker"
-"origin" "1792.000000 -304.000000 -8.000000"
-"noise" "sound/ambient/slowpulse2.wav"
-"spawnflags" "1"
-}
-// entity 43
+// entity 37
 {
 "classname" "trigger_multiple"
 "wait" "0.001"
@@ -5568,7 +5526,7 @@ niveus/pewter
 ( 1887.2000732422 -327.6000061035 -80 ) ( 1862 -371 2120 ) ( 1887.2000732422 -327.6000061035 2120 ) common/trigger 24 0 0 0.4000000358 0.5 0 0 0
 }
 }
-// entity 44
+// entity 38
 {
 "classname" "target_relay"
 "origin" "1984.000000 -448.000000 40.000000"
@@ -5576,7 +5534,7 @@ niveus/pewter
 "target" "thunder_2"
 "spawnflags" "4"
 }
-// entity 45
+// entity 39
 {
 "classname" "target_push"
 "origin" "2048.000000 -512.000000 40.000000"
@@ -5584,7 +5542,7 @@ niveus/pewter
 "spawnflags" "2"
 "target" "thunder_3d"
 }
-// entity 46
+// entity 40
 {
 "classname" "target_push"
 "origin" "1856.000000 -512.000000 40.000000"
@@ -5592,7 +5550,7 @@ niveus/pewter
 "spawnflags" "2"
 "target" "thunder_3a"
 }
-// entity 47
+// entity 41
 {
 "classname" "target_push"
 "origin" "1984.000000 -512.000000 40.000000"
@@ -5600,7 +5558,7 @@ niveus/pewter
 "spawnflags" "2"
 "target" "thunder_3c"
 }
-// entity 48
+// entity 42
 {
 "classname" "target_push"
 "origin" "1920.000000 -512.000000 40.000000"
@@ -5608,7 +5566,7 @@ niveus/pewter
 "spawnflags" "2"
 "target" "thunder_3b"
 }
-// entity 49
+// entity 43
 {
 "classname" "target_speaker"
 "origin" "1984.000000 -376.000000 144.000000"
@@ -5616,44 +5574,44 @@ niveus/pewter
 "targetname" "thunder_1"
 "spawnflags" "4"
 }
-// entity 50
+// entity 44
 {
 "classname" "target_speaker"
 "origin" "1792.000000 -304.000000 120.000000"
 "noise" "sound/analmango/thunder_strike.wav"
 "targetname" "thunder_1"
 }
-// entity 51
+// entity 45
 {
 "classname" "target_position"
 "origin" "2048.000000 584.000000 1448.000000"
 "targetname" "thunder_3d"
 }
-// entity 52
+// entity 46
 {
 "classname" "target_position"
 "origin" "1480.000000 -1128.000000 664.000000"
 "targetname" "thunder_3a"
 }
-// entity 53
+// entity 47
 {
 "classname" "target_position"
 "origin" "1504.000000 520.000000 840.000000"
 "targetname" "thunder_3b"
 }
-// entity 54
+// entity 48
 {
 "classname" "target_position"
 "origin" "2064.000000 -1152.000000 1280.000000"
 "targetname" "thunder_3c"
 }
-// entity 55
+// entity 49
 {
 "classname" "target_kill"
 "origin" "2056.000000 -448.000000 40.000000"
 "targetname" "thunder_1"
 }
-// entity 56
+// entity 50
 {
 "classname" "func_door"
 "spawnflags" "1"
@@ -5741,21 +5699,21 @@ analmango/reactor_beam
 }
 }
 }
-// entity 57
+// entity 51
 {
 "classname" "target_speaker"
 "origin" "2020.000000 -176.000000 16.000000"
 "noise" "sound/analmango/computer2.wav"
 "spawnflags" "1"
 }
-// entity 58
+// entity 52
 {
 "classname" "light"
 "origin" "1992.000000 264.000000 112.000000"
 "light" "35"
 "_color" "1 0.911254 0.5785"
 }
-// entity 59
+// entity 53
 {
 "classname" "target_speaker"
 "origin" "1984.000000 -408.000000 144.000000"
@@ -5763,7 +5721,7 @@ analmango/reactor_beam
 "targetname" "thunder_1"
 "spawnflags" "8"
 }
-// entity 60
+// entity 54
 {
 "classname" "target_delay"
 "origin" "2088.000000 -376.000000 144.000000"
@@ -5771,19 +5729,19 @@ analmango/reactor_beam
 "target" "thunder_1b"
 "delay" "0.7"
 }
-// entity 61
+// entity 55
 {
 "classname" "target_location"
 "origin" "1792.000000 -300.000000 432.000000"
 "message" "Reactor"
 }
-// entity 62
+// entity 56
 {
 "classname" "team_human_reactor"
 "origin" "1936.000000 -1072.000000 120.000000"
 "mapcat_discard" " "
 }
-// entity 63
+// entity 57
 {
 "classname" "misc_model"
 "origin" "1952.000000 288.000000 8.000000"
@@ -5791,7 +5749,7 @@ analmango/reactor_beam
 "spawnflags" "4"
 "angle" "-90.000000"
 }
-// entity 64
+// entity 58
 {
 "classname" "misc_model"
 "origin" "1952.000000 352.000000 8.000000"
@@ -5799,20 +5757,20 @@ analmango/reactor_beam
 "spawnflags" "4"
 "angle" "-90.000000"
 }
-// entity 65
+// entity 59
 {
 "classname" "target_speaker"
 "origin" "2020.000000 -116.000000 212.000000"
 "noise" "sound/ambient/drone1.wav"
 "spawnflags" "1"
 }
-// entity 66
+// entity 60
 {
 "classname" "light"
 "origin" "2480.000000 -98.000000 108.000000"
 "light" "20"
 }
-// entity 67
+// entity 61
 {
 "classname" "func_door"
 "angle" "180"
@@ -5829,7 +5787,7 @@ analmango/reactor_beam
 ( 2424 -216 -8 ) ( 2432 -224 8 ) ( 2424 -280 -8 ) niveus/dark_metal 0 32 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 68
+// entity 62
 {
 "classname" "func_button"
 "target" "func_door1"
@@ -5845,41 +5803,26 @@ analmango/reactor_beam
 ( 2404 -196 36 ) ( 2404 -188 24 ) ( 2404 -188 36 ) karith/e8warning128 64 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 69
+// entity 63
 {
 "classname" "light"
 "origin" "2535.000000 104.000000 70.000000"
 "light" "10"
 }
-// entity 70
+// entity 64
 {
 "classname" "light"
 "origin" "2535.000000 136.000000 70.000000"
 "light" "10"
 }
-// entity 71
-{
-"classname" "target_speaker"
-"origin" "2416.000000 156.000000 48.000000"
-"noise" "sound/analmango/computer4.wav"
-"wait" "15"
-"random" "8"
-}
-// entity 72
+// entity 65
 {
 "classname" "target_speaker"
 "origin" "2544.000000 -128.000000 48.000000"
 "noise" "sound/analmango/computer5.wav"
 "spawnflags" "1"
 }
-// entity 73
-{
-"classname" "target_speaker"
-"origin" "2544.000000 -8.000000 48.000000"
-"noise" "sound/analmango/computer2.wav"
-"spawnflags" "1"
-}
-// entity 74
+// entity 66
 {
 "classname" "target_speaker"
 "origin" "2416.000000 60.000000 48.000000"
@@ -5887,169 +5830,169 @@ analmango/reactor_beam
 "wait" "15"
 "random" "8"
 }
-// entity 75
+// entity 67
 {
 "classname" "light"
 "origin" "2432.000000 -248.000000 -160.000000"
 "light" "15"
 "_color" "1 0.236515 0"
 }
-// entity 76
+// entity 68
 {
 "classname" "misc_model"
 "origin" "2055.999756 -888.999939 -188.999969"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 "angles" "-0.000000 -29.826759 -90.000000"
 }
-// entity 77
+// entity 69
 {
 "classname" "misc_model"
 "origin" "1848.000000 -1144.000000 80.000000"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 }
-// entity 78
+// entity 70
 {
 "classname" "misc_model"
 "origin" "1912.000000 -980.000000 77.000031"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 "angles" "-0.000000 0.000000 -39.770622"
 }
-// entity 79
+// entity 71
 {
 "classname" "misc_model"
 "origin" "1912.000000 -1144.000000 80.000000"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 }
-// entity 80
+// entity 72
 {
 "classname" "team_alien_overmind"
 "origin" "1624.000000 -992.000000 296.000000"
 "mapcat_discard" " "
 }
-// entity 81
+// entity 73
 {
 "classname" "team_alien_spawn"
 "origin" "1496.000000 -984.000000 264.000000"
 "mapcat_discard" " "
 }
-// entity 82
+// entity 74
 {
 "classname" "light"
 "origin" "2216.000000 -488.000000 -84.000000"
 "light" "15"
 "_color" "1 0.236515 0"
 }
-// entity 83
+// entity 75
 {
 "classname" "light"
 "origin" "2216.000000 -304.000000 -84.000000"
 "light" "15"
 "_color" "1 0.236515 0"
 }
-// entity 84
+// entity 76
 {
 "classname" "light"
 "origin" "2216.000000 -672.000000 -84.000000"
 "light" "15"
 "_color" "1 0.236515 0"
 }
-// entity 85
+// entity 77
 {
 "classname" "target_speaker"
 "origin" "2376.000000 -808.000000 -128.000000"
 "spawnflags" "1"
 "noise" "sound/analmango/computer3.wav"
 }
-// entity 86
+// entity 78
 {
 "classname" "misc_model"
 "origin" "1976.000000 -1144.000000 80.000000"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 }
-// entity 87
+// entity 79
 {
 "classname" "misc_model"
 "origin" "2040.000000 -1144.000000 80.000000"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 }
-// entity 88
+// entity 80
 {
 "classname" "light"
 "origin" "2512.000000 -1064.000000 198.000000"
 "light" "100"
 }
-// entity 89
+// entity 81
 {
 "classname" "target_location"
 "origin" "2528.000000 -632.000000 -16.000000"
 "message" "Reactor back room"
 }
-// entity 90
+// entity 82
 {
 "classname" "target_location"
 "origin" "2480.000000 -88.000000 56.000000"
 "message" "Reactor control"
 }
-// entity 91
+// entity 83
 {
 "classname" "info_alien_intermission"
 "origin" "1520.000000 552.000000 80.000000"
 "angle" "-89.999992"
 "mapcat_discard" " "
 }
-// entity 92
+// entity 84
 {
 "classname" "info_human_intermission"
 "origin" "1456.000000 552.000000 80.000000"
 "angle" "-89.999992"
 "mapcat_discard" " "
 }
-// entity 93
+// entity 85
 {
 "classname" "info_player_intermission"
 "origin" "1488.000000 552.000000 80.000000"
 "angle" "-89.999992"
 "mapcat_discard" " "
 }
-// entity 94
+// entity 86
 {
 "classname" "misc_light_flare"
 "origin" "1792.000000 -300.000000 -36.000000"
 "radius" "1.6 0 1"
 "targetShaderName" "textures/nexus6/flare_01"
 }
-// entity 95
+// entity 87
 {
 "classname" "light"
 "origin" "2472.000000 -1064.000000 198.000000"
 "light" "100"
 }
-// entity 96
+// entity 88
 {
 "classname" "team_human_spawn"
 "origin" "2088.000000 -1072.000000 96.000000"
 "mapcat_discard" " "
 }
-// entity 97
+// entity 89
 {
 "classname" "misc_model"
 "origin" "1848.000000 -984.000000 80.000000"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 }
-// entity 98
+// entity 90
 {
 "classname" "misc_model"
 "origin" "1947.000000 -915.000000 -188.999985"
 "model" "models/mapobjects/analmango/railing_barrier.md3"
 "angles" "-0.000000 16.160509 -90.000000"
 }
-// entity 99
+// entity 91
 {
 "classname" "misc_particle_system"
 "origin" "1792.000000 -300.000000 -60.000000"
 "psName" "analmango_reactor"
 }
-// entity 100
+// entity 92
 {
 "classname" "target_speaker"
 "origin" "2048.000000 -448.000000 144.000000"
@@ -6057,7 +6000,7 @@ analmango/reactor_beam
 "targetname" "thunder_1c"
 "spawnflags" "8"
 }
-// entity 101
+// entity 93
 {
 "classname" "target_speaker"
 "origin" "2088.000000 -448.000000 144.000000"
@@ -6065,7 +6008,7 @@ analmango/reactor_beam
 "targetname" "thunder_1c"
 "spawnflags" "8"
 }
-// entity 102
+// entity 94
 {
 "classname" "target_relay"
 "origin" "2064.000000 -408.000000 144.000000"