Minor adjustments to p5 and p6.

2 files changed, 55 insertions, 50 deletions

diff --git a/maps/p5_euclid.map b/maps/p5_euclid.map
index 97a39dc..201bf4d 100644
--- a/maps/p5_euclid.map
+++ b/maps/p5_euclid.map
@@ -894,51 +894,6 @@ analmango/euclid
 }
 // brush 89
 {
-( 192 -1344 -512 ) ( 176 -1328 -512 ) ( 192 -1216 -512 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
-( 176 -1328 -640 ) ( 176 -1328 -512 ) ( 192 -1344 -640 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-( 192 -1216 -512 ) ( 192 -1344 -640 ) ( 192 -1344 -512 ) analmango/euclid -0 0 0 -0.5 0.5 0 0 0
-( 176 -1216 -640 ) ( 176 -1328 -640 ) ( 192 -1216 -640 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
-( 192 -1216 -640 ) ( 176 -1216 -512 ) ( 176 -1216 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
-( 176 -1328 -512 ) ( 176 -1328 -640 ) ( 176 -1216 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-}
-// brush 90
-{
-( 320 -1216 -512 ) ( 336 -1328 -512 ) ( 320 -1344 -512 ) common/caulk 0 0 180 0.5 0.5 0 0 0
-( 320 -1344 -640 ) ( 336 -1328 -512 ) ( 336 -1328 -640 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-( 320 -1344 -512 ) ( 320 -1344 -640 ) ( 320 -1216 -512 ) analmango/euclid -0 0 0 -0.5 0.5 0 0 0
-( 320 -1216 -640 ) ( 336 -1328 -640 ) ( 336 -1216 -640 ) common/caulk 0 0 180 0.5 0.5 0 0 0
-( 336 -1216 -640 ) ( 336 -1216 -512 ) ( 320 -1216 -640 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
-( 336 -1216 -512 ) ( 336 -1328 -640 ) ( 336 -1328 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-}
-// brush 91
-{
-( 192 -1344 -640 ) ( 192 -1216 -640 ) ( 320 -1344 -640 ) analmango/euclid 0 0 180 0.5 0.5 0 0 0
-( 192 -1344 -640 ) ( 320 -1344 -640 ) ( 192 -1344 -656 ) common/caulk 0 32 0 -0.5 0.5 0 0 0
-( 192 -1344 -640 ) ( 192 -1344 -656 ) ( 192 -1216 -640 ) common/caulk -0 32 0 -0.5 0.5 0 0 0
-( 320 -1216 -656 ) ( 192 -1216 -656 ) ( 320 -1344 -656 ) common/caulk 0 0 180 0.5 0.5 0 0 0
-( 320 -1216 -656 ) ( 320 -1216 -640 ) ( 192 -1216 -656 ) common/caulk 0 32 0 -0.5 0.5 0 0 0
-( 320 -1216 -656 ) ( 320 -1344 -656 ) ( 320 -1216 -640 ) common/caulk -0 32 0 -0.5 0.5 0 0 0
-}
-// brush 92
-{
-( 192 -1344 -496 ) ( 192 -1216 -496 ) ( 320 -1344 -496 ) common/caulk 0 0 180 0.5 0.5 0 0 0
-( 192 -1344 -496 ) ( 320 -1344 -496 ) ( 192 -1344 -512 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
-( 192 -1344 -496 ) ( 192 -1344 -512 ) ( 192 -1216 -496 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-( 320 -1216 -512 ) ( 192 -1216 -512 ) ( 320 -1344 -512 ) analmango/euclid 0 0 180 0.5 0.5 0 0 0
-( 320 -1216 -512 ) ( 320 -1216 -496 ) ( 192 -1216 -512 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
-( 320 -1216 -512 ) ( 320 -1344 -512 ) ( 320 -1216 -496 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
-}
-// brush 93
-{
-( 192 -1216 -512 ) ( 192 -1200 -512 ) ( 320 -1216 -512 ) common/nodiscard 0 0 180 0.5 0.5 0 0 0
-( 192 -1216 -512 ) ( 320 -1216 -512 ) ( 192 -1216 -640 ) common/nodiscard 0 0 0 -0.5 0.5 0 0 0
-( 192 -1216 -512 ) ( 192 -1216 -640 ) ( 192 -1200 -512 ) common/nodiscard -0 0 0 -0.5 0.5 0 0 0
-( 320 -1200 -640 ) ( 192 -1200 -640 ) ( 320 -1216 -640 ) common/nodiscard 0 0 180 0.5 0.5 0 0 0
-( 320 -1200 -640 ) ( 320 -1200 -512 ) ( 192 -1200 -640 ) common/nodiscard 0 0 0 -0.5 0.5 0 0 0
-( 320 -1200 -640 ) ( 320 -1216 -640 ) ( 320 -1200 -512 ) common/nodiscard -0 0 0 -0.5 0.5 0 0 0
-}
-// brush 94
-{
 ( 64 -2048 -512 ) ( 176 -2064 -512 ) ( 64 -2064 -512 ) common/caulk 0 -0 0 0.5 0.5 0 0 0
 ( 576 -2048 -640 ) ( -72 -2048 -512 ) ( -72 -2048 -640 ) analmango/euclid 0 0 0 0.5 0.5 0 0 0
 ( 64 -2064 -640 ) ( 176 -2064 -640 ) ( 64 -2048 -640 ) common/caulk 0 -0 0 0.5 0.5 0 0 0
@@ -946,7 +901,7 @@ analmango/euclid
 ( 64 -2048 -448 ) ( 64 -2056 -576 ) ( 64 -2048 -576 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 192 -2048 -512 ) ( 176 -2064 -640 ) ( 176 -2064 -512 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
-// brush 95
+// brush 90
 {
 ( 576 -2064 -512 ) ( 336 -2064 -512 ) ( 576 -2048 -512 ) common/caulk 0 -0 0 0.5 0.5 0 0 0
 ( 576 -2048 -640 ) ( -72 -2048 -512 ) ( -72 -2048 -640 ) analmango/euclid 0 0 0 0.5 0.5 0 0 0
@@ -955,7 +910,7 @@ analmango/euclid
 ( 576 -2064 -512 ) ( 336 -2064 -640 ) ( 336 -2064 -512 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( 320 -2048 -640 ) ( 336 -2064 -512 ) ( 336 -2064 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 }
-// brush 96
+// brush 91
 {
 ( 320 -1344 -512 ) ( 576 -1328 -512 ) ( 576 -1344 -512 ) common/caulk 0 0 180 0.5 0.5 0 0 0
 ( 320 -1344 -640 ) ( 576 -1344 -512 ) ( 576 -1344 -640 ) analmango/euclid 0 0 0 -0.5 0.5 0 0 0
@@ -964,7 +919,7 @@ analmango/euclid
 ( 576 -1328 -512 ) ( 576 -1344 -640 ) ( 576 -1344 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
 ( 320 -1344 -512 ) ( 336 -1328 -640 ) ( 336 -1328 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
 }
-// brush 97
+// brush 92
 {
 ( 320 -2048 -512 ) ( 320 -2064 -512 ) ( 192 -2048 -512 ) common/discard 0 0 0 0.5 0.5 0 0 0
 ( 320 -2048 -512 ) ( 192 -2048 -512 ) ( 320 -2048 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
@@ -973,6 +928,51 @@ analmango/euclid
 ( 192 -2064 -640 ) ( 192 -2064 -512 ) ( 320 -2064 -640 ) common/discard 0 0 0 0.5 0.5 0 0 0
 ( 192 -2064 -640 ) ( 192 -2048 -640 ) ( 192 -2064 -512 ) common/discard 0 0 0 0.5 0.5 0 0 0
 }
+// brush 93
+{
+( 192 -1344 -512 ) ( 176 -1280 -512 ) ( 192 -1280 -512 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( 176 -1328 -640 ) ( 176 -1328 -512 ) ( 192 -1344 -640 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+( 192 -1344 -640 ) ( 192 -1280 -512 ) ( 192 -1280 -640 ) analmango/euclid -0 0 0 -0.5 0.5 0 0 0
+( 192 -1344 -640 ) ( 176 -1280 -640 ) ( 176 -1328 -640 ) common/caulk 0 0 0 0.5 -0.5 0 0 0
+( 192 -1280 -640 ) ( 176 -1280 -512 ) ( 176 -1280 -640 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 176 -1328 -512 ) ( 176 -1280 -640 ) ( 176 -1280 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+}
+// brush 94
+{
+( 320 -1280 -512 ) ( 336 -1280 -512 ) ( 320 -1344 -512 ) common/caulk 0 0 180 0.5 0.5 0 0 0
+( 320 -1344 -640 ) ( 336 -1328 -512 ) ( 336 -1328 -640 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+( 320 -1344 -512 ) ( 320 -1280 -640 ) ( 320 -1280 -512 ) analmango/euclid -0 0 0 -0.5 0.5 0 0 0
+( 320 -1344 -640 ) ( 336 -1280 -640 ) ( 320 -1280 -640 ) common/caulk 0 0 180 0.5 0.5 0 0 0
+( 320 -1280 -512 ) ( 336 -1280 -640 ) ( 336 -1280 -512 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
+( 336 -1328 -640 ) ( 336 -1280 -512 ) ( 336 -1280 -640 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+}
+// brush 95
+{
+( 320 -1344 -640 ) ( 192 -1280 -640 ) ( 320 -1280 -640 ) analmango/euclid 0 0 180 0.5 0.5 0 0 0
+( 192 -1344 -640 ) ( 320 -1344 -640 ) ( 192 -1344 -656 ) common/caulk 0 32 0 -0.5 0.5 0 0 0
+( 192 -1344 -640 ) ( 192 -1280 -656 ) ( 192 -1280 -640 ) common/caulk -0 32 0 -0.5 0.5 0 0 0
+( 320 -1344 -656 ) ( 320 -1280 -656 ) ( 192 -1280 -656 ) common/caulk 0 0 180 0.5 0.5 0 0 0
+( 320 -1344 -640 ) ( 320 -1280 -656 ) ( 320 -1344 -656 ) common/caulk -0 32 0 -0.5 0.5 0 0 0
+( 320 -1280 -640 ) ( 192 -1280 -656 ) ( 320 -1280 -656 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 96
+{
+( 320 -1344 -496 ) ( 192 -1280 -496 ) ( 320 -1280 -496 ) common/caulk 0 0 180 0.5 0.5 0 0 0
+( 192 -1344 -496 ) ( 320 -1344 -496 ) ( 192 -1344 -512 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
+( 192 -1344 -512 ) ( 192 -1280 -496 ) ( 192 -1344 -496 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+( 192 -1344 -512 ) ( 320 -1280 -512 ) ( 192 -1280 -512 ) analmango/euclid 0 0 180 0.5 0.5 0 0 0
+( 320 -1344 -512 ) ( 320 -1280 -496 ) ( 320 -1280 -512 ) common/caulk -0 0 0 -0.5 0.5 0 0 0
+( 192 -1280 -512 ) ( 320 -1280 -496 ) ( 192 -1280 -496 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+}
+// brush 97
+{
+( 320 -1264 -512 ) ( 320 -1280 -512 ) ( 192 -1264 -512 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 320 -1264 -480 ) ( 192 -1264 -480 ) ( 320 -1264 -640 ) common/nodiscard 0 32 0 0.5 0.5 0 0 0
+( 320 -1264 -480 ) ( 320 -1264 -640 ) ( 320 -1280 -480 ) common/nodiscard 0 32 0 0.5 0.5 0 0 0
+( 192 -1280 -640 ) ( 320 -1280 -640 ) ( 192 -1264 -640 ) common/nodiscard 0 0 0 0.5 0.5 0 0 0
+( 192 -1280 -640 ) ( 192 -1280 -480 ) ( 320 -1280 -640 ) common/nodiscard 0 32 0 0.5 0.5 0 0 0
+( 192 -1280 -640 ) ( 192 -1264 -640 ) ( 192 -1280 -480 ) common/nodiscard 0 32 0 0.5 0.5 0 0 0
+}
 }
 // entity 1
 {
@@ -1161,3 +1161,8 @@ analmango/euclid
 "noise" "sound/analmango/euclid_4.wav"
 "spawnflags" "1"
 }
+// entity 27
+{
+"classname" "trigger_multiple"
+"target" "tele_1"
+}
diff --git a/maps/p6_engineering.map b/maps/p6_engineering.map
index 2ccfb72..b331afb 100644
--- a/maps/p6_engineering.map
+++ b/maps/p6_engineering.map
@@ -4975,7 +4975,7 @@ nexus6/barrel_rst_top
 "targetname" "antilift_1"
 "lip" "654"
 "angle" "-2"
-"wait" "5"
+"wait" "6"
 "sound1to2" "sound/null.wav"
 "sound2to1" "sound/null.wav"
 "soundPos1" "sound/null.wav"
@@ -5683,7 +5683,7 @@ nexus6/barrel_rst_top
 "classname" "func_button"
 "angle" "270"
 "target" "antilift_1"
-"lip" "2"
+"lip" "3"
 // brush 0
 {
 ( 46 -2824 -596 ) ( 50 -2820 -596 ) ( 50 -2824 -596 ) nexus6/blackwall 0 80 0 0.25 0.25 0 0 0