Improve p7 further.

1 files changed, 134 insertions, 142 deletions

diff --git a/maps/p7_uncommon.map b/maps/p7_uncommon.map
index d6b6694..bd135a2 100644
--- a/maps/p7_uncommon.map
+++ b/maps/p7_uncommon.map
@@ -5128,60 +5128,43 @@ uncommon/qer_invisible
 }
 // brush 553
 {
-( -1896 1071 -76 ) ( -1920 1095 -76 ) ( -1896 1095 -76 ) uncommon/trigger 0 62 0 0.5 0.5 134217728 0 0
-( -1896 1096 -72 ) ( -1920 1096 -80 ) ( -1896 1096 -80 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1912 1072 -80 ) ( -1912 1096 -72 ) ( -1912 1096 -80 ) uncommon/black 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1072 -77 ) ( -1896 1096 -77 ) ( -1920 1096 -77 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1896 1072 -80 ) ( -1920 1072 -72 ) ( -1896 1072 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1072 -72 ) ( -1920 1096 -80 ) ( -1920 1096 -72 ) uncommon/trigger 16 0 0 0.5 0.5 134217728 0 0
+( -1896 1072 -88 ) ( -1896 1072 -72 ) ( -1896 1096 -72 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1072 -88 ) ( -1920 1096 -72 ) ( -1920 1072 -72 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1072 -88 ) ( -1896 1096 -88 ) ( -1920 1096 -88 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1920 1072 -88 ) ( -1920 1072 -72 ) ( -1896 1072 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1920 1096 -88 ) ( -1896 1096 -72 ) ( -1920 1096 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( 64 1096 -80 ) ( -64 1084 -80 ) ( -64 1096 -80 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 554
 {
-( -1896 1112 -48 ) ( -1896 1056 -48 ) ( -1920 1056 -48 ) uncommon/trigger 32 0 0 0.5 0.5 134217728 0 0
-( -1920 1112 -64 ) ( -1920 1112 -76 ) ( -1896 1112 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1072 -48 ) ( -1896 1112 -76 ) ( -1896 1056 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1056 -64 ) ( -1896 1056 -76 ) ( -1920 1056 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1096 -48 ) ( -1920 1056 -76 ) ( -1920 1112 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1112 -76 ) ( -1920 1056 -76 ) ( -1896 1056 -76 ) uncommon/black 0 0 0 0.5 0.5 134217728 0 0
-( 64 1112 -64 ) ( -64 1096 -48 ) ( -64 1112 -64 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( 64 1072 -48 ) ( -64 1056 -64 ) ( -64 1072 -48 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1896 1096 -128 ) ( -1896 1072 -89 ) ( -1896 1096 -89 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1056 -128 ) ( -1896 1096 -128 ) ( -1920 1096 -128 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1920 1072 -128 ) ( -1920 1096 -89 ) ( -1920 1072 -89 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1096 -128 ) ( -1896 1096 -89 ) ( -1920 1096 -89 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1896 1072 -89 ) ( -1920 1096 -89 ) ( -1896 1096 -89 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1896 1072 -128 ) ( -1920 1072 -89 ) ( -1896 1072 -89 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 // brush 555
 {
-( -1920 1112 -128 ) ( -1896 1112 -76 ) ( -1920 1112 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1112 -128 ) ( -1896 1096 -76 ) ( -1896 1112 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1112 -128 ) ( -1920 1096 -128 ) ( -1896 1096 -128 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1096 -128 ) ( -1920 1112 -76 ) ( -1920 1096 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1112 -76 ) ( -1896 1096 -76 ) ( -1920 1096 -76 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1096 -128 ) ( -1920 1096 -76 ) ( -1896 1096 -76 ) uncommon/black 0 0 0 0.5 0.5 134217728 0 0
-}
-// brush 556
-{
-( -1896 1056 -128 ) ( -1896 1056 -77 ) ( -1896 1096 -77 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1896 1072 -128 ) ( -1896 1056 -88 ) ( -1896 1072 -72 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1072 -128 ) ( -1920 1072 -72 ) ( -1920 1056 -88 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1072 -128 ) ( -1896 1072 -72 ) ( -1920 1072 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
 ( -1920 1056 -128 ) ( -1896 1096 -128 ) ( -1920 1096 -128 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1896 1056 -128 ) ( -1920 1056 -77 ) ( -1896 1056 -77 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1056 -128 ) ( -1920 1096 -77 ) ( -1920 1056 -77 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1096 -128 ) ( -1896 1096 -77 ) ( -1920 1096 -77 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1896 1056 -77 ) ( -1920 1096 -77 ) ( -1896 1096 -77 ) uncommon/black 0 0 0 0.5 0.5 134217728 0 0
+( 64 1080 -72 ) ( -64 1072 -80 ) ( -64 1080 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( 64 1064 -104 ) ( -64 1064 -112 ) ( -64 1064 -104 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
-// brush 557
+// brush 556
 {
-( -1896 1072 -77 ) ( -1896 1056 -76 ) ( -1896 1072 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1056 -77 ) ( -1920 1056 -76 ) ( -1896 1056 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1920 1056 -77 ) ( -1920 1072 -76 ) ( -1920 1056 -76 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
-( -1896 1056 -76 ) ( -1920 1072 -76 ) ( -1896 1072 -76 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1056 -77 ) ( -1896 1072 -77 ) ( -1920 1072 -77 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
-( -1920 1072 -77 ) ( -1896 1072 -76 ) ( -1920 1072 -76 ) uncommon/black 0 0 0 0.5 0.5 134217728 0 0
+( -1896 1096 -128 ) ( -1896 1096 -72 ) ( -1896 1112 -88 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1920 1096 -128 ) ( -1920 1112 -88 ) ( -1920 1096 -72 ) uncommon/trigger 0 32 0 0.5 0.5 134217728 0 0
+( -1896 1096 -128 ) ( -1920 1096 -72 ) ( -1896 1096 -72 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( -1896 1112 -128 ) ( -1920 1096 -128 ) ( -1896 1096 -128 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( 64 1104 -88 ) ( -64 1096 -80 ) ( -64 1104 -88 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
+( 64 1104 -112 ) ( -64 1104 -100 ) ( -64 1104 -112 ) uncommon/trigger 0 0 0 0.5 0.5 134217728 0 0
 }
 }
 // entity 1
 {
-"classname" "light"
-"origin" "-1184.000000 504.000000 -544.000000"
-"light" "100"
-}
-// entity 2
-{
 "classname" "func_door"
 "angle" "270"
 "team" "exit"
@@ -5197,7 +5180,7 @@ uncommon/qer_invisible
 ( -1288 552 -640 ) ( -1288 504 -448 ) ( -1336 504 -448 ) uncommon/botclip 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 3
+// entity 2
 {
 "classname" "func_door"
 "angle" "90"
@@ -5214,34 +5197,34 @@ uncommon/qer_invisible
 ( -1288 552 -640 ) ( -1336 504 -448 ) ( -1288 504 -448 ) uncommon/botclip 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 4
+// entity 3
 {
 "classname" "info_alien_intermission"
 "origin" "-1032.000000 408.000000 -552.000000"
 "angle" "-179.999985"
 "mapcat_discard" " "
 }
-// entity 5
+// entity 4
 {
 "classname" "info_human_intermission"
 "origin" "-1032.000000 440.000000 -552.000000"
 "angle" "-179.999985"
 "mapcat_discard" " "
 }
-// entity 6
+// entity 5
 {
 "classname" "info_player_intermission"
 "origin" "-1032.000000 464.000000 -552.000000"
 "angle" "-179.999985"
 "mapcat_discard" " "
 }
-// entity 7
+// entity 6
 {
 "classname" "team_alien_spawn"
 "origin" "-1120.000000 528.000000 -608.000000"
 "mapcat_discard" " "
 }
-// entity 8
+// entity 7
 {
 "classname" "func_door"
 "angle" "-1"
@@ -5255,278 +5238,278 @@ uncommon/qer_invisible
 ( -1984 480 -320 ) ( -1984 352 -192 ) ( -1984 352 -320 ) uncommon/nodrop 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 9
+// entity 8
 {
 "classname" "light"
 "origin" "-1952.000000 1232.000000 -520.000000"
 "light" "25"
 }
-// entity 10
+// entity 9
 {
 "classname" "light"
 "origin" "-1952.000000 1232.000000 -568.000000"
 "light" "25"
 }
-// entity 11
+// entity 10
 {
 "classname" "light"
 "origin" "-1456.000000 288.000000 -568.000000"
 "light" "25"
 }
-// entity 12
+// entity 11
 {
 "classname" "light"
 "origin" "-1456.000000 288.000000 -520.000000"
 "light" "25"
 }
-// entity 13
+// entity 12
 {
 "classname" "light"
 "origin" "-1584.000000 160.000000 -568.000000"
 "light" "25"
 }
-// entity 14
+// entity 13
 {
 "classname" "light"
 "origin" "-1584.000000 160.000000 -520.000000"
 "light" "25"
 }
-// entity 15
+// entity 14
 {
 "classname" "light"
 "origin" "-1584.000000 736.000000 -568.000000"
 "light" "25"
 }
-// entity 16
+// entity 15
 {
 "classname" "light"
 "origin" "-1584.000000 736.000000 -520.000000"
 "light" "25"
 }
-// entity 17
+// entity 16
 {
 "classname" "light"
 "origin" "-1456.000000 736.000000 -568.000000"
 "light" "25"
 }
-// entity 18
+// entity 17
 {
 "classname" "light"
 "origin" "-1456.000000 736.000000 -520.000000"
 "light" "25"
 }
-// entity 19
+// entity 18
 {
 "classname" "light"
 "origin" "-1456.000000 992.000000 -568.000000"
 "light" "25"
 }
-// entity 20
+// entity 19
 {
 "classname" "light"
 "origin" "-1456.000000 992.000000 -520.000000"
 "light" "25"
 }
-// entity 21
+// entity 20
 {
 "classname" "light"
 "origin" "-1728.000000 1232.000000 -568.000000"
 "light" "25"
 }
-// entity 22
+// entity 21
 {
 "classname" "light"
 "origin" "-1728.000000 1232.000000 -520.000000"
 "light" "25"
 }
-// entity 23
+// entity 22
 {
 "classname" "light"
 "origin" "-1728.000000 880.000000 -568.000000"
 "light" "25"
 }
-// entity 24
+// entity 23
 {
 "classname" "light"
 "origin" "-1728.000000 880.000000 -520.000000"
 "light" "25"
 }
-// entity 25
+// entity 24
 {
 "classname" "light"
 "origin" "-1952.000000 880.000000 -568.000000"
 "light" "25"
 }
-// entity 26
+// entity 25
 {
 "classname" "light"
 "origin" "-1952.000000 880.000000 -520.000000"
 "light" "25"
 }
-// entity 27
+// entity 26
 {
 "classname" "light"
 "origin" "-1840.000000 1136.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 28
+// entity 27
 {
 "classname" "light"
 "origin" "-1520.000000 496.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 29
+// entity 28
 {
 "classname" "light"
 "origin" "-1000.000000 720.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 30
+// entity 29
 {
 "classname" "light"
 "origin" "-1520.000000 208.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 31
+// entity 30
 {
 "classname" "light"
 "origin" "-1520.000000 656.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 32
+// entity 31
 {
 "classname" "light"
 "origin" "-1520.000000 816.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 33
+// entity 32
 {
 "classname" "light"
 "origin" "-1840.000000 976.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 34
+// entity 33
 {
 "classname" "light"
 "origin" "-1520.000000 976.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 35
+// entity 34
 {
 "classname" "light"
 "origin" "-1520.000000 1136.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 36
+// entity 35
 {
 "classname" "light"
 "origin" "-1680.000000 976.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 37
+// entity 36
 {
 "classname" "light"
 "origin" "-1680.000000 1136.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 38
+// entity 37
 {
 "classname" "light"
 "origin" "-1168.000000 232.000000 -464.000000"
 "light" "35"
 }
-// entity 39
+// entity 38
 {
 "classname" "light"
 "origin" "-1008.000000 720.000000 -464.000000"
 "light" "35"
 }
-// entity 40
+// entity 39
 {
 "classname" "light"
 "origin" "-1520.000000 336.000000 -936.000000"
 "light" "35"
 "_color" "0.760006 1 0"
 }
-// entity 41
+// entity 40
 {
 "classname" "light"
 "origin" "-1360.000000 720.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 42
+// entity 41
 {
 "classname" "light"
 "origin" "-1240.000000 720.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 43
+// entity 42
 {
 "classname" "light"
 "origin" "-1168.000000 240.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 44
+// entity 43
 {
 "classname" "light"
 "origin" "-1128.000000 720.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 45
+// entity 44
 {
 "classname" "light"
 "origin" "-1168.000000 624.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 46
+// entity 45
 {
 "classname" "light"
 "origin" "-1168.000000 504.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 47
+// entity 46
 {
 "classname" "light"
 "origin" "-1168.000000 384.000000 -784.000000"
 "light" "15"
 "_color" "0.760006 1 0"
 }
-// entity 48
+// entity 47
 {
 "classname" "light"
 "origin" "-2064.000000 320.000000 -256.000000"
 "light" "20"
 }
-// entity 49
+// entity 48
 {
 "classname" "light"
 "origin" "-1696.000000 1376.000000 0.000000"
 "light" "35"
 }
-// entity 50
+// entity 49
 {
 "classname" "team_human_spawn"
 "origin" "-1824.000000 520.000000 -304.000000"
 "mapcat_discard" " "
 }
-// entity 51
+// entity 50
 {
 "classname" "func_door_rotating"
 "rotatorAngle" "3600"
@@ -5572,7 +5555,7 @@ uncommon/qer_invisible
 ( -1731.2734375 1233.7639160156 -92.7639312744 ) ( -1732 1236 -92 ) ( -1729.6488037109 1236 -92.7639312744 ) uncommon/qer_nolightmap 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 52
+// entity 51
 {
 "classname" "func_door_rotating"
 "rotatorAngle" "3600"
@@ -5618,7 +5601,7 @@ uncommon/qer_invisible
 ( -1784 1200 -128 ) ( -1784 1208 -128 ) ( -1784 1200 -64 ) common/origin 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 53
+// entity 52
 {
 "classname" "func_door_rotating"
 "rotatorAngle" "3600"
@@ -5664,7 +5647,7 @@ uncommon/qer_invisible
 ( -1768 1264 -128 ) ( -1768 1272 -128 ) ( -1768 1264 -64 ) common/origin 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 54
+// entity 53
 {
 "classname" "func_door_rotating"
 "rotatorAngle" "3600"
@@ -5710,7 +5693,7 @@ uncommon/qer_invisible
 ( -1747.2734375 1241.7639160156 -92.7639312744 ) ( -1748 1244 -92 ) ( -1745.6488037109 1244 -92.7639312744 ) uncommon/slick 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 55
+// entity 54
 {
 "classname" "func_door_rotating"
 "rotatorAngle" "3600"
@@ -5756,7 +5739,7 @@ uncommon/qer_invisible
 ( -1688 1240 -128 ) ( -1688 1248 -128 ) ( -1688 1240 -64 ) common/origin 0 0 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 56
+// entity 55
 {
 "classname" "func_door"
 "angle" "90"
@@ -5807,7 +5790,7 @@ uncommon/qer_invisible
 ( -1576 1280 -128 ) ( -1576 1224 -120 ) ( -1576 1216 -128 ) uncommon/qer_nolightmap 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 57
+// entity 56
 {
 "classname" "func_door"
 "angle" "270"
@@ -5858,121 +5841,121 @@ uncommon/qer_invisible
 ( -1576 1152 0 ) ( -1576 1160 -8 ) ( -1576 1216 0 ) uncommon/qer_nolightmap 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 58
+// entity 57
 {
 "classname" "light"
 "origin" "-1824.000000 992.000000 -192.000000"
 "light" "35"
 }
-// entity 59
+// entity 58
 {
 "classname" "light"
 "origin" "-1696.000000 600.000000 -176.000000"
 "light" "35"
 }
-// entity 60
+// entity 59
 {
 "classname" "light"
 "origin" "-1696.000000 352.000000 -176.000000"
 "light" "35"
 }
-// entity 61
+// entity 60
 {
 "classname" "light"
 "origin" "-1696.000000 864.000000 0.000000"
 "light" "35"
 }
-// entity 62
+// entity 61
 {
 "classname" "light"
 "origin" "-1696.000000 992.000000 0.000000"
 "light" "35"
 }
-// entity 63
+// entity 62
 {
 "classname" "light"
 "origin" "-1696.000000 1120.000000 0.000000"
 "light" "35"
 }
-// entity 64
+// entity 63
 {
 "classname" "light"
 "origin" "-1696.000000 1248.000000 0.000000"
 "light" "35"
 }
-// entity 65
+// entity 64
 {
 "classname" "light"
 "origin" "-1824.000000 1376.000000 0.000000"
 "light" "35"
 }
-// entity 66
+// entity 65
 {
 "classname" "light"
 "origin" "-1824.000000 736.000000 0.000000"
 "light" "35"
 }
-// entity 67
+// entity 66
 {
 "classname" "light"
 "origin" "-1824.000000 864.000000 0.000000"
 "light" "35"
 }
-// entity 68
+// entity 67
 {
 "classname" "light"
 "origin" "-1824.000000 992.000000 0.000000"
 "light" "35"
 }
-// entity 69
+// entity 68
 {
 "classname" "light"
 "origin" "-1824.000000 1120.000000 0.000000"
 "light" "35"
 }
-// entity 70
+// entity 69
 {
 "classname" "light"
 "origin" "-1824.000000 1248.000000 0.000000"
 "light" "35"
 }
-// entity 71
+// entity 70
 {
 "classname" "light"
 "origin" "-1824.000000 352.000000 -176.000000"
 "light" "35"
 }
-// entity 72
+// entity 71
 {
 "classname" "light"
 "origin" "-1824.000000 600.000000 -176.000000"
 "light" "35"
 }
-// entity 73
+// entity 72
 {
 "classname" "light"
 "origin" "-1696.000000 736.000000 0.000000"
 "light" "35"
 }
-// entity 74
+// entity 73
 {
 "classname" "light"
 "origin" "-1728.000000 1000.000000 -232.000000"
 "light" "12"
 }
-// entity 75
+// entity 74
 {
 "classname" "light"
 "origin" "-1696.000000 480.000000 -176.000000"
 "light" "35"
 }
-// entity 76
+// entity 75
 {
 "classname" "light"
 "origin" "-1824.000000 480.000000 -176.000000"
 "light" "35"
 }
-// entity 77
+// entity 76
 {
 "classname" "target_speaker"
 "origin" "-1624.000000 648.000000 -180.000000"
@@ -5981,21 +5964,21 @@ uncommon/qer_invisible
 "targetname" "music"
 "spawnflags" "2"
 }
-// entity 78
+// entity 77
 {
 "classname" "misc_model"
 "origin" "-1624.386719 647.999390 -180.018631"
 "model" "models/mapobjects/analmango/speaker2.md3"
 "angles" "-24.902071 0.000006 0.000005"
 }
-// entity 79
+// entity 78
 {
 "classname" "misc_model"
 "origin" "-1896.000244 1208.000122 3.999999"
 "model" "models/mapobjects/analmango/speaker2.md3"
 "angles" "-19.353058 -179.999985 0.000010"
 }
-// entity 80
+// entity 79
 {
 "classname" "target_speaker"
 "origin" "-1896.000000 1208.000000 4.000000"
@@ -6003,21 +5986,21 @@ uncommon/qer_invisible
 "targetname" "music"
 "spawnflags" "2"
 }
-// entity 81
+// entity 80
 {
 "classname" "func_button"
 "angle" "180"
 "target" "music"
 // brush 0
 {
-( -1888 1064 -120 ) ( -1888 1096 -88 ) ( -1888 1096 -120 ) uncommon/metalclip 16 0 0 0.5 0.5 134217728 0 0
-( -1896 1064 -128 ) ( -1896 1064 -80 ) ( -1888 1064 -128 ) uncommon/metalclip 0 0 0 0.5 0.5 134217728 0 0
-( -1896 1064 -88 ) ( -1896 1096 -120 ) ( -1896 1096 -88 ) uncommon/metalclip 16 0 0 0.5 0.5 134217728 0 0
-( 32 1064 -120 ) ( -96 1096 -104 ) ( -96 1064 -120 ) uncommon/metalclip 0 48 0 0.5 0.5 134217728 0 0
-( 32 1096 -104 ) ( -96 1064 -88 ) ( -96 1096 -104 ) uncommon/metalclip 0 48 0 0.5 0.5 134217728 0 0
+( -1892 1076 -96 ) ( -1892 1092 -104 ) ( -1892 1076 -112 ) uncommon/metalclip 16 0 0 0.5 0.5 134217728 0 0
+( -1892 1076 -96 ) ( -1896 1076 -112 ) ( -1896 1076 -96 ) uncommon/metalclip 8 0 0 0.5 0.5 134217728 0 0
+( -1896 1092 -104 ) ( -1896 1076 -96 ) ( -1896 1076 -112 ) uncommon/metalclip 16 0 0 0.5 0.5 134217728 0 0
+( -1892 1076 -112 ) ( -1896 1092 -104 ) ( -1896 1076 -112 ) uncommon/metalclip 8 48 0 0.5 0.5 134217728 0 0
+( -1892 1092 -104 ) ( -1896 1076 -96 ) ( -1896 1092 -104 ) uncommon/metalclip 8 48 0 0.5 0.5 134217728 0 0
 }
 }
-// entity 82
+// entity 81
 {
 "classname" "func_door"
 "targetname" "music_cd"
@@ -6026,15 +6009,15 @@ uncommon/qer_invisible
 "wait" "360000"
 // brush 0
 {
-( -1896 1112 -80 ) ( -1884 1112 -88 ) ( -1884 1056 -88 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
-( -1896 1112 -128 ) ( -1884 1112 -88 ) ( -1896 1112 -80 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
-( -1884 1056 -128 ) ( -1884 1056 -88 ) ( -1884 1112 -88 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
-( -1896 1056 -128 ) ( -1880 1056 -128 ) ( -1896 1112 -128 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
-( -1896 1056 -128 ) ( -1884 1056 -88 ) ( -1884 1056 -128 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
-( -1896 1112 -128 ) ( -1896 1112 -80 ) ( -1896 1056 -80 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1896 1104 -92 ) ( -1890 1104 -96 ) ( -1890 1064 -96 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1896 1104 -128 ) ( -1890 1104 -128 ) ( -1896 1104 -92 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1890 1064 -96 ) ( -1890 1104 -128 ) ( -1890 1064 -128 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1896 1064 -128 ) ( -1890 1064 -128 ) ( -1890 1104 -128 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1896 1064 -92 ) ( -1890 1064 -128 ) ( -1896 1064 -128 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
+( -1896 1104 -128 ) ( -1896 1104 -92 ) ( -1896 1064 -92 ) uncommon/trigger 0 0 0 0.5 0.5 0 0 0
 }
 }
-// entity 83
+// entity 82
 {
 "classname" "func_button"
 "health" "1"
@@ -6054,8 +6037,17 @@ uncommon/qer_invisible
 ( -1745 1088.4998779297 -325.8255615234 ) ( -1745 1066.2092285156 -316.9302062988 ) ( -1721 1088.4998779297 -325.8255615234 ) common/caulk 2 43.4906044006 0 0.5 -0.5383427143 0 0 0
 ( -1745 1088.4998779297 -325.8255615234 ) ( -1745 1097.3952636719 -303.534942627 ) ( -1745 1066.2092285156 -316.9302062988 ) common/caulk 6.3541092873 40.5254859924 68.2448806763 0.5 0.5 0 0 0
 }
+// brush 1
+{
+( -1721 1061.0349121094 -282.1047058105 ) ( -1721 1052.1395263672 -304.395324707 ) ( -1745 1061.0349121094 -282.1047058105 ) common/caulk 26.6669921875 44.0627059937 0 0.1875 0.1741454452 0 0 0
+( -1721 1075.1046142578 -294.6395568848 ) ( -1745 1075.1046142578 -294.6395568848 ) ( -1721 1097.3952636719 -303.534942627 ) common/caulk 2 43.4906044006 0 0.5 -0.5383427143 0 0 0
+( -1721 1075.1046142578 -294.6395568848 ) ( -1721 1097.3952636719 -303.534942627 ) ( -1721 1066.2093505859 -316.9302062988 ) common/caulk 6.3541092873 40.5254859924 68.2448806763 0.5 0.5 0 0 0
+( -1745 1072.0697021484 -321.8604431152 ) ( -1721 1072.0697021484 -321.8604431152 ) ( -1745 1080.9650878906 -299.5698242188 ) common/caulk 2 60.244720459 0 0.5 0.5383427143 0 0 0
+( -1745 1088.4998779297 -325.8255615234 ) ( -1745 1066.2093505859 -316.9302062988 ) ( -1721 1088.4998779297 -325.8255615234 ) common/caulk 2 43.4906044006 0 0.5 -0.5383427143 0 0 0
+( -1745 1088.4998779297 -325.8255615234 ) ( -1745 1097.3952636719 -303.534942627 ) ( -1745 1066.2093505859 -316.9302062988 ) common/caulk 6.3541092873 40.5254859924 68.2448806763 0.5 0.5 0 0 0
 }
-// entity 84
+}
+// entity 83
 {
 "classname" "func_door"
 "angle" "180"
@@ -6068,15 +6060,15 @@ uncommon/qer_invisible
 "soundPos2" "sound/null.wav"
 // brush 0
 {
-( -1884 1096 -76.5 ) ( -1884 1072 -76.5 ) ( -1908 1096 -76.5 ) analmango/wtf_5_cd_nonsolid 64.000328064 85.3334960938 0 0.1875 0.1875 0 0 0
-( -1884 1096 -44.5 ) ( -1908 1096 -44.5 ) ( -1884 1096 -124.5 ) common/nodrawnonsolid 40 7 0 0.5 0.5 0 0 0
-( -1884 1096 -44.5 ) ( -1884 1096 -124.5 ) ( -1884 1072 -44.5 ) common/nodrawnonsolid 0 7 0 0.5 0.5 0 0 0
-( -1908 1072 -77.5 ) ( -1884 1072 -77.5 ) ( -1908 1096 -77.5 ) common/nodrawnonsolid 40 0 0 0.5 0.5 0 0 0
-( -1908 1072 -124.5 ) ( -1908 1072 -44.5 ) ( -1884 1072 -124.5 ) common/nodrawnonsolid 40 7 0 0.5 0.5 0 0 0
-( -1908 1072 -124.5 ) ( -1908 1096 -124.5 ) ( -1908 1072 -44.5 ) common/nodrawnonsolid 0 7 0 0.5 0.5 0 0 0
+( -1884 1096 -88.5 ) ( -1884 1072 -88.5 ) ( -1908 1096 -88.5 ) analmango/wtf_5_cd_nonsolid 64.000328064 85.3334960938 0 0.1875 0.1875 0 0 0
+( -1884 1096 -56.5 ) ( -1908 1096 -56.5 ) ( -1884 1096 -136.5 ) common/nodrawnonsolid 40 47 0 0.5 0.5 0 0 0
+( -1884 1096 -56.5 ) ( -1884 1096 -136.5 ) ( -1884 1072 -56.5 ) common/nodrawnonsolid 0 47 0 0.5 0.5 0 0 0
+( -1908 1072 -89.5 ) ( -1884 1072 -89.5 ) ( -1908 1096 -89.5 ) common/nodrawnonsolid 40 0 0 0.5 0.5 0 0 0
+( -1908 1072 -136.5 ) ( -1908 1072 -56.5 ) ( -1884 1072 -136.5 ) common/nodrawnonsolid 40 47 0 0.5 0.5 0 0 0
+( -1908 1072 -136.5 ) ( -1908 1096 -136.5 ) ( -1908 1072 -56.5 ) common/nodrawnonsolid 0 47 0 0.5 0.5 0 0 0
 }
 }
-// entity 85
+// entity 84
 {
 "classname" "target_print"
 "origin" "-1664.000000 1040.000000 -272.000000"
@@ -6084,7 +6076,7 @@ uncommon/qer_invisible
 "message" "You found the CD!"
 "spawnflags" "4"
 }
-// entity 86
+// entity 85
 {
 "classname" "light"
 "origin" "-1696.000000 992.000000 -192.000000"