From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 25 May 2013 15:29:03 +0000 (+0200)
Subject: Squashed commit of the following:
X-Git-Tag: xonotic-v0.7.0~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ee4cdfa74728f04d2bae6a5898173cf22657afb;p=xonotic%2Fxonotic-maps.pk3dir.git

Squashed commit of the following:

commit 03aaedf468c72ad7fdaebc7333804d3ff0f28ec2
Author: Debugger <pyngot@hotmail.com>
Date:   Sat May 25 12:11:13 2013 +0200

    remove DOM support for 0.7 as there is some buggy stuff on the map. TODO: add this in further versions

commit 569d6da1e1536d041ad668e1a260089b9577c6ac
Author: Debugger <pyngot@hotmail.com>
Date:   Sun May 19 15:33:14 2013 +0200

    some models hinted, texture bugs fixed and a few entities fixed

commit aa2fc424673c8891b9f9b6148988fc27449e2942
Author: Debugger <pyngot@hotmail.com>
Date:   Sun May 19 14:02:12 2013 +0200

    fix broken stuff. another cdtrack, dom_controlpoints replaced

commit 65fb68eedada4e8e1181b32b4b7f7356174d6bb2
Author: Debugger <pyngot@hotmail.com>
Date:   Sat May 18 20:13:29 2013 +0200

    texture fixes, a lot of ambient sounds, model fixes

commit 1bfed51d05192cc3507f10370ed5bccbb675d7db
Author: Debugger <pyngot@hotmail.com>
Date:   Sat May 18 18:24:33 2013 +0200

    solid models, finally. Entity cleanup and DOM controlpoints added

commit e66e34eacaf47fe4a8ba311e95c03c7991bffb79
Author: Debugger <pyngot@hotmail.com>
Date:   Sat May 18 17:47:27 2013 +0200

    clipping & barrels

commit 97baee8aa89adad43d329d4e36e388ad6837503a
Author: Debugger <pyngot@hotmail.com>
Date:   Fri May 17 15:25:57 2013 +0200

    some models clipped
---

diff --git a/maps/oilrig.map b/maps/oilrig.map
index 194780ee..740e144a 100644
--- a/maps/oilrig.map
+++ b/maps/oilrig.map
@@ -1258,7 +1258,7 @@
 ( 1048 384 960 ) ( 1048 416 960 ) ( 1048 416 768 ) exx/light-panel01-surfacelight 0 384 0 -0.25 0.25 134217728 0 0
 ( 1040 384 960 ) ( 1048 384 960 ) ( 1048 384 768 ) common/caulk 31 64 0 -0.5 0.5 134217728 0 0
 ( 1040 392 864 ) ( 1040 424 864 ) ( 1048 424 864 ) exx/base-metal05rust 0 0 0 0.25 0.25 134217728 0 0
-( 1048 416 736 ) ( 1040 416 736 ) ( 1040 384 736 ) common/caulk 96 222 90 0.5 0.5 134217728 0 0
+( 1048 416 736 ) ( 1040 416 736 ) ( 1040 384 736 ) exx/base-metal05rust 0 0 0 0.25 0.25 134217728 0 0
 }
 {
 ( 1040 288 960 ) ( 1040 256 960 ) ( 1040 256 768 ) common/caulk 95 62 0 0.5 0.5 134217728 0 0
@@ -1850,7 +1850,7 @@
 ( 1064 1090 -409 ) ( 1064 1058 -409 ) ( 1064 1056 -392 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1064 1090 -409 ) ( 856 1112 -632 ) ( 856 1080 -632 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1064 1056 -392 ) ( 856 1078 -615 ) ( 856 1110 -615 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 1168 -1152 ) ( 1048 1088 -408 ) ( 1048 1056 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1088 1168 -1152 ) ( 1048 1088 -408 ) ( 1048 1056 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1088 1136 -1152 ) ( 1048 1056 -408 ) ( 1072 1040 -408 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 1096 1088 -408 ) ( 1096 1056 -408 ) ( 1072 1040 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -1870,9 +1870,9 @@
 }
 {
 ( 856 1078 -615 ) ( 1064 1056 -392 ) ( 856 1110 -615 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1112 1184 -1152 ) ( 1072 1104 -408 ) ( 1048 1088 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 1168 -1152 ) ( 1048 1088 -408 ) ( 1048 1056 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 1136 -1152 ) ( 1048 1056 -408 ) ( 1072 1040 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1112 1184 -1152 ) ( 1072 1104 -408 ) ( 1048 1088 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1088 1168 -1152 ) ( 1048 1088 -408 ) ( 1048 1056 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1088 1136 -1152 ) ( 1048 1056 -408 ) ( 1072 1040 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1096 1088 -408 ) ( 1096 1056 -408 ) ( 1072 1040 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
@@ -1897,7 +1897,7 @@
 ( 1064 832 -392 ) ( 1064 864 -392 ) ( 1064 862 -409 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1064 862 -409 ) ( 856 840 -632 ) ( 856 808 -632 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1064 832 -392 ) ( 856 810 -615 ) ( 856 842 -615 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 784 -1152 ) ( 1048 864 -408 ) ( 1048 832 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1088 784 -1152 ) ( 1048 864 -408 ) ( 1048 832 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1112 800 -1152 ) ( 1072 880 -408 ) ( 1048 864 -408 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 1072 816 -408 ) ( 1048 832 -408 ) ( 1048 864 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -1917,9 +1917,9 @@
 }
 {
 ( 856 810 -615 ) ( 1064 832 -392 ) ( 856 842 -615 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 752 -1152 ) ( 1048 832 -408 ) ( 1072 816 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1088 784 -1152 ) ( 1048 864 -408 ) ( 1048 832 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1112 800 -1152 ) ( 1072 880 -408 ) ( 1048 864 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1088 752 -1152 ) ( 1048 832 -408 ) ( 1072 816 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1088 784 -1152 ) ( 1048 864 -408 ) ( 1048 832 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1112 800 -1152 ) ( 1072 880 -408 ) ( 1048 864 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1072 816 -408 ) ( 1048 832 -408 ) ( 1048 864 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
 {
@@ -3913,7 +3913,7 @@
 ( 552 -1352 -704 ) ( 576 -1352 -704 ) ( 576 3528 -704 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 576 3528 -672 ) ( 576 -1352 -672 ) ( 552 -1352 -672 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 576 320 -680 ) ( 552 320 -680 ) ( 552 320 -696 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
-( 544 3528 -672 ) ( 544 -1352 -672 ) ( 544 -1352 -688 ) common/caulk -128 0 -180 0.5 -0.5 134217728 0 0
+( 544 3528 -672 ) ( 544 -1352 -672 ) ( 544 -1352 -688 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 552 312 -680 ) ( 576 312 -680 ) ( 576 312 -696 ) exomorphx/light-metal_light08 256 -0 0 -0.25 0.25 134217728 0 0
 ( 576 -1352 -672 ) ( 576 3528 -672 ) ( 576 3528 -688 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 }
@@ -3921,7 +3921,7 @@
 ( 616 -1352 -704 ) ( 640 -1352 -704 ) ( 640 3528 -704 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 640 3528 -672 ) ( 640 -1352 -672 ) ( 616 -1352 -672 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 640 320 -680 ) ( 616 320 -680 ) ( 616 320 -696 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
-( 608 3528 -672 ) ( 608 -1352 -672 ) ( 608 -1352 -688 ) common/caulk -128 0 -180 0.5 -0.5 134217728 0 0
+( 608 3528 -672 ) ( 608 -1352 -672 ) ( 608 -1352 -688 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 616 312 -680 ) ( 640 312 -680 ) ( 640 312 -696 ) exomorphx/light-metal_light08 640 -0 0 0.25 0.25 134217728 0 0
 ( 640 -1352 -672 ) ( 640 3528 -672 ) ( 640 3528 -688 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 }
@@ -6905,7 +6905,7 @@ exx/wall-metalrib01
 ( 176 -304 -704 ) ( 16 40 -704 ) ( 176 -304 -640 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 272 -208 -704 ) ( 176 -304 -704 ) ( 272 -208 -640 ) common/caulk 0 0 0 0.5 0.5 134217728 4 0
 ( 0 128 -704 ) ( 256 -128 -704 ) ( 0 128 -640 ) common/caulk 96 0 0 0.5 0.5 134217728 4 0
-( 16 48 -640 ) ( 16 -304 -640 ) ( 16 -304 -704 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 16 48 -640 ) ( 16 -304 -640 ) ( 16 -304 -704 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 16 -304 -640 ) ( 16 48 -640 ) ( 272 48 -640 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 272 48 -704 ) ( 16 48 -704 ) ( 16 -304 -704 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
 ( 72 56 -64 ) ( 176 -176 -64 ) ( 72 56 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -7272,7 +7272,7 @@ exx/wall-metalrib01
 {
 ( 824 -200 144 ) ( 824 -200 304 ) ( 840 -184 304 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 808 -184 304 ) ( 808 -184 144 ) ( 824 -168 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 840 -184 144 ) ( 840 -184 304 ) ( 824 -168 304 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 840 -184 144 ) ( 840 -184 304 ) ( 824 -168 304 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 ( 824 -200 304 ) ( 824 -200 144 ) ( 808 -184 144 ) exx/base-metal04 0 0 0 0.5 0.5 134217728 0 0
 ( 840 -184 144 ) ( 824 -168 144 ) ( 808 -184 144 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 824 -168 304 ) ( 840 -184 304 ) ( 824 -200 304 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
@@ -11525,10 +11525,10 @@ exx/wall-metalrib01
 ( 544 256 -2240 ) ( -32 256 -2240 ) ( -32 256 -1280 ) exx/wall-metal02 85.3333358765 329.5632324219 0 0.375 0.33984375 0 0 0
 }
 {
-( 824 792 -1152 ) ( 1096 814 -840 ) ( 1096 816 -816 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 824 760 -1152 ) ( 824 792 -1152 ) ( 824 794 -1128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1096 814 -840 ) ( 824 792 -1152 ) ( 824 760 -1152 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1096 784 -816 ) ( 824 762 -1128 ) ( 824 794 -1128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 824 792 -1152 ) ( 1096 814 -840 ) ( 1096 816 -816 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 824 760 -1152 ) ( 824 792 -1152 ) ( 824 794 -1128 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1096 814 -840 ) ( 824 792 -1152 ) ( 824 760 -1152 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1096 784 -816 ) ( 824 762 -1128 ) ( 824 794 -1128 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 832 752 -1152 ) ( 872 832 -408 ) ( 872 864 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 872 864 -408 ) ( 832 784 -1152 ) ( 848 880 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -11558,10 +11558,10 @@ exx/wall-metalrib01
 ( 872 832 -408 ) ( 832 752 -1152 ) ( 872 864 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 824 1126 -1128 ) ( 1096 1104 -816 ) ( 1096 1106 -840 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 824 1126 -1128 ) ( 1096 1104 -816 ) ( 1096 1106 -840 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 824 1158 -1128 ) ( 824 1126 -1128 ) ( 824 1128 -1152 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1096 1138 -840 ) ( 824 1160 -1152 ) ( 824 1128 -1152 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 1096 1104 -816 ) ( 824 1126 -1128 ) ( 824 1158 -1128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1096 1138 -840 ) ( 824 1160 -1152 ) ( 824 1128 -1152 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 1096 1104 -816 ) ( 824 1126 -1128 ) ( 824 1158 -1128 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 832 1136 -1152 ) ( 872 1056 -408 ) ( 872 1088 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 848 1040 -408 ) ( 808 1120 -1152 ) ( 872 1056 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -11591,10 +11591,10 @@ exx/wall-metalrib01
 ( 872 1056 -408 ) ( 832 1136 -1152 ) ( 872 1088 -408 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 1096 1128 -1152 ) ( 824 1106 -840 ) ( 824 1104 -816 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 1096 1128 -1152 ) ( 824 1106 -840 ) ( 824 1104 -816 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1096 1160 -1152 ) ( 1096 1128 -1152 ) ( 1096 1126 -1128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 824 1106 -840 ) ( 1096 1128 -1152 ) ( 1096 1160 -1152 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( 824 1136 -816 ) ( 1096 1158 -1128 ) ( 1096 1126 -1128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 824 1106 -840 ) ( 1096 1128 -1152 ) ( 1096 1160 -1152 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
+( 824 1136 -816 ) ( 1096 1158 -1128 ) ( 1096 1126 -1128 ) exx/base-metal06rust 0 0 0 0.25 0.25 134217728 0 0
 ( 1088 1168 -1152 ) ( 1048 1088 -408 ) ( 1048 1056 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 ( 1048 1056 -408 ) ( 1088 1136 -1152 ) ( 1072 1040 -408 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
 }
@@ -11888,7 +11888,7 @@ exx/wall-metalrib01
 }
 {
 ( 840 -784 928 ) ( 840 -784 896 ) ( 632 -784 896 ) exx/trim-support03 0 466 90 0.25 0.25 0 0 0
-( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( 632 -784 928 ) ( 496 -712 928 ) ( 976 -712 928 ) exx/floor-clang01b 0 0 0 0.25 0.25 0 0 0
 ( 736 -768 64 ) ( 720 -768 -64 ) ( 736 -768 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 632 -784 -64 ) ( 640 -768 -64 ) ( 632 -784 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -11896,7 +11896,7 @@ exx/wall-metalrib01
 }
 {
 ( 632 -784 928 ) ( 632 -784 896 ) ( 496 -712 896 ) exx/trim-support03 0 466 90 0.25 0.25 0 0 0
-( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( 632 -784 928 ) ( 496 -712 928 ) ( 976 -712 928 ) exx/floor-clang01b 0 0 0 0.25 0.25 0 0 0
 ( 640 -768 64 ) ( 528 -712 -64 ) ( 640 -768 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 640 -768 -64 ) ( 632 -784 -64 ) ( 640 -768 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -11904,7 +11904,7 @@ exx/wall-metalrib01
 }
 {
 ( 840 -784 896 ) ( 840 -784 928 ) ( 976 -712 928 ) exx/trim-support03 0 466 90 0.25 0.25 0 0 0
-( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) common/caulk 0 0 0 0.5 0.5 0 0 0
+( 496 -712 896 ) ( 632 -784 896 ) ( 840 -784 896 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( 632 -784 928 ) ( 496 -712 928 ) ( 976 -712 928 ) exx/floor-clang01b 0 0 0 0.25 0.25 0 0 0
 ( 944 -712 64 ) ( 832 -768 -64 ) ( 944 -712 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 832 -768 -64 ) ( 824 -752 -64 ) ( 832 -768 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -14067,7 +14067,7 @@ exx/base-metal06rust
 ( 720 64 -384 ) ( 760 64 -296 ) ( 720 -64 -384 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 1080 -224 ) ( 832 1080 -296 ) ( 832 1032 -224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 832 1080 -224 ) ( 832 1080 -296 ) ( 832 1032 -224 ) exx/base-metal06rust 0 0 0 0.25 0.25 0 0 0
 ( 800 1032 -296 ) ( 832 1032 -296 ) ( 800 1080 -296 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -96 1048 -224 ) ( -96 1080 -296 ) ( 32 1048 -224 ) exx/panel-q201e 255.9998779297 227.5555419922 0 0.4062499702 0.28125 0 0 0
 ( -48 1040 -240 ) ( -48 1048 -224 ) ( 80 1040 -240 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -14076,7 +14076,7 @@ exx/base-metal06rust
 }
 {
 ( 800 864 -296 ) ( 832 888 -296 ) ( 832 864 -296 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 832 888 -360 ) ( 832 864 -368 ) ( 832 864 -360 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 832 888 -360 ) ( 832 864 -368 ) ( 832 864 -360 ) exx/base-metal06rust 0 0 0 0.25 0.25 0 0 0
 ( 712 888 -360 ) ( 712 864 -368 ) ( 712 888 -368 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 96 888 -368 ) ( -32 856 -296 ) ( -32 888 -368 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 ( 0 888 -368 ) ( 0 880 -384 ) ( 128 888 -368 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -14084,7 +14084,7 @@ exx/base-metal06rust
 ( 712 64 -368 ) ( 744 64 -296 ) ( 712 -64 -368 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 832 888 -224 ) ( 832 840 -296 ) ( 832 840 -224 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 832 888 -224 ) ( 832 840 -296 ) ( 832 840 -224 ) exx/base-metal06rust 0 0 0 0.25 0.25 0 0 0
 ( 800 840 -296 ) ( 832 888 -296 ) ( 800 888 -296 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 32 872 -224 ) ( -96 840 -296 ) ( -96 872 -224 ) exx/panel-q201e 146.2856445313 227.5555419922 0 0.4374999702 0.28125 0 0 0
 ( 96 880 -240 ) ( -32 872 -224 ) ( -32 880 -240 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -14398,7 +14398,7 @@ exx/base-metal06rust
 ( 816 1032 -184 ) ( 816 992 -184 ) ( 784 1032 -184 ) exx/trim-psimple05 51.1997070313 365.7141113281 90 0.15625 0.2187499851 0 0 0
 ( 816 1032 -184 ) ( 784 1032 -184 ) ( 816 1032 -240 ) exx/trim-01 0 0 90 0.125 0.125 0 0 0
 ( 816 1032 -184 ) ( 816 1032 -240 ) ( 816 992 -184 ) exx/trim-01 0 36 90 0.125 0.125 0 0 0
-( 784 992 -192 ) ( 816 992 -192 ) ( 784 1032 -192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 784 992 -192 ) ( 816 992 -192 ) ( 784 1032 -192 ) exx/trim-psimple05 51.1997070313 365.7141113281 90 0.15625 0.2187499851 0 0 0
 ( 784 992 -240 ) ( 784 992 -184 ) ( 816 992 -240 ) exx/trim-01 0 0 90 0.125 0.125 0 0 0
 ( 704 992 -240 ) ( 704 1032 -240 ) ( 704 992 -184 ) exx/trim-01 0 30 90 0.125 0.125 0 0 0
 }
@@ -19790,30 +19790,114 @@ terrain01x/blends-mars-rock02-ground01
 ( 656 -688 -64 ) ( 592 -664 -64 ) ( 656 -688 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( 592 -664 -64 ) ( 528 -536 -64 ) ( 592 -664 64 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 1168 -352 0 ) ( 1168 -416 0 ) ( 1016 -352 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1016 -416 -16 ) ( 1168 -416 -16 ) ( 1016 -352 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1032 64 -16 ) ( 1024 64 -8 ) ( 1032 -64 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1160 64 0 ) ( 1152 64 -8 ) ( 1160 -64 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1152 64 -8 ) ( 1136 64 -16 ) ( 1152 -64 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 1040 64 -16 ) ( 1024 64 -8 ) ( 1040 -64 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 -408 -16 ) ( -64 -416 0 ) ( 64 -408 -16 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -64 -352 0 ) ( -64 -360 -16 ) ( 64 -352 0 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 {
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "-528 1128 768"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
+( 1168 -352 0 ) ( 1168 -416 0 ) ( 1016 -352 0 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1016 -416 -16 ) ( 1168 -416 -16 ) ( 1016 -352 -16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1032 64 -16 ) ( 1024 64 -8 ) ( 1032 -64 -16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1160 64 0 ) ( 1152 64 -8 ) ( 1160 -64 0 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1152 64 -8 ) ( 1136 64 -16 ) ( 1152 -64 -8 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( 1040 64 -16 ) ( 1024 64 -8 ) ( 1040 -64 -16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -64 -408 -16 ) ( -64 -416 0 ) ( 64 -408 -16 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
+( -64 -352 0 ) ( -64 -360 -16 ) ( 64 -352 0 ) common/weapclip 0 0 0 0.25 0.25 0 0 0
 }
 {
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "-504 1128 -152"
-"wait" "13"
+( 592 496 -600 ) ( 592 416 -600 ) ( 512 496 -600 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 592 496 -664 ) ( 512 496 -664 ) ( 592 496 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 592 496 -664 ) ( 592 496 -672 ) ( 592 416 -664 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 512 416 -672 ) ( 592 416 -672 ) ( 512 496 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 512 416 -672 ) ( 512 416 -664 ) ( 592 416 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 512 416 -672 ) ( 512 496 -672 ) ( 512 416 -664 ) common/hint 0 0 0 0.25 0.25 0 0 0
 }
 {
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "1152 632 1048"
-"wait" "13"
+( 528 528 -624 ) ( 528 496 -624 ) ( 496 528 -624 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 528 528 -600 ) ( 496 528 -600 ) ( 528 528 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 528 528 -600 ) ( 528 528 -672 ) ( 528 496 -600 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 496 -672 ) ( 528 496 -672 ) ( 496 528 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 496 -672 ) ( 496 496 -600 ) ( 528 496 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 496 -672 ) ( 496 528 -672 ) ( 496 496 -600 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 496 472 -624 ) ( 496 440 -624 ) ( 464 472 -624 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 472 -624 ) ( 464 472 -624 ) ( 496 472 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 472 -624 ) ( 496 472 -672 ) ( 496 440 -624 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 464 440 -672 ) ( 496 440 -672 ) ( 464 472 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 464 440 -672 ) ( 464 440 -624 ) ( 496 440 -672 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 464 440 -672 ) ( 464 472 -672 ) ( 464 440 -624 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 792 -280 176 ) ( 792 -312 176 ) ( 760 -280 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 792 -280 136 ) ( 760 -280 136 ) ( 792 -280 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 792 -280 176 ) ( 792 -280 168 ) ( 792 -312 176 ) common/hint 0 160 0 0.25 0.25 0 0 0
+( 760 -312 128 ) ( 792 -312 128 ) ( 760 -280 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 760 -312 128 ) ( 760 -312 136 ) ( 792 -312 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 760 -312 128 ) ( 760 -280 128 ) ( 760 -312 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 840 -272 176 ) ( 840 -304 176 ) ( 808 -272 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 840 -272 176 ) ( 808 -272 176 ) ( 840 -272 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 840 -272 176 ) ( 840 -272 128 ) ( 840 -304 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 808 -304 128 ) ( 840 -304 128 ) ( 808 -272 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 808 -304 128 ) ( 808 -304 176 ) ( 840 -304 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 808 -304 128 ) ( 808 -272 128 ) ( 808 -304 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 816 -312 176 ) ( 816 -344 176 ) ( 784 -312 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 816 -312 176 ) ( 784 -312 176 ) ( 816 -312 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 816 -312 176 ) ( 816 -312 128 ) ( 816 -344 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 784 -344 128 ) ( 816 -344 128 ) ( 784 -312 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 784 -344 128 ) ( 784 -344 176 ) ( 816 -344 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 784 -344 128 ) ( 784 -312 128 ) ( 784 -344 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 624 -464 232 ) ( 624 -576 232 ) ( 504 -464 232 ) common/hint 224 0 0 0.25 0.25 0 0 0
+( 616 -464 136 ) ( 496 -464 136 ) ( 616 -464 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 616 -464 136 ) ( 616 -464 128 ) ( 616 -576 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 -576 128 ) ( 616 -576 128 ) ( 496 -464 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 496 -576 128 ) ( 496 -576 136 ) ( 616 -576 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 504 -576 128 ) ( 504 -464 128 ) ( 504 -576 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1616 48 176 ) ( 1616 16 176 ) ( 1584 48 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1616 48 136 ) ( 1584 48 136 ) ( 1616 48 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1616 48 136 ) ( 1616 48 128 ) ( 1616 16 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 16 128 ) ( 1616 16 128 ) ( 1584 48 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 16 128 ) ( 1584 16 136 ) ( 1616 16 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 16 128 ) ( 1584 48 128 ) ( 1584 16 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1584 72 176 ) ( 1584 40 176 ) ( 1552 72 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 72 176 ) ( 1552 72 176 ) ( 1584 72 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 72 176 ) ( 1584 72 128 ) ( 1584 40 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 40 128 ) ( 1584 40 128 ) ( 1552 72 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 40 128 ) ( 1552 40 176 ) ( 1584 40 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 40 128 ) ( 1552 72 128 ) ( 1552 40 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 1584 16 176 ) ( 1584 -16 176 ) ( 1552 16 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 16 176 ) ( 1552 16 176 ) ( 1584 16 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1584 16 176 ) ( 1584 16 128 ) ( 1584 -16 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 -16 128 ) ( 1584 -16 128 ) ( 1552 16 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 -16 128 ) ( 1552 -16 176 ) ( 1584 -16 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 1552 -16 128 ) ( 1552 16 128 ) ( 1552 -16 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 608 -568 176 ) ( 608 -600 176 ) ( 576 -568 176 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 608 -568 136 ) ( 576 -568 136 ) ( 608 -568 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 608 -568 136 ) ( 608 -568 128 ) ( 608 -600 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 576 -600 128 ) ( 608 -600 128 ) ( 576 -568 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 576 -600 128 ) ( 576 -600 136 ) ( 608 -600 128 ) common/hint 0 0 0 0.25 0.25 0 0 0
+( 576 -600 128 ) ( 576 -568 128 ) ( 576 -600 136 ) common/hint 0 0 0 0.25 0.25 0 0 0
+}
 }
 {
 "classname" "light"
@@ -19845,7 +19929,7 @@ terrain01x/blends-mars-rock02-ground01
 }
 {
 "classname" "trigger_push"
-"target" "p1_5"
+"target" "target_position14"
 {
 ( 2408 320 -872 ) ( 2488 320 -872 ) ( 2488 320 -880 ) common/trigger 48 225 0 -0.5 0.5 0 0 0
 ( 2368 440 -880 ) ( 2368 352 -880 ) ( 2368 352 -888 ) common/trigger 240 224 0 0.5 0.5 0 0 0
@@ -19856,13 +19940,8 @@ terrain01x/blends-mars-rock02-ground01
 }
 }
 {
-"classname" "target_position"
-"targetname" "p1_5"
-"origin" "2152 400 -592"
-}
-{
 "classname" "trigger_push"
-"target" "p1_4"
+"target" "target_position13"
 {
 ( 968 760 -656 ) ( 968 648 -656 ) ( 872 648 -656 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 872 648 -664 ) ( 968 648 -664 ) ( 968 760 -664 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -19881,13 +19960,8 @@ terrain01x/blends-mars-rock02-ground01
 }
 }
 {
-"classname" "target_position"
-"targetname" "p1_4"
-"origin" "928 840 -296"
-}
-{
 "classname" "trigger_push"
-"target" "p1_3"
+"target" "target_position8"
 {
 ( 1832 456 544 ) ( 1832 344 544 ) ( 1720 344 544 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1720 344 536 ) ( 1832 344 536 ) ( 1832 456 536 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -19903,7 +19977,7 @@ terrain01x/blends-mars-rock02-ground01
 }
 {
 "classname" "trigger_push"
-"target" "p1_2"
+"target" "target_position9"
 {
 ( 1832 -72 144 ) ( 1832 -184 144 ) ( 1720 -184 144 ) common/trigger 0 0 0 0.25 0.25 0 0 0
 ( 1720 -184 136 ) ( 1832 -184 136 ) ( 1832 -72 136 ) common/trigger 0 0 0 0.25 0.25 0 0 0
@@ -19919,7 +19993,7 @@ terrain01x/blends-mars-rock02-ground01
 }
 {
 "classname" "trigger_push"
-"target" "p1_1"
+"target" "target_position7"
 {
 ( 584 -424 -304 ) ( 584 -504 -304 ) ( 584 -504 -312 ) common/trigger 0 32 0 0.25 0.25 0 0 0
 ( 696 -504 -304 ) ( 696 -424 -304 ) ( 696 -424 -312 ) common/trigger 0 32 0 0.25 0.25 0 0 0
@@ -22345,12 +22419,6 @@ exx/floor-rnd02
 "classname" "light"
 "light" "100"
 "_color" "0.880713 1.000000 0.878719"
-"origin" "0 -384 -328"
-}
-{
-"classname" "light"
-"light" "100"
-"_color" "0.880713 1.000000 0.878719"
 "origin" "1344 -256 -312"
 }
 {
@@ -23314,7 +23382,7 @@ exx/wall-bigrib02
 }
 {
 "classname" "trigger_push"
-"target" "p1"
+"target" "target_position16"
 {
 ( 272 -56 -624 ) ( 272 -152 -624 ) ( 176 -152 -624 ) common/trigger 0 224 0 0.25 0.25 0 0 0
 ( 176 -152 -632 ) ( 272 -152 -632 ) ( 272 -56 -632 ) common/trigger 0 224 0 0.25 0.25 0 0 0
@@ -23334,26 +23402,6 @@ exx/wall-bigrib02
 "origin" "736 -784 496"
 }
 {
-"classname" "info_notnull"
-"targetname" "p1_1"
-"origin" "640.000000 -88.000000 -24.000000"
-}
-{
-"classname" "info_notnull"
-"targetname" "p1_2"
-"origin" "1792 171 586"
-}
-{
-"classname" "info_notnull"
-"targetname" "p1_3"
-"origin" "1336 216 1008"
-}
-{
-"classname" "target_position"
-"targetname" "p1"
-"origin" "224.000000 -96.000000 216.000000"
-}
-{
 "classname" "light"
 "light" "25"
 "origin" "192 -384 232"
@@ -23387,202 +23435,8 @@ exx/wall-bigrib02
 "origin" "1600.000000 16.000000 -656.000000"
 }
 {
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "2112 1144 768"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "2136 1144 -152"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "1232 1240 128"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "2952 424 -152"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "2928 424 768"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "2000 -432 768"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "2024 -432 -152"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "1232 -912 -152"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "1232 -952 1080"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "0 -688 768"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "24 -688 -152"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"origin" "-376 0 768"
-"noise" "sound/misc/Ambient_01.wav"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"spawnflags" "4"
-"random" "1"
-"noise" "sound/misc/Ambient_01.wav"
-"origin" "-352 0 -152"
-"wait" "13"
-}
-{
-"classname" "target_speaker"
-"origin" "1152 272 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "240 280 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "200 904 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "1008 896 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "1528 904 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "1528 136 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "1488 -352 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "1120 -320 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "336 -464 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "32 -144 224"
-}
-{
-"classname" "target_speaker"
-"origin" "-264 216 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "0 960 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "2112 728 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
-"classname" "target_speaker"
-"noise" "ambient/water.wav"
-"spawnflags" "1"
-"origin" "2248 360 -888"
-}
-{
-"classname" "target_speaker"
-"origin" "1880 -104 -888"
-"spawnflags" "1"
-"noise" "ambient/water.wav"
-}
-{
 "classname" "trigger_push"
-"target" "t2"
+"target" "target_position15"
 {
 ( 764 -219 -909 ) ( 696 -219 -909 ) ( 696 -293 -909 ) common/trigger 12 0 0 0.5 0.5 0 7 0
 ( 697 -293 -896 ) ( 697 -219 -896 ) ( 765 -219 -896 ) common/trigger 10 0 0 0.5 0.5 0 7 0
@@ -23593,18 +23447,8 @@ exx/wall-bigrib02
 }
 }
 {
-"classname" "info_notnull"
-"targetname" "t2"
-"origin" "512.000000 -88.000000 -464.000000"
-}
-{
-"classname" "info_notnull"
-"targetname" "t3"
-"origin" "577 1121 -498"
-}
-{
 "classname" "trigger_push"
-"target" "t3"
+"target" "target_position12"
 {
 ( 757 1222 -909 ) ( 700 1222 -909 ) ( 700 1162 -909 ) common/trigger 0 0 0 0.5 0.5 0 7 0
 ( 700 1162 -885 ) ( 700 1222 -885 ) ( 757 1222 -885 ) common/trigger 0 0 0 0.5 0.5 0 7 0
@@ -23616,7 +23460,7 @@ exx/wall-bigrib02
 }
 {
 "classname" "trigger_push"
-"target" "t4"
+"target" "target_position11"
 {
 ( -337 -501 202 ) ( -337 -566 202 ) ( -337 -566 -1200 ) common/trigger 102 32 0 0.5 0.5 0 7 0
 ( -303 -474 202 ) ( -370 -474 202 ) ( -370 -474 -1200 ) common/trigger 252 32 0 0.5 0.5 0 7 0
@@ -23627,16 +23471,6 @@ exx/wall-bigrib02
 }
 }
 {
-"classname" "info_notnull"
-"targetname" "t4"
-"origin" "-84.000000 -438.000000 184.000000"
-}
-{
-"classname" "info_notnull"
-"targetname" "t5"
-"origin" "1784 -323 328"
-}
-{
 "classname" "light"
 "origin" "1784 -852 -832"
 "light" "75"
@@ -23748,7 +23582,7 @@ exx/wall-bigrib02
 }
 {
 "classname" "trigger_push"
-"target" "t5"
+"target" "target_position10"
 {
 ( 1848 -752 -904 ) ( 1688 -752 -904 ) ( 1688 -872 -904 ) common/trigger 0 0 0 0.5 0.5 0 0 0
 ( 1688 -872 -880 ) ( 1688 -752 -880 ) ( 1848 -752 -880 ) common/trigger 0 0 0 0.5 0.5 0 0 0
@@ -23781,7 +23615,7 @@ exx/wall-bigrib02
 }
 {
 "classname" "target_position"
-"origin" "-256.000000 624.000000 -288.000000"
+"origin" "-256.000000 608.000000 -288.000000"
 "targetname" "target_position1"
 }
 {
@@ -23805,6 +23639,7 @@ exx/wall-bigrib02
 "origin" "-255.999985 800.000000 -392.000000"
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
+"spawnflags" "2"
 }
 {
 "classname" "light"
@@ -24237,6 +24072,7 @@ exx/wall-bigrib02
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 "modelscale" "0.700000"
+"spawnflags" "2"
 }
 {
 "classname" "light"
@@ -24250,6 +24086,7 @@ exx/wall-bigrib02
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 "modelscale" "0.700000"
+"spawnflags" "2"
 }
 {
 "classname" "light"
@@ -24263,6 +24100,7 @@ exx/wall-bigrib02
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 "modelscale" "0.700000"
+"spawnflags" "2"
 }
 {
 "classname" "misc_model"
@@ -24292,6 +24130,7 @@ exx/wall-bigrib02
 "model" "models/lights/xonlight02.md3"
 "angle" "-90.000000"
 "modelscale" "0.700000"
+"spawnflags" "2"
 }
 {
 "classname" "misc_model"
@@ -24299,6 +24138,7 @@ exx/wall-bigrib02
 "model" "models/lights/xonlight02.md3"
 "angle" "89.999992"
 "modelscale" "0.700000"
+"spawnflags" "2"
 }
 {
 "classname" "misc_model"
@@ -24335,29 +24175,10 @@ exx/wall-bigrib02
 }
 {
 "classname" "misc_model"
-"origin" "808.000000 -328.000000 128.000000"
-"model" "models/containers/barrel01.md3"
-}
-{
-"classname" "misc_model"
-"origin" "824.000000 -288.000000 128.000000"
-"model" "models/containers/barrel01.md3"
-}
-{
-"classname" "misc_model"
-"origin" "784.000000 -296.000000 128.000000"
-"model" "models/containers/barrel01.md3"
-}
-{
-"classname" "misc_model"
-"origin" "592.000000 -584.000000 128.000000"
-"model" "models/containers/barrel01.md3"
-}
-{
-"classname" "misc_model"
 "origin" "568.000000 -512.000000 128.000000"
 "model" "models/containers/crate02.md3"
 "angle" "25.526960"
+"spawnflags" "2"
 }
 {
 "classname" "misc_model"
@@ -24501,29 +24322,1040 @@ exx/wall-bigrib02
 "classname" "misc_model"
 "origin" "552.000000 456.000000 -672.000000"
 "model" "models/containers/crate01.md3"
+"spawnflags" "2"
 }
 {
-"classname" "misc_model"
-"origin" "512.000000 512.000000 -672.000000"
+"classname" "misc_breakablemodel"
+"origin" "1567.999878 56.000122 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "1599.999878 32.000122 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "1567.999878 0.000122 128.000000"
 "model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "511.999878 512.000122 -672.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "479.999878 456.000122 -672.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "591.999878 -583.999878 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "799.999878 -327.999878 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "775.999878 -295.999878 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "misc_breakablemodel"
+"origin" "823.999878 -287.999878 128.000000"
+"model" "models/containers/barrel01.md3"
+"_castShadows" "1"
+"angle" "59.999981"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "6"
+"debristimejitter" "2"
+"dmg" "75"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "150"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"message2" "was killed with an explosive barrel by"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "40"
+"respawntimejitter" "10"
+}
+{
+"classname" "light"
+"origin" "1344.000000 576.000000 -120.000000"
+"light" "50"
+"target" "target_position5"
 }
 {
-"classname" "misc_model"
-"origin" "488.000000 464.000000 -672.000000"
-"model" "models/containers/barrel01.md3"
+"classname" "target_position"
+"origin" "1344.000000 576.000000 -288.000000"
+"targetname" "target_position5"
 }
 {
-"classname" "misc_model"
-"origin" "1576.000000 8.000000 128.000000"
-"model" "models/containers/barrel01.md3"
+"classname" "light"
+"light" "50"
+"origin" "1776.000000 864.000000 256.000000"
+"target" "target_position6"
 }
 {
-"classname" "misc_model"
-"origin" "1600.000000 40.000000 128.000000"
-"model" "models/containers/barrel01.md3"
+"classname" "target_position"
+"origin" "1776.000000 944.000000 184.000000"
+"targetname" "target_position6"
 }
 {
-"classname" "misc_model"
-"origin" "1568.000000 56.000000 128.000000"
-"model" "models/containers/barrel01.md3"
+"classname" "target_position"
+"origin" "640.000000 -88.000000 -24.000000"
+"targetname" "target_position7"
+}
+{
+"classname" "target_position"
+"origin" "1352.000000 200.000000 1008.000000"
+"targetname" "target_position8"
+}
+{
+"classname" "target_position"
+"origin" "1792.000000 184.000000 584.000000"
+"targetname" "target_position9"
+}
+{
+"classname" "target_position"
+"origin" "1784.000000 -320.000000 328.000000"
+"targetname" "target_position10"
+}
+{
+"classname" "target_position"
+"origin" "-80.000000 -440.000000 184.000000"
+"targetname" "target_position11"
+}
+{
+"classname" "target_position"
+"origin" "576.000000 1112.000000 -496.000000"
+"targetname" "target_position12"
+}
+{
+"classname" "target_position"
+"origin" "928.000000 840.000000 -296.000000"
+"targetname" "target_position13"
+}
+{
+"classname" "target_position"
+"origin" "2152.000000 384.000000 -592.000000"
+"targetname" "target_position14"
+}
+{
+"classname" "target_position"
+"origin" "512.000000 -88.000000 -480.000000"
+"targetname" "target_position15"
+}
+{
+"classname" "target_position"
+"origin" "224.000000 -96.000000 216.000000"
+"targetname" "target_position16"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 640.000000 -560.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Mech-Combo.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 768.000000 -560.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Mech-Combo.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 800.000000 -440.000000"
+"spawnflags" "1"
+"noise" "lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 1128.000000 -304.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 80.000000 -192.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 192.000000 -192.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "960.000000 960.000000 -192.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 568.000000 -432.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 728.000000 -432.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 968.000000 -432.000000"
+"spawnflags" "1"
+"noise" "lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1280.000000 128.000000 480.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 400.000000 264.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 0.000000 352.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "672.000000 0.000000 712.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "672.000000 -344.000000 712.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "736.000000 200.000000 -24.000000"
+"spawnflags" "1"
+"noise" "sound/machines/Big_machine.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-88.000000 432.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-88.000000 944.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "600.000000 432.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "600.000000 944.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 1200.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 200.000000 -1448.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "128.000000 704.000000 -992.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "384.000000 704.000000 -992.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 992.000000 -992.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 416.000000 -992.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1344.000000 832.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1088.000000 576.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1600.000000 576.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1344.000000 320.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1208.000000 256.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "952.000000 0.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1464.000000 0.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1208.000000 -256.000000 -1024.000000"
+"spawnflags" "1"
+"noise" "sound/supernatural/Haunted.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1280.000000 128.000000 160.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1984.000000 0.000000 336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1344.000000 -544.000000 496.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "0.000000 -512.000000 336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "384.000000 192.000000 632.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 -88.000000 48.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1088.000000 -384.000000 -48.000000"
+"spawnflags" "1"
+"noise" "sound/machines/lighthum_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 896.000000 224.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 1024.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 1024.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 1024.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 1280.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 1280.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 1280.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 1536.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 1536.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 1536.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 -256.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 -256.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2560.000000 -256.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "3072.000000 256.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "3072.000000 256.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "3072.000000 256.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2304.000000 -768.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2304.000000 -768.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2304.000000 -768.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 -1024.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 -1024.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1792.000000 -1024.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 -1280.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 -1280.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1024.000000 -1280.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 -1280.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 -1280.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 -1280.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 -1024.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 -1024.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 -1024.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 -512.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 -512.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 -512.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 256.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 256.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 256.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 1024.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 1024.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-768.000000 1024.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 1536.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 1536.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 1536.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 1536.000000 1024.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 1536.000000 256.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "256.000000 1536.000000 -512.000000"
+"spawnflags" "1"
+"noise" "sound/atmosphere/ambient_lonely.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 -128.000000 152.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1784.000000 -848.000000 -880.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "2432.000000 384.000000 -832.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 400.000000 552.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "920.000000 704.000000 -648.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "728.000000 1208.000000 -880.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-256.000000 576.000000 -616.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "224.000000 -96.000000 -616.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "728.000000 -248.000000 -880.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "-264.000000 -552.000000 -880.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1248.000000 128.000000 -320.000000"
+"spawnflags" "1"
+"noise" "sound/machines/light_stereo_looped.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "640.000000 -448.000000 -296.000000"
+"spawnflags" "1"
+"noise" "sound/machines/portal_idle.wav"
+}
+{
+"classname" "target_speaker"
+"origin" "1640.000000 16.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1912.000000 16.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 152.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 -120.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "1640.000000 768.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1912.000000 768.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 904.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "1776.000000 632.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "1208.000000 -384.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1480.000000 -384.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "1344.000000 -248.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "1344.000000 -520.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "-8.000000 -384.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "128.000000 -248.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "128.000000 -520.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "-168.000000 128.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "104.000000 128.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+}
+{
+"classname" "target_speaker"
+"origin" "-32.000000 264.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "target_speaker"
+"origin" "-32.000000 -8.000000 -336.000000"
+"spawnflags" "1"
+"noise" "sound/map_xoylent/object_light.ogg"
+"angle" "-90.000000"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "1088.000000 1152.000000 160.000000"
+"target" "target_position17"
+}
+{
+"classname" "target_position"
+"origin" "1216.000000 1024.000000 216.000000"
+"targetname" "target_position17"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "1888.000000 592.000000 -664.000000"
+"target" "target_position18"
+}
+{
+"classname" "target_position"
+"origin" "1536.000000 320.000000 -384.000000"
+"targetname" "target_position18"
 }
diff --git a/maps/oilrig.map.options b/maps/oilrig.map.options
index eb537634..6a5bb462 100644
--- a/maps/oilrig.map.options
+++ b/maps/oilrig.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 2
+Version: 6
diff --git a/maps/oilrig.mapinfo b/maps/oilrig.mapinfo
index b8953bb7..77ca095c 100644
--- a/maps/oilrig.mapinfo
+++ b/maps/oilrig.mapinfo
@@ -1,14 +1,13 @@
 title Oilrig
 description A very large open map designed after an offshore oil rig.
 author Tronyn, Debugger, SavageX, Dustin Geeraert, Garth Hendy
-cdtrack 14
+cdtrack 8
 has weapons all
 gametype dm // defaults: timelimit=20 pointlimit=30 leadlimit=0
 gametype lms // defaults: timelimit=20 lives=9 leadlimit=0
 gametype rune // defaults: timelimit=20 pointlimit=200 leadlimit=0
 gametype tdm // defaults: timelimit=20 pointlimit=50 teams=2 leadlimit=0
 gametype ca // defaults: timelimit=20 pointlimit=10 leadlimit=0
-gametype dom // defaults: timelimit=20 pointlimit=200 teams=2 leadlimit=0
 gametype kh // defaults: timelimit=20 pointlimit=1000 teams=3 leadlimit=0
 gametype ft // defaults: timelimit=20 pointlimit=10 teams=2 leadlimit=0
 gametype ka // defaults: timelimit=20 pointlimit=30