some tweaks, and hopefully fixed water.

diff --git a/maps/aqueous.map b/maps/aqueous.map
index 93176c0771edc11b7de70566ae261c6bd129d968..bface17b54ecf718756353c748c58c267b95d467 100644 (file)
--- a/maps/aqueous.map
+++ b/maps/aqueous.map
@@ -104,13 +104,13 @@
 ( -832 64 0 ) ( -800 64 0 ) ( -832 -64 0 ) exx/floor-rnd02 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 704 1024 128 ) ( 576 1024 128 ) ( 704 1024 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 576 -128 -80 ) ( 704 -128 -80 ) ( 576 576 -80 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -192 -16 ) ( 576 512 -16 ) ( 576 -192 176 ) exx/wall-metal01b 0 0 0 0.25 0.25 0 0 0
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 112 ) ( 608 -416 -16 ) ( 576 -384 -16 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( -832 64 0 ) ( -800 64 0 ) ( -832 -64 0 ) exx/floor-rnd02 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 384 -320 128 ) ( -320 -320 128 ) ( 384 -320 -64 ) exx/wall-metal01b 0 0 0 0.25 0.25 0 0 0
@@ -669,8 +669,8 @@
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 384 ) ( 608 -416 256 ) ( 576 -384 256 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( -48 -64 112 ) ( -32 64 112 ) ( -48 64 112 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
-( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( -184 64 144 ) ( -176 64 144 ) ( -184 -64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 384 -320 128 ) ( -320 -320 128 ) ( 384 -320 -64 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
@@ -1157,14 +1157,6 @@
 ( 384 488 -64 ) ( 384 480 -64 ) ( 384 488 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 576 624 192 ) ( 576 624 0 ) ( 576 488 192 ) exx/floor-clang01 96 0 0 0.25 0.25 0 0 0
-( 448 480 0 ) ( 448 544 0 ) ( 448 480 128 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
-( -832 -64 0 ) ( -800 64 0 ) ( -832 64 0 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
-( -48 64 112 ) ( -32 64 112 ) ( -48 -64 112 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
-( -264 448 -64 ) ( -264 448 128 ) ( 312 448 -64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( 480 512 -64 ) ( 512 512 -64 ) ( 480 512 64 ) trak7x/wall-wall1b 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 576 624 192 ) ( 576 624 0 ) ( 576 488 192 ) trak5x/base-base1a 96 0 0 0.25 0.25 0 0 0
 ( -264 448 -64 ) ( -264 448 128 ) ( 312 448 -64 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( -48 -64 112 ) ( -32 64 112 ) ( -48 64 112 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
@@ -1612,8 +1604,8 @@ exx/wall-bigrib02
 ( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak7x/wall-wallplain1 0 128 0 0.25 0.25 0 0 0
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 384 ) ( 608 -416 256 ) ( 576 -384 256 ) trak7x/wall-wallplain1 0 128 0 0.25 0.25 0 0 0
-( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
 ( -928 -64 352 ) ( -896 64 352 ) ( -928 64 352 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -320 -1440 448 ) ( -320 -1504 448 ) ( -1024 -1440 448 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
@@ -1987,9 +1979,9 @@ exx/wall-bigrib02
 ( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 384 ) ( 608 -416 256 ) ( 576 -384 256 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
-( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 592 64 288 ) ( 600 64 288 ) ( 592 -64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -320 -1440 128 ) ( -1024 -1440 128 ) ( -320 -1440 -64 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
@@ -16167,9 +16159,9 @@ trak5x/base-base1b
 ( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 384 ) ( 608 -416 256 ) ( 576 -384 256 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
-( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( -928 64 352 ) ( -896 64 352 ) ( -928 -64 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 440 -64 320 ) ( 472 64 320 ) ( 440 64 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -320 -1440 128 ) ( -1024 -1440 128 ) ( -320 -1440 -64 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
@@ -18175,9 +18167,9 @@ trak5x/base-base1b
 ( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
 ( 608 -448 64 ) ( 640 -448 -64 ) ( 608 -448 -64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 576 -384 384 ) ( 608 -416 256 ) ( 576 -384 256 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
-( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( 440 64 320 ) ( 472 64 320 ) ( 440 -64 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 592 -64 288 ) ( 600 64 288 ) ( 592 64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 320 -320 128 ) ( 320 -320 -64 ) ( 320 -448 128 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
@@ -18929,8 +18921,8 @@ trak5x/base-base1b
 ( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -192 -1392 64 ) ( -192 -1400 -64 ) ( -192 -1392 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -1416 -64 ) ( -64 -1432 -64 ) ( -64 -1416 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -120 64 256 ) ( -96 64 256 ) ( -120 -64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -128 -1488 -64 ) ( -112 -1488 -64 ) ( -128 -1488 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -120 64 248 ) ( -96 64 248 ) ( -120 -64 248 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -96 -1408 -64 ) ( -80 -1408 -64 ) ( -96 -1408 64 ) trak5x/panel-vertpanel1d 0 -32 0 0.25 0.25 0 0 0
 }
 {
 ( 384 -1376 128 ) ( 32 -1376 128 ) ( 384 -1376 -64 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -18945,7 +18937,7 @@ trak5x/base-base1b
 ( 32 -1504 -64 ) ( 32 -1504 128 ) ( 384 -1504 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -192 -1392 64 ) ( -192 -1400 -64 ) ( -192 -1392 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -64 -1416 -64 ) ( -64 -1432 -64 ) ( -64 -1416 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -120 -64 256 ) ( -96 64 256 ) ( -120 64 256 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -120 -64 248 ) ( -96 64 248 ) ( -120 64 248 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -160 64 288 ) ( -144 64 288 ) ( -160 -64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -20436,8 +20428,8 @@ ex2x/base-yellowpaint
 ( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1352 320 -64 ) ( -1360 320 -64 ) ( -1352 320 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1360 448 64 ) ( -1368 448 -64 ) ( -1360 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -152 64 256 ) ( -144 64 256 ) ( -152 -64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1456 416 -64 ) ( -1456 400 -64 ) ( -1456 416 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -152 64 248 ) ( -144 64 248 ) ( -152 -64 248 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -1376 416 -64 ) ( -1376 400 -64 ) ( -1376 416 64 ) trak5x/panel-vertpanel1d 0 64 0 0.25 0.25 0 0 0
 }
 {
 ( -1344 -64 448 ) ( -1344 -64 256 ) ( -1344 -448 448 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
@@ -20460,7 +20452,7 @@ ex2x/base-yellowpaint
 ( -1472 -448 -64 ) ( -1472 -64 -64 ) ( -1472 -448 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1352 320 -64 ) ( -1360 320 -64 ) ( -1352 320 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1360 448 64 ) ( -1368 448 -64 ) ( -1360 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -152 -64 256 ) ( -144 64 256 ) ( -152 64 256 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -152 -64 248 ) ( -144 64 248 ) ( -152 64 248 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
 ( -1360 64 288 ) ( -1352 64 288 ) ( -1360 -64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -20533,15 +20525,15 @@ ex2x/base-yellowpaint
 ( -832 -64 0 ) ( -800 64 0 ) ( -832 64 0 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
 ( 624 64 80 ) ( 632 64 80 ) ( 624 -64 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 624 256 64 ) ( 648 256 -64 ) ( 624 256 -64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( 600 512 -64 ) ( 632 512 -64 ) ( 600 512 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 704 1024 128 ) ( 576 1024 128 ) ( 704 1024 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 576 -192 0 ) ( 576 512 0 ) ( 576 -192 192 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
 ( -48 64 112 ) ( -32 64 112 ) ( -48 -64 112 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
 ( 624 -64 80 ) ( 632 64 80 ) ( 624 64 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 624 256 64 ) ( 648 256 -64 ) ( 624 256 -64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( 608 448 -64 ) ( 616 448 -64 ) ( 608 448 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 488 448 320 ) ( 576 800 320 ) ( 576 448 320 ) exx/base-metal01 0 128 90 0.25 -0.25 134217728 0 0
@@ -21836,14 +21828,6 @@ exx/wall-bigrib02
 ( 192 480 88 ) ( 192 568 112 ) ( 192 480 112 ) exx/base-metal01 0 192 0 -0.25 0.25 134217728 0 0
 }
 {
-( -264 448 -64 ) ( -264 448 128 ) ( 312 448 -64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( -832 -64 0 ) ( -800 64 0 ) ( -832 64 0 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( -48 64 112 ) ( -32 64 112 ) ( -48 -64 112 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( 256 512 -64 ) ( 352 512 -64 ) ( 256 512 64 ) trak7x/wall-wall1b 0 0 0 0.25 0.25 0 0 0
-( 448 608 -64 ) ( 448 576 -64 ) ( 448 608 64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
-( 384 488 64 ) ( 384 480 -64 ) ( 384 488 -64 ) trak7x/wall-wall1b 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( -790 840 112 ) ( -1142 928 112 ) ( -790 928 112 ) exx/base-metal01 168 0 0 -0.25 0.25 134217728 0 0
 ( -1142 928 112 ) ( -790 928 88 ) ( -790 928 112 ) exx/base-metal01 168 192 0 -0.25 0.25 134217728 0 0
 ( -790 832 80 ) ( -1142 920 80 ) ( -1142 832 80 ) exx/base-metal01 168 0 0 -0.25 0.25 134217728 0 0
@@ -24107,7 +24091,7 @@ exx/trim-baseboard02
 ( -1344 -64 448 ) ( -1344 -64 256 ) ( -1344 -448 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
 ( -1472 -448 -64 ) ( -1472 -64 -64 ) ( -1472 -448 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -48 -64 112 ) ( -32 64 112 ) ( -48 64 112 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
-( -184 64 144 ) ( -176 64 144 ) ( -184 -64 144 ) exx/floor-simple05 0 0 0 0.25 0.25 0 0 0
+( -184 64 144 ) ( -176 64 144 ) ( -184 -64 144 ) exx/floor-rnd02 0 0 0 0.25 0.25 0 0 0
 ( -1400 288 64 ) ( -1368 288 -64 ) ( -1400 288 -64 ) trak5x/base-base1b 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -24534,12 +24518,12 @@ exx/base-metal01
 ( -1342.7141113281 -111.8540039062 0 ) ( -1342.1312255859 -47.8566589355 0 ) ( -1342.7141113281 -111.8540039062 8 ) common/clip 74.5026855469 0 0 0.3076730669 0.25 0 0 0
 }
 {
-( 704 1024 -32 ) ( 704 -1504 -32 ) ( -1472 1024 -32 ) liquids_water/water2 0 0 -90 0.25 0.25 0 0 0
-( 704 1024 112 ) ( -1472 1024 112 ) ( 704 1024 -80 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( 704 1024 112 ) ( 704 1024 -80 ) ( 704 -1504 112 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( -1472 -1504 -80 ) ( 704 -1504 -80 ) ( -1472 1024 -80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -1472 -1504 -80 ) ( -1472 -1504 112 ) ( 704 -1504 -80 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( -1472 -1504 -80 ) ( -1472 1024 -80 ) ( -1472 -1504 112 ) common/caulk 0 192 0 0.25 0.25 0 0 0
+( 704 1024 -32 ) ( 704 -1504 -32 ) ( -1472 1024 -32 ) liquids_water/water0 0 0 0 0.25 0.25 0 0 0
+( 704 992 112 ) ( -1472 992 112 ) ( 704 992 -80 ) common/caulk 0 192 0 0.25 0.25 0 0 0
+( 672 1024 112 ) ( 672 1024 -80 ) ( 672 -1504 112 ) common/caulk 0 192 0 0.25 0.25 0 0 0
+( -1472 -1512 -128 ) ( 704 -1512 -128 ) ( -1472 1016 -128 ) common/caulk 0 224 0 0.25 0.25 0 0 0
+( -1472 -1472 -80 ) ( -1472 -1472 112 ) ( 704 -1472 -80 ) common/caulk 0 192 0 0.25 0.25 0 0 0
+( -1440 -1472 -80 ) ( -1440 1056 -80 ) ( -1440 -1472 112 ) common/caulk 128 192 0 0.25 0.25 0 0 0
 }
 {
 patchDef2
@@ -25461,13 +25445,85 @@ ex2x/base-yellowpaint
 ( -64 576 184 ) ( -64 640 192 ) ( 64 576 184 ) exx/panel-rs01 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 704 1024 -80 ) ( 704 -1504 -80 ) ( -1472 1024 -80 ) exx/wall-pipe 0 0 -90 0.25 0.25 0 0 0
+( 704 1024 -80 ) ( 704 -1504 -80 ) ( -1472 1024 -80 ) exx/floor-clang01 0 0 -90 0.25 0.25 0 0 0
 ( 704 1024 64 ) ( -1472 1024 64 ) ( 704 1024 -128 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
 ( 704 1024 64 ) ( 704 1024 -128 ) ( 704 -1504 64 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
 ( -1472 -1504 -128 ) ( 704 -1504 -128 ) ( -1472 1024 -128 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
 ( -1472 -1504 -128 ) ( -1472 -1504 64 ) ( 704 -1504 -128 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
 ( -1472 -1504 -128 ) ( -1472 1024 -128 ) ( -1472 -1504 64 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
 }
+{
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 0 ) ( 576 512 0 ) ( 576 -192 192 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( -832 -64 0 ) ( -800 64 0 ) ( -832 64 0 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( 624 64 80 ) ( 632 64 80 ) ( 624 -64 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 600 512 -64 ) ( 632 512 -64 ) ( 600 512 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 1024 128 ) ( 576 1024 128 ) ( 704 1024 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 0 ) ( 576 512 0 ) ( 576 -192 192 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( -48 64 112 ) ( -32 64 112 ) ( -48 -64 112 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( 624 -64 80 ) ( 632 64 80 ) ( 624 64 80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 1024 128 ) ( 576 1024 128 ) ( 704 1024 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -128 -80 ) ( 704 -128 -80 ) ( 576 576 -80 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( 576 -192 -16 ) ( 576 512 -16 ) ( 576 -192 176 ) exx/wall-metal01b 0 0 0 0.25 0.25 0 0 0
+( -832 64 0 ) ( -800 64 0 ) ( -832 -64 0 ) exx/floor-rnd02 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
+( -48 -64 112 ) ( -32 64 112 ) ( -48 64 112 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( -184 64 144 ) ( -176 64 144 ) ( -184 -64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 512 448 ) ( 704 -192 448 ) ( 576 512 448 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak7x/wall-wallplain1 0 128 0 0.25 0.25 0 0 0
+( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( -928 -64 352 ) ( -896 64 352 ) ( -928 64 352 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
+( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 592 64 288 ) ( 600 64 288 ) ( 592 -64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 0 0 0
+( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( -928 64 352 ) ( -896 64 352 ) ( -928 -64 352 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 440 -64 320 ) ( 472 64 320 ) ( 440 64 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 704 512 128 ) ( 704 512 -64 ) ( 704 -192 128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -192 256 ) ( 576 512 256 ) ( 576 -192 448 ) trak4x/wall-brick1 0 0 0 0.25 0.25 0 0 0
+( 576 512 -64 ) ( 608 512 -64 ) ( 576 512 64 ) trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0
+( 440 64 320 ) ( 472 64 320 ) ( 440 -64 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 592 -64 288 ) ( 600 64 288 ) ( 592 64 288 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 608 448 64 ) ( 616 448 -64 ) ( 608 448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 576 624 192 ) ( 576 624 0 ) ( 576 488 192 ) exx/floor-clang01 96 0 0 0.25 0.25 0 0 0
+( -832 -64 0 ) ( -800 64 0 ) ( -832 64 0 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( -48 64 112 ) ( -32 64 112 ) ( -48 -64 112 ) exx/floor-clang01 0 0 0 0.25 0.25 0 0 0
+( -264 448 -64 ) ( -264 448 128 ) ( 312 448 -64 ) exx/panel-metal02 0 0 0 0.25 0.25 0 0 0
+( 480 512 -64 ) ( 512 512 -64 ) ( 480 512 64 ) trak7x/wall-wall1b 0 0 0 0.25 0.25 0 0 0
+( 384 488 64 ) ( 384 480 -64 ) ( 384 488 -64 ) trak7x/wall-wall1b 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -26500,30 +26556,6 @@ facility114x/base-basered
 "light" "25"
 }
 {
-"classname" "trigger_warpzone"
-"targetname" "trigger_warpzone1"
-{
-( -1376 -64 448 ) ( -1376 -64 256 ) ( -1376 -448 448 ) common/warpzone 255.9998779297 146.2857666016 0 0.25 0.2187499851 0 0 0
-( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1352 320 -64 ) ( -1360 320 -64 ) ( -1352 320 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1360 448 64 ) ( -1368 448 -64 ) ( -1360 448 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -152 64 256 ) ( -144 64 256 ) ( -152 -64 256 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -1456 416 64 ) ( -1456 400 -64 ) ( -1456 416 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
-"classname" "trigger_warpzone"
-"target" "trigger_warpzone1"
-{
-( 392 -1408 128 ) ( 40 -1408 128 ) ( 392 -1408 -64 ) common/warpzone 256 146.2856445312 0 0.25 0.2187500149 0 0 0
-( -184 -64 144 ) ( -176 64 144 ) ( -184 64 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -192 -1392 64 ) ( -192 -1400 -64 ) ( -192 -1392 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -64 -1416 -64 ) ( -64 -1432 -64 ) ( -64 -1416 64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -120 64 256 ) ( -96 64 256 ) ( -120 -64 256 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-( -128 -1488 64 ) ( -112 -1488 -64 ) ( -128 -1488 -64 ) common/trigger 0 0 0 0.25 0.25 0 0 0
-}
-}
-{
 "classname" "light"
 "origin" "-392.000000 640.000000 80.000000"
 "light" "5"