introduce a normally culled variant of exx floor-grate04 to prevent that grate-surfac...

retweak lighting in computer room
replace some neon-light fixture with a spotlight behind a grate
tweaked lighting-grid for higher resolution

diff --git a/maps/g-23.map b/maps/g-23.map
index ea668ef198c218a02b83ef363f818f9e841142c2..2ec19ce84e810b145d36ac045073d1ee48441841 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -4,6 +4,7 @@
 "classname" "worldspawn"
 "message" "Loading Dock G-23 by Moo"
 "_floodlight" "255 237 179 1024 128"
+"gridsize" "48 48 96"
 // brush 0
 {
 ( 704 1344 256 ) ( 704 704 256 ) ( 640 768 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -1492,7 +1493,7 @@ exx/base-metal03
 ( 1776 -240 192 ) ( 1776 -240 256 ) ( 1776 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1776 -240 256 ) ( 1776 -240 192 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1296 -240 256 ) ( 1296 -240 192 ) ( 1296 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 1776 240 192 ) ( 1776 240 256 ) ( 1296 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1480 -64 -64 ) ( 1488 -64 -64 ) ( 1480 -64 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 // brush 153
 {
@@ -12852,6 +12853,96 @@ exx/wall-metalrib01
 ( -112 1000 256 ) ( -112 1000 264 ) ( -80 1000 256 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 ( -120 1008 256 ) ( -120 1040 256 ) ( -120 1008 264 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+// brush 1302
+{
+( 1776 -240 192 ) ( 1776 240 192 ) ( 1296 -240 192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1776 -240 192 ) ( 1776 -240 256 ) ( 1776 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1296 -240 256 ) ( 1296 -240 192 ) ( 1296 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1776 240 192 ) ( 1776 240 256 ) ( 1296 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1496 64 64 ) ( 1512 64 -64 ) ( 1496 64 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1303
+{
+( 1776 -240 192 ) ( 1776 240 192 ) ( 1296 -240 192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1296 -240 256 ) ( 1296 -240 192 ) ( 1296 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1496 64 -64 ) ( 1512 64 -64 ) ( 1496 64 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1480 -64 64 ) ( 1488 -64 -64 ) ( 1480 -64 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1472 32 -64 ) ( 1472 16 -64 ) ( 1472 32 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1304
+{
+( 1776 -240 192 ) ( 1776 240 192 ) ( 1296 -240 192 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1776 -240 192 ) ( 1776 -240 256 ) ( 1776 240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1496 64 -64 ) ( 1512 64 -64 ) ( 1496 64 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1480 -64 64 ) ( 1488 -64 -64 ) ( 1480 -64 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 48 64 ) ( 1600 32 -64 ) ( 1600 48 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1305
+{
+( 1488 -48 184 ) ( 1488 48 184 ) ( 1472 -64 192 ) exx/trim-vert01 0 0 0 0.5 0.5 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1488 48 192 ) ( 1488 48 256 ) ( 1472 64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1488 -48 256 ) ( 1488 -48 192 ) ( 1472 -64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1472 32 64 ) ( 1472 16 -64 ) ( 1472 32 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1488 48 184 ) ( 1488 -48 184 ) ( 1488 -48 256 ) exx/wall-metalrib01 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1306
+{
+( 1584 -48 184 ) ( 1488 -48 184 ) ( 1600 -64 192 ) exx/trim-vert01 0 0 90 0.5 0.5 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 -64 256 ) ( 1600 -64 192 ) ( 1472 -64 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1472 -64 256 ) ( 1472 -64 192 ) ( 1488 -48 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 -64 192 ) ( 1600 -64 256 ) ( 1584 -48 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1488 -48 184 ) ( 1584 -48 184 ) ( 1584 -48 256 ) exx/wall-metalrib01 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1307
+{
+( 1584 48 184 ) ( 1584 -48 184 ) ( 1600 -64 192 ) exx/trim-vert01 0 0 0 0.5 0.5 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1584 48 256 ) ( 1584 48 192 ) ( 1600 64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1584 -48 192 ) ( 1584 -48 256 ) ( 1600 -64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 48 -64 ) ( 1600 32 -64 ) ( 1600 48 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1584 -48 184 ) ( 1584 48 184 ) ( 1584 48 256 ) exx/wall-metalrib01 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1308
+{
+( 1488 48 184 ) ( 1584 48 184 ) ( 1600 64 192 ) exx/trim-vert01 0 0 90 0.5 0.5 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 64 192 ) ( 1600 64 256 ) ( 1472 64 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1472 64 192 ) ( 1472 64 256 ) ( 1488 48 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1600 64 256 ) ( 1600 64 192 ) ( 1584 48 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1584 48 184 ) ( 1488 48 184 ) ( 1488 48 256 ) exx/wall-metalrib01 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1309
+{
+( 1776 -240 184 ) ( 1776 240 184 ) ( 1296 -240 184 ) exx/floor-grate04-cull 128 128 0 0.375 0.375 0 0 0
+( 1776 240 192 ) ( 1776 -240 192 ) ( 1296 -240 192 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
+( 1488 48 0 ) ( 1488 40 -128 ) ( 1488 48 -128 ) common/nodraw 0 -0 0 0.25 0.25 0 0 0
+( 1584 48 -128 ) ( 1584 40 -128 ) ( 1584 48 0 ) common/nodraw 0 -0 0 0.25 0.25 0 0 0
+( 1496 48 -128 ) ( 1512 48 -128 ) ( 1496 48 0 ) common/nodraw 0 -0 0 0.25 0.25 0 0 0
+( 1496 -48 0 ) ( 1504 -48 -128 ) ( 1496 -48 -128 ) common/nodraw 0 -0 0 0.25 0.25 0 0 0
+}
+// brush 1310
+{
+( 1776 -240 248 ) ( 1776 240 248 ) ( 1296 -240 248 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1776 240 256 ) ( 1776 -240 256 ) ( 1296 -240 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1488 48 64 ) ( 1488 40 -64 ) ( 1488 48 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1584 48 -64 ) ( 1584 40 -64 ) ( 1584 48 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1496 48 -64 ) ( 1512 48 -64 ) ( 1496 48 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 1496 -48 64 ) ( 1504 -48 -64 ) ( 1496 -48 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+// brush 1311
+{
+( 1584 -40 248 ) ( 1584 -48 248 ) ( 1488 -40 248 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
+( 1584 48 248 ) ( 1488 48 248 ) ( 1584 48 240 ) common/nodraw 0 160 0 0.25 0.25 0 0 0
+( 1584 -40 248 ) ( 1584 -40 240 ) ( 1584 -48 248 ) common/nodraw 0 160 0 0.25 0.25 0 0 0
+( 1488 -48 232 ) ( 1584 -48 232 ) ( 1488 -40 232 ) trak5x/light-light2a 0 0 0 0.375 0.375 0 0 0
+( 1488 -48 240 ) ( 1488 -48 248 ) ( 1584 -48 240 ) common/nodraw 0 160 0 0.25 0.25 0 0 0
+( 1488 -48 240 ) ( 1488 -40 240 ) ( 1488 -48 248 ) common/nodraw 0 160 0 0.25 0.25 0 0 0
+}
 }
 // entity 1
 {
@@ -13008,28 +13099,12 @@ exx/wall-metalrib01
 // entity 21
 {
 "classname" "misc_model"
-"origin" "1536.000000 -0.000173 192.000015"
-"model" "models/lights/xonlight02.md3"
-"angle" "-45.000000"
-"spawnflags" "2"
-}
-// entity 22
-{
-"classname" "light"
-"origin" "1536.000000 0.000000 120.000000"
-"_color" "1 0.927962 0.703319"
-"light" "1280"
-"target" "info_null_light1"
-}
-// entity 23
-{
-"classname" "misc_model"
 "origin" "1703.999634 216.000793 32.000000"
 "model" "models/it/pc.md3"
 "angle" "-22.500006"
 "spawnflags" "2"
 }
-// entity 24
+// entity 22
 {
 "classname" "misc_model"
 "origin" "1757.547852 196.329041 32.000000"
@@ -13037,7 +13112,7 @@ exx/wall-metalrib01
 "angle" "-67.499969"
 "spawnflags" "2"
 }
-// entity 25
+// entity 23
 {
 "classname" "misc_model"
 "origin" "1730.452271 179.669754 32.000000"
@@ -13045,7 +13120,7 @@ exx/wall-metalrib01
 "angle" "-67.499969"
 "spawnflags" "2"
 }
-// entity 26
+// entity 24
 {
 "classname" "misc_model"
 "origin" "1747.999756 219.999710 160.000031"
@@ -13053,14 +13128,14 @@ exx/wall-metalrib01
 "angle" "134.999985"
 "spawnflags" "2"
 }
-// entity 27
+// entity 25
 {
 "classname" "light"
 "origin" "128.000000 336.000000 96.000000"
 "light" "384"
 "_color" "1 0.927962 0.703319"
 }
-// entity 28
+// entity 26
 {
 "classname" "misc_model"
 "origin" "63.941071 649.941101 -479.999847"
@@ -13068,7 +13143,7 @@ exx/wall-metalrib01
 "angle" "90.000000"
 "spawnflags" "2"
 }
-// entity 29
+// entity 27
 {
 "classname" "func_plat"
 "speed" "300"
@@ -13156,7 +13231,7 @@ exx/wall-metalrib01
 ( 656 -376 64 ) ( 680 -376 -64 ) ( 656 -376 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 30
+// entity 28
 {
 "classname" "misc_model"
 "origin" "928.000000 -815.999939 112.000000"
@@ -13164,7 +13239,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 31
+// entity 29
 {
 "classname" "misc_model"
 "origin" "928.000000 -791.999939 112.000000"
@@ -13172,7 +13247,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 32
+// entity 30
 {
 "classname" "misc_model"
 "origin" "1391.999634 -1199.999268 100.000099"
@@ -13181,7 +13256,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 33
+// entity 31
 {
 "classname" "misc_model"
 "origin" "1176.000366 -847.999756 100.000107"
@@ -13190,7 +13265,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 34
+// entity 32
 {
 "classname" "misc_model"
 "origin" "1279.999756 -1023.999817 256.000000"
@@ -13198,7 +13273,7 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 "spawnflags" "2"
 }
-// entity 35
+// entity 33
 {
 "classname" "misc_model"
 "origin" "831.999756 -1023.999817 256.000000"
@@ -13206,7 +13281,7 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 "spawnflags" "2"
 }
-// entity 36
+// entity 34
 {
 "classname" "misc_model"
 "origin" "1535.999878 -1023.999817 256.000000"
@@ -13214,7 +13289,7 @@ exx/wall-metalrib01
 "angle" "-45.000000"
 "spawnflags" "2"
 }
-// entity 37
+// entity 35
 {
 "classname" "misc_model"
 "origin" "320.000153 -1024.000000 256.000000"
@@ -13222,7 +13297,7 @@ exx/wall-metalrib01
 "angle" "-135.000015"
 "spawnflags" "2"
 }
-// entity 38
+// entity 36
 {
 "classname" "misc_model"
 "origin" "-192.000183 -1023.999878 256.000000"
@@ -13230,7 +13305,7 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 "spawnflags" "2"
 }
-// entity 39
+// entity 37
 {
 "classname" "misc_model"
 "origin" "1023.999756 -1023.999817 256.000000"
@@ -13238,15 +13313,15 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 "spawnflags" "2"
 }
-// entity 40
+// entity 38
 {
 "classname" "light"
 "origin" "480.000000 -1232.000000 184.000000"
-"light" "128"
+"light" "196"
 "_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp1"
 }
-// entity 41
+// entity 39
 {
 "classname" "misc_model"
 "origin" "480.000183 -1176.000122 99.999901"
@@ -13255,7 +13330,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 42
+// entity 40
 {
 "classname" "misc_model"
 "origin" "520.000000 -1248.000000 112.000000"
@@ -13263,7 +13338,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 43
+// entity 41
 {
 "classname" "misc_model"
 "origin" "456.000000 -1232.000000 112.000000"
@@ -13271,7 +13346,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 44
+// entity 42
 {
 "classname" "misc_model"
 "origin" "456.000000 -1256.000000 112.000000"
@@ -13279,7 +13354,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 45
+// entity 43
 {
 "classname" "misc_model"
 "origin" "1184.000000 -800.000000 112.000000"
@@ -13287,7 +13362,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 46
+// entity 44
 {
 "classname" "misc_model"
 "origin" "1248.000000 -815.999939 112.000000"
@@ -13295,7 +13370,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 47
+// entity 45
 {
 "classname" "misc_model"
 "origin" "1248.000000 -791.999939 112.000000"
@@ -13303,7 +13378,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 48
+// entity 46
 {
 "classname" "misc_model"
 "origin" "656.000000 -847.999939 100.000267"
@@ -13312,7 +13387,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 49
+// entity 47
 {
 "classname" "misc_model"
 "origin" "1416.000000 -1248.000000 112.000000"
@@ -13320,7 +13395,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 50
+// entity 48
 {
 "classname" "misc_model"
 "origin" "1352.000000 -1232.000000 112.000000"
@@ -13328,7 +13403,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 51
+// entity 49
 {
 "classname" "misc_model"
 "origin" "1352.000000 -1256.000000 112.000000"
@@ -13336,7 +13411,7 @@ exx/wall-metalrib01
 "angle" "-180.000000"
 "spawnflags" "2"
 }
-// entity 52
+// entity 50
 {
 "classname" "misc_model"
 "origin" "544.000000 -800.000000 112.000000"
@@ -13344,7 +13419,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 53
+// entity 51
 {
 "classname" "misc_model"
 "origin" "608.000000 -815.999939 112.000000"
@@ -13352,7 +13427,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 54
+// entity 52
 {
 "classname" "misc_model"
 "origin" "608.000000 -791.999939 112.000000"
@@ -13360,7 +13435,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 55
+// entity 53
 {
 "classname" "misc_model"
 "origin" "936.000122 -855.999939 80.000015"
@@ -13369,7 +13444,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 56
+// entity 54
 {
 "classname" "misc_model"
 "origin" "864.000000 -800.000000 112.000000"
@@ -13377,7 +13452,7 @@ exx/wall-metalrib01
 "angle" "0.000009"
 "spawnflags" "2"
 }
-// entity 57
+// entity 55
 {
 "classname" "misc_model"
 "origin" "1735.999390 120.000259 0.000008"
@@ -13386,7 +13461,7 @@ exx/wall-metalrib01
 "modelscale" "0.750000"
 "spawnflags" "2"
 }
-// entity 58
+// entity 56
 {
 "classname" "light"
 "origin" "-128.000000 1256.000000 24.000000"
@@ -13394,14 +13469,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null18"
 }
-// entity 59
+// entity 57
 {
 "classname" "light"
 "origin" "608.000000 -288.000000 216.000015"
 "light" "512"
 "_color" "1 0.927962 0.703319"
 }
-// entity 60
+// entity 58
 {
 "classname" "misc_model"
 "origin" "608.000000 -288.000031 256.000000"
@@ -13409,49 +13484,49 @@ exx/wall-metalrib01
 "angle" "45.000015"
 "spawnflags" "2"
 }
-// entity 61
+// entity 59
 {
 "classname" "light"
 "origin" "-32.000000 -1024.000000 -384.000000"
 "light" "512"
 "_color" "1 0.927962 0.703319"
 }
-// entity 62
+// entity 60
 {
 "classname" "light"
 "origin" "1376.000000 960.000000 160.000000"
 "light" "256"
 "_color" "1 0.927962 0.703319"
 }
-// entity 63
+// entity 61
 {
 "classname" "light"
 "origin" "-256.000000 -544.000000 -384.000000"
 "light" "512"
 "_color" "1 0.927962 0.703319"
 }
-// entity 64
+// entity 62
 {
 "classname" "light"
 "origin" "1472.000000 352.000000 160.000000"
 "light" "256"
 "_color" "1 0.927962 0.703319"
 }
-// entity 65
+// entity 63
 {
 "classname" "light"
 "origin" "1056.000000 960.000000 160.000000"
 "light" "256"
 "_color" "1 0.927962 0.703319"
 }
-// entity 66
+// entity 64
 {
 "classname" "light"
 "origin" "736.000000 960.000000 224.000000"
 "light" "256"
 "_color" "1 0.927962 0.703319"
 }
-// entity 67
+// entity 65
 {
 "classname" "trigger_impulse"
 "target" "target_position4"
@@ -13475,13 +13550,13 @@ exx/wall-metalrib01
 ( 120 -1016 -264 ) ( 120 -1032 -248 ) ( 120 -1032 -264 ) common/origin 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 68
+// entity 66
 {
 "classname" "target_position"
 "origin" "128.000000 -1024.000000 80.000000"
 "targetname" "target_position4"
 }
-// entity 69
+// entity 67
 {
 "classname" "target_speaker"
 "origin" "2240.000000 -960.000000 160.000000"
@@ -13490,7 +13565,7 @@ exx/wall-metalrib01
 "atten" "1.5"
 "volume" "1"
 }
-// entity 70
+// entity 68
 {
 "classname" "target_speaker"
 "origin" "128.000000 -1024.000000 -224.000000"
@@ -13499,225 +13574,225 @@ exx/wall-metalrib01
 "atten" "3"
 "volume" "0.5"
 }
-// entity 71
+// entity 69
 {
 "classname" "weapon_nex"
 "origin" "1472.000000 960.000000 128.000000"
 }
-// entity 72
+// entity 70
 {
 "classname" "weapon_electro"
 "origin" "320.000000 0.000000 0.000000"
 }
-// entity 73
+// entity 71
 {
 "classname" "item_cells"
 "origin" "256.000000 0.000000 0.000000"
 }
-// entity 74
+// entity 72
 {
 "classname" "item_cells"
 "origin" "192.000000 0.000000 0.000000"
 }
-// entity 75
+// entity 73
 {
 "classname" "weapon_grenadelauncher"
 "origin" "-256.000000 -1024.000000 -448.000000"
 }
-// entity 76
+// entity 74
 {
 "classname" "item_rockets"
 "origin" "-384.000000 -1024.000000 -448.000000"
 }
-// entity 77
+// entity 75
 {
 "classname" "item_rockets"
 "origin" "-128.000000 -1024.000000 -448.000000"
 }
-// entity 78
+// entity 76
 {
 "classname" "weapon_uzi"
 "origin" "1656.000000 -1144.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 79
+// entity 77
 {
 "classname" "item_bullets"
 "origin" "1656.000000 -1080.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 80
+// entity 78
 {
 "classname" "item_bullets"
 "origin" "1592.000000 -1144.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 81
+// entity 79
 {
 "classname" "item_shells"
 "origin" "128.000000 -1216.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 82
+// entity 80
 {
 "classname" "weapon_hagar"
 "origin" "704.000000 0.000000 -448.000000"
 }
-// entity 83
+// entity 81
 {
 "classname" "item_rockets"
 "origin" "576.000000 -128.000000 -448.000000"
 }
-// entity 84
+// entity 82
 {
 "classname" "item_rockets"
 "origin" "576.000000 128.000000 -448.000000"
 }
-// entity 85
+// entity 83
 {
 "classname" "item_health_medium"
 "origin" "320.000000 1024.000000 0.000000"
 }
-// entity 86
+// entity 84
 {
 "classname" "item_armor_small"
 "origin" "192.000000 1024.000000 0.000000"
 }
-// entity 87
+// entity 85
 {
 "classname" "item_armor_small"
 "origin" "64.000000 1024.000000 0.000000"
 }
-// entity 88
+// entity 86
 {
 "classname" "item_armor_small"
 "origin" "-64.000000 1024.000000 0.000000"
 }
-// entity 89
+// entity 87
 {
 "classname" "item_armor_small"
 "origin" "-192.000000 1024.000000 0.000000"
 }
-// entity 90
+// entity 88
 {
 "classname" "item_health_small"
 "origin" "1216.000000 -1024.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 91
+// entity 89
 {
 "classname" "item_health_small"
 "origin" "448.000000 -1024.000000 80.000000"
 }
-// entity 92
+// entity 90
 {
 "classname" "item_health_small"
 "origin" "704.000000 -1024.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 93
+// entity 91
 {
 "classname" "item_armor_small"
 "origin" "-64.000000 -288.000000 -512.000000"
 }
-// entity 94
+// entity 92
 {
 "classname" "item_armor_small"
 "origin" "352.000000 64.000000 -512.000000"
 }
-// entity 95
+// entity 93
 {
 "classname" "item_armor_small"
 "origin" "352.000000 -64.000000 -512.000000"
 }
-// entity 96
+// entity 94
 {
 "classname" "item_armor_small"
 "origin" "352.000000 -192.000000 -512.000000"
 }
-// entity 97
+// entity 95
 {
 "classname" "item_armor_small"
 "origin" "320.000000 -288.000000 -512.000000"
 }
-// entity 98
+// entity 96
 {
 "classname" "item_armor_small"
 "origin" "192.000000 -288.000000 -512.000000"
 }
-// entity 99
+// entity 97
 {
 "classname" "item_armor_small"
 "origin" "64.000000 -288.000000 -512.000000"
 }
-// entity 100
+// entity 98
 {
 "classname" "item_health_small"
 "origin" "1536.000000 -64.000000 0.000000"
 }
-// entity 101
+// entity 99
 {
 "classname" "item_health_small"
 "origin" "1472.000000 0.000000 0.000000"
 }
-// entity 102
+// entity 100
 {
 "classname" "item_rockets"
 "origin" "-256.000000 -896.000000 -448.000000"
 }
-// entity 103
+// entity 101
 {
 "classname" "item_health_mega"
 "origin" "0.000000 0.000000 -512.000000"
 }
-// entity 104
+// entity 102
 {
 "classname" "item_health_small"
 "origin" "0.000000 -1024.000000 -448.000000"
 "angle" "-90.000000"
 }
-// entity 105
+// entity 103
 {
 "classname" "info_player_deathmatch"
 "origin" "1632.000000 192.000000 24.000000"
 "angle" "-90.000000"
 }
-// entity 106
+// entity 104
 {
 "classname" "info_player_deathmatch"
 "origin" "448.000000 1216.000000 24.000000"
 "angle" "-90.000000"
 }
-// entity 107
+// entity 105
 {
 "classname" "info_player_deathmatch"
 "origin" "0.000000 832.000000 24.000000"
 "angle" "89.999992"
 }
-// entity 108
+// entity 106
 {
 "classname" "info_player_deathmatch"
 "origin" "-256.000000 -768.000000 -424.000000"
 "angle" "90.000000"
 }
-// entity 109
+// entity 107
 {
 "classname" "info_player_deathmatch"
 "origin" "1536.000000 -1024.000000 104.000000"
 "angle" "135.000000"
 }
-// entity 110
+// entity 108
 {
 "classname" "info_player_deathmatch"
 "origin" "-80.000000 -880.000000 104.000000"
 "angle" "-90.000000"
 }
-// entity 111
+// entity 109
 {
 "classname" "item_armor_small"
 "origin" "1536.000000 0.000000 0.000000"
 }
-// entity 112
+// entity 110
 {
 "classname" "misc_model"
 "origin" "320.000000 0.000000 -64.000000"
@@ -13725,7 +13800,7 @@ exx/wall-metalrib01
 "angle" "90.000008"
 "spawnflags" "2"
 }
-// entity 113
+// entity 111
 {
 "classname" "light"
 "origin" "320.000000 0.000000 -104.000000"
@@ -13733,7 +13808,7 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null11"
 }
-// entity 114
+// entity 112
 {
 "classname" "misc_model"
 "origin" "-70.058891 190.058929 -511.999847"
@@ -13741,7 +13816,7 @@ exx/wall-metalrib01
 "angle" "-45.000008"
 "spawnflags" "2"
 }
-// entity 115
+// entity 113
 {
 "classname" "misc_model"
 "origin" "575.999817 -1023.999878 256.000000"
@@ -13749,18 +13824,18 @@ exx/wall-metalrib01
 "angle" "-90.000000"
 "spawnflags" "2"
 }
-// entity 116
+// entity 114
 {
 "classname" "info_player_deathmatch"
 "origin" "520.000000 -1176.000000 104.000000"
 "angle" "90.000000"
 }
-// entity 117
+// entity 115
 {
 "classname" "weapon_crylink"
 "origin" "-416.000000 392.000000 -256.000000"
 }
-// entity 118
+// entity 116
 {
 "classname" "target_speaker"
 "origin" "1472.000000 960.000000 176.000000"
@@ -13769,7 +13844,7 @@ exx/wall-metalrib01
 "atten" "1.25"
 "volume" "1"
 }
-// entity 119
+// entity 117
 {
 "classname" "misc_model"
 "origin" "-1056.000000 1216.000000 64.000000"
@@ -13777,14 +13852,14 @@ exx/wall-metalrib01
 "angle" "-179.999985"
 "spawnflags" "2"
 }
-// entity 120
+// entity 118
 {
 "classname" "light"
 "origin" "-1056.000000 1176.000000 64.000000"
 "light" "768"
 "_color" "1 0.927962 0.703319"
 }
-// entity 121
+// entity 119
 {
 "classname" "misc_model"
 "origin" "-1088.000000 448.000244 -384.000244"
@@ -13792,7 +13867,7 @@ exx/wall-metalrib01
 "angles" "-90.000000 0.000000 179.999985"
 "spawnflags" "2"
 }
-// entity 122
+// entity 120
 {
 "classname" "misc_model"
 "origin" "-1088.000000 -447.999756 -384.000244"
@@ -13800,7 +13875,7 @@ exx/wall-metalrib01
 "angles" "-90.000000 0.000000 179.999985"
 "spawnflags" "2"
 }
-// entity 123
+// entity 121
 {
 "classname" "misc_model"
 "origin" "-1088.000000 -255.999756 -384.000244"
@@ -13808,7 +13883,7 @@ exx/wall-metalrib01
 "angles" "-90.000000 0.000000 179.999985"
 "spawnflags" "2"
 }
-// entity 124
+// entity 122
 {
 "classname" "misc_model"
 "origin" "-1088.000000 256.000244 -384.000244"
@@ -13816,7 +13891,7 @@ exx/wall-metalrib01
 "angles" "-90.000000 0.000000 179.999985"
 "spawnflags" "2"
 }
-// entity 125
+// entity 123
 {
 "classname" "trigger_impulse"
 "target" "target_position5"
@@ -13840,13 +13915,13 @@ exx/wall-metalrib01
 ( -1160 -8 -448 ) ( -1160 8 -448 ) ( -1160 -8 -256 ) common/origin 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 126
+// entity 124
 {
 "classname" "target_position"
 "origin" "-1152.000000 0.000000 -192.000000"
 "targetname" "target_position5"
 }
-// entity 127
+// entity 125
 {
 "classname" "trigger_impulse"
 "target" "target_position6"
@@ -13870,13 +13945,13 @@ exx/wall-metalrib01
 ( -904 -1032 -352 ) ( -904 -1016 -352 ) ( -904 -1032 -160 ) common/origin 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 128
+// entity 126
 {
 "classname" "target_position"
 "origin" "-896.000000 -1024.000000 0.000000"
 "targetname" "target_position6"
 }
-// entity 129
+// entity 127
 {
 "classname" "trigger_hurt"
 "message" "slipped off the edge a little... Oops."
@@ -13975,7 +14050,7 @@ exx/wall-metalrib01
 ( -576 -512 -1280 ) ( -640 -512 -1344 ) ( -576 -512 -1344 ) common/trigger 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 130
+// entity 128
 {
 "classname" "trigger_impulse"
 "target" "target_position7"
@@ -13999,13 +14074,13 @@ exx/wall-metalrib01
 ( -904 1016 -192 ) ( -904 1032 -192 ) ( -904 1016 0 ) common/origin 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 131
+// entity 129
 {
 "classname" "target_position"
 "origin" "-896.000000 1024.000000 64.000000"
 "targetname" "target_position7"
 }
-// entity 132
+// entity 130
 {
 "classname" "misc_model"
 "origin" "-639.999573 -640.000854 64.000000"
@@ -14013,7 +14088,7 @@ exx/wall-metalrib01
 "angle" "63"
 "spawnflags" "2"
 }
-// entity 133
+// entity 131
 {
 "classname" "light"
 "origin" "-680.000000 -616.000000 64.000000"
@@ -14021,7 +14096,7 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "angle" "63"
 }
-// entity 134
+// entity 132
 {
 "classname" "misc_model"
 "origin" "-1056.000000 -1216.000000 64.000000"
@@ -14029,14 +14104,14 @@ exx/wall-metalrib01
 "angle" "0.000003"
 "spawnflags" "2"
 }
-// entity 135
+// entity 133
 {
 "classname" "light"
 "origin" "-1056.000000 -1176.000000 64.000000"
 "light" "768"
 "_color" "1 0.927962 0.703319"
 }
-// entity 136
+// entity 134
 {
 "classname" "misc_model"
 "origin" "-639.999878 639.999817 64.000000"
@@ -14044,56 +14119,56 @@ exx/wall-metalrib01
 "angle" "117.000008"
 "spawnflags" "2"
 }
-// entity 137
+// entity 135
 {
 "classname" "light"
 "origin" "-1024.000000 -480.000000 224.000000"
 "light" "1024"
 "_color" "1 0.927962 0.703319"
 }
-// entity 138
+// entity 136
 {
 "classname" "light"
 "origin" "-680.000000 616.000000 64.000000"
 "light" "768"
 "_color" "1 0.927962 0.703319"
 }
-// entity 139
+// entity 137
 {
 "classname" "light"
 "origin" "-1024.000000 480.000000 224.000000"
 "light" "1024"
 "_color" "1 0.927962 0.703319"
 }
-// entity 140
+// entity 138
 {
 "classname" "light"
 "origin" "-800.000000 256.000000 224.000000"
 "light" "1024"
 "_color" "1 0.927962 0.703319"
 }
-// entity 141
+// entity 139
 {
 "classname" "light"
 "origin" "-800.000000 0.000000 224.000000"
 "light" "1024"
 "_color" "1 0.927962 0.703319"
 }
-// entity 142
+// entity 140
 {
 "classname" "light"
 "origin" "-800.000000 -256.000000 224.000000"
 "light" "1024"
 "_color" "1 0.927962 0.703319"
 }
-// entity 143
+// entity 141
 {
 "classname" "light"
 "origin" "-608.000000 -1024.000000 -384.000000"
 "light" "512"
 "_color" "1 0.927962 0.703319"
 }
-// entity 144
+// entity 142
 {
 "classname" "target_speaker"
 "origin" "-1152.000000 0.000000 -368.000000"
@@ -14102,7 +14177,7 @@ exx/wall-metalrib01
 "atten" "3"
 "volume" "0.5"
 }
-// entity 145
+// entity 143
 {
 "classname" "target_speaker"
 "origin" "-896.000000 1024.000000 -112.000000"
@@ -14111,7 +14186,7 @@ exx/wall-metalrib01
 "atten" "3"
 "volume" "0.5"
 }
-// entity 146
+// entity 144
 {
 "classname" "target_speaker"
 "origin" "-896.000000 -1024.000000 -272.000000"
@@ -14120,197 +14195,197 @@ exx/wall-metalrib01
 "atten" "3"
 "volume" "0.5"
 }
-// entity 147
+// entity 145
 {
 "classname" "weapon_rocketlauncher"
 "origin" "-1344.000000 0.000000 -448.000000"
 }
-// entity 148
+// entity 146
 {
 "classname" "item_rockets"
 "origin" "-1344.000000 -64.000000 -448.000000"
 }
-// entity 149
+// entity 147
 {
 "classname" "item_rockets"
 "origin" "-1344.000000 64.000000 -448.000000"
 }
-// entity 150
+// entity 148
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 -192.000000 -448.000000"
 }
-// entity 151
+// entity 149
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 -320.000000 -448.000000"
 }
-// entity 152
+// entity 150
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 320.000000 -448.000000"
 }
-// entity 153
+// entity 151
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 -448.000000 -448.000000"
 }
-// entity 154
+// entity 152
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 448.000000 -448.000000"
 }
-// entity 155
+// entity 153
 {
 "classname" "item_health_small"
 "origin" "-1152.000000 192.000000 -448.000000"
 }
-// entity 156
+// entity 154
 {
 "classname" "item_armor_small"
 "origin" "-1248.000000 -704.000000 -448.000000"
 }
-// entity 157
+// entity 155
 {
 "classname" "item_armor_small"
 "origin" "-1184.000000 -576.000000 -448.000000"
 }
-// entity 158
+// entity 156
 {
 "classname" "item_armor_small"
 "origin" "-1184.000000 576.000000 -448.000000"
 }
-// entity 159
+// entity 157
 {
 "classname" "item_armor_small"
 "origin" "-1248.000000 704.000000 -448.000000"
 }
-// entity 160
+// entity 158
 {
 "classname" "item_health_small"
 "origin" "-768.000000 -1024.000000 -448.000000"
 "angle" "-90.000000"
 }
-// entity 161
+// entity 159
 {
 "classname" "item_health_small"
 "origin" "-512.000000 -1024.000000 -448.000000"
 "angle" "-90.000000"
 }
-// entity 162
+// entity 160
 {
 "classname" "item_armor_medium"
 "origin" "-872.000000 808.000000 -128.000000"
 }
-// entity 163
+// entity 161
 {
 "classname" "item_health_small"
 "origin" "-640.000000 -1024.000000 -448.000000"
 "angle" "-90.000000"
 }
-// entity 164
+// entity 162
 {
 "classname" "weapon_uzi"
 "origin" "-864.000000 -768.000000 -256.000000"
 }
-// entity 165
+// entity 163
 {
 "classname" "item_bullets"
 "origin" "-864.000000 -704.000000 -256.000000"
 }
-// entity 166
+// entity 164
 {
 "classname" "item_bullets"
 "origin" "-864.000000 -640.000000 -256.000000"
 }
-// entity 167
+// entity 165
 {
 "classname" "info_player_deathmatch"
 "origin" "-1344.000000 512.000000 -424.000000"
 "angle" "-90.000000"
 }
-// entity 168
+// entity 166
 {
 "classname" "info_player_deathmatch"
 "origin" "-1344.000000 -512.000000 -424.000000"
 "angle" "89.999992"
 }
-// entity 169
+// entity 167
 {
 "classname" "info_player_deathmatch"
 "origin" "-1152.000000 -976.000000 -232.000000"
 "angle" "0.000009"
 }
-// entity 170
+// entity 168
 {
 "classname" "info_player_deathmatch"
 "origin" "-768.000000 -640.000000 -232.000000"
 "angle" "179.999985"
 }
-// entity 171
+// entity 169
 {
 "classname" "info_player_deathmatch"
 "origin" "-488.000000 424.000000 -232.000000"
 "angle" "-45.000008"
 }
-// entity 172
+// entity 170
 {
 "classname" "info_player_deathmatch"
 "origin" "-1024.000000 1080.000000 -232.000000"
 "angle" "-90.000000"
 }
-// entity 173
+// entity 171
 {
 "classname" "info_player_deathmatch"
 "origin" "-832.000000 640.000000 -232.000000"
 "angle" "-90.000000"
 }
-// entity 174
+// entity 172
 {
 "classname" "item_health_small"
 "origin" "-672.000000 448.000000 -448.000000"
 }
-// entity 175
+// entity 173
 {
 "classname" "item_health_small"
 "origin" "-672.000000 -448.000000 -448.000000"
 }
-// entity 176
+// entity 174
 {
 "classname" "item_health_small"
 "origin" "-672.000000 -320.000000 -448.000000"
 }
-// entity 177
+// entity 175
 {
 "classname" "item_health_small"
 "origin" "-672.000000 -192.000000 -448.000000"
 }
-// entity 178
+// entity 176
 {
 "classname" "item_health_small"
 "origin" "-672.000000 -64.000000 -448.000000"
 }
-// entity 179
+// entity 177
 {
 "classname" "item_health_small"
 "origin" "-672.000000 64.000000 -448.000000"
 }
-// entity 180
+// entity 178
 {
 "classname" "item_health_small"
 "origin" "-672.000000 192.000000 -448.000000"
 }
-// entity 181
+// entity 179
 {
 "classname" "item_health_small"
 "origin" "-672.000000 320.000000 -448.000000"
 }
-// entity 182
+// entity 180
 {
 "classname" "item_health_large"
 "origin" "-1312.000000 -1040.000000 -256.000000"
 }
-// entity 183
+// entity 181
 {
 "classname" "func_door"
 "angle" "90"
@@ -14366,7 +14441,7 @@ exx/wall-metalrib01
 ( -688 -1016 128 ) ( -672 -1016 64 ) ( -672 -1016 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 184
+// entity 182
 {
 "classname" "func_door"
 "angle" "270"
@@ -14421,7 +14496,7 @@ exx/wall-metalrib01
 ( -688 -1016 192 ) ( -672 -1016 256 ) ( -672 -1016 192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 185
+// entity 183
 {
 "classname" "func_door"
 "angle" "90"
@@ -14477,7 +14552,7 @@ exx/wall-metalrib01
 ( -688 1032 128 ) ( -672 1032 64 ) ( -672 1032 128 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 186
+// entity 184
 {
 "classname" "func_door"
 "angle" "270"
@@ -14532,7 +14607,7 @@ exx/wall-metalrib01
 ( -688 1032 192 ) ( -672 1032 256 ) ( -672 1032 192 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 187
+// entity 185
 {
 "classname" "func_door"
 "angle" "90"
@@ -14588,7 +14663,7 @@ exx/wall-metalrib01
 ( -560 8 -192 ) ( -544 8 -256 ) ( -544 8 -192 ) common/caulk 0 -0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 188
+// entity 186
 {
 "classname" "func_door"
 "angle" "270"
@@ -14643,28 +14718,28 @@ exx/wall-metalrib01
 ( -560 8 -128 ) ( -544 8 -64 ) ( -544 8 -128 ) common/caulk 0 -0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 189
+// entity 187
 {
 "classname" "item_health_medium"
 "origin" "-1024.000000 416.000000 64.000000"
 }
-// entity 190
+// entity 188
 {
 "classname" "item_health_medium"
 "origin" "-1024.000000 -416.000000 64.000000"
 }
-// entity 191
+// entity 189
 {
 "classname" "item_armor_medium"
 "origin" "160.000000 -512.000000 -312.000000"
 }
-// entity 192
+// entity 190
 {
 "classname" "item_armor_large"
 "origin" "960.000000 -1024.000000 80.000000"
 "spawnflags" "1"
 }
-// entity 193
+// entity 191
 {
 "classname" "trigger_impulse"
 "target" "target_position1"
@@ -14744,20 +14819,20 @@ exx/wall-metalrib01
 ( -1128 -1216 -936 ) ( -1128 1216 -936 ) ( -1128 -1216 -920 ) common/origin 0 0 0 0.25 0.25 0 0 0
 }
 }
-// entity 194
+// entity 192
 {
 "classname" "target_position"
 "origin" "-1120.000000 0.000000 -544.000000"
 "targetname" "target_position1"
 }
-// entity 195
+// entity 193
 {
 "classname" "light"
 "origin" "1472.000000 672.000000 160.000000"
 "light" "256"
 "_color" "1 0.927962 0.703319"
 }
-// entity 196
+// entity 194
 {
 "classname" "func_rotating"
 "targetname" "func_rotating1"
@@ -14781,14 +14856,14 @@ exx/wall-metalrib01
 ( -900 -1024 -492 ) ( -900 -1016 -492 ) ( -900 -1024 -484 ) exx/wall-bigrib02 0 208 0 0.25 0.25 0 0 0
 }
 }
-// entity 197
+// entity 195
 {
 "classname" "misc_follow"
 "origin" "-896.000000 -1024.000000 -488.000000"
 "target" "misc_model1"
 "killtarget" "func_rotating1"
 }
-// entity 198
+// entity 196
 {
 "classname" "misc_gamemodel"
 "origin" "-896.000000 -1024.000000 -464.000000"
@@ -14796,7 +14871,7 @@ exx/wall-metalrib01
 "modelscale" "0.65"
 "targetname" "misc_model1"
 }
-// entity 199
+// entity 197
 {
 "classname" "func_rotating"
 "targetname" "func_rotating2"
@@ -14820,14 +14895,14 @@ exx/wall-metalrib01
 ( -1156 0 -492 ) ( -1156 8 -492 ) ( -1156 0 -484 ) exx/wall-bigrib02 -0 208 0 0.25 0.25 0 0 0
 }
 }
-// entity 200
+// entity 198
 {
 "classname" "misc_follow"
 "origin" "-1152.000000 0.000000 -488.000000"
 "target" "misc_model2"
 "killtarget" "func_rotating2"
 }
-// entity 201
+// entity 199
 {
 "classname" "misc_gamemodel"
 "origin" "-1152.000000 0.000000 -464.000000"
@@ -14835,7 +14910,7 @@ exx/wall-metalrib01
 "modelscale" "0.65"
 "targetname" "misc_model2"
 }
-// entity 202
+// entity 200
 {
 "classname" "func_rotating"
 "targetname" "func_rotating3"
@@ -14859,14 +14934,14 @@ exx/wall-metalrib01
 ( -900 1024 -300 ) ( -900 1032 -300 ) ( -900 1024 -292 ) exx/wall-bigrib02 0 464 0 0.25 0.25 0 0 0
 }
 }
-// entity 203
+// entity 201
 {
 "classname" "misc_follow"
 "origin" "-896.000000 1024.000000 -296.000000"
 "target" "misc_model3"
 "killtarget" "func_rotating3"
 }
-// entity 204
+// entity 202
 {
 "classname" "misc_gamemodel"
 "origin" "-896.000000 1024.000000 -272.000000"
@@ -14874,7 +14949,7 @@ exx/wall-metalrib01
 "modelscale" "0.65"
 "targetname" "misc_model3"
 }
-// entity 205
+// entity 203
 {
 "classname" "func_rotating"
 "targetname" "func_rotating4"
@@ -14898,14 +14973,14 @@ exx/wall-metalrib01
 ( 124 -1024 -492 ) ( 124 -1016 -492 ) ( 124 -1024 -484 ) exx/wall-bigrib02 0 208 0 0.25 0.25 0 0 0
 }
 }
-// entity 206
+// entity 204
 {
 "classname" "misc_follow"
 "origin" "128.000000 -1024.000000 -488.000000"
 "target" "misc_model4"
 "killtarget" "func_rotating4"
 }
-// entity 207
+// entity 205
 {
 "classname" "misc_gamemodel"
 "origin" "128.000000 -1024.000000 -464.000000"
@@ -14913,169 +14988,169 @@ exx/wall-metalrib01
 "modelscale" "0.65"
 "targetname" "misc_model4"
 }
-// entity 208
+// entity 206
 {
 "classname" "info_location"
 "origin" "0.000000 0.000000 -448.000000"
 "netname" "^1Main Room ^7- ^3Lower Level"
 }
-// entity 209
+// entity 207
 {
 "classname" "info_location"
 "origin" "-1408.000000 -416.000000 -384.000000"
 "netname" "^1Docking Area ^7- ^3Lower Level"
 }
-// entity 210
+// entity 208
 {
 "classname" "info_location"
 "origin" "-896.000000 0.000000 -128.000000"
 "netname" "^1Docking Area ^7- ^3Upper Level"
 }
-// entity 211
+// entity 209
 {
 "classname" "info_location"
 "origin" "-1088.000000 896.000000 -128.000000"
 "netname" "^1Docking Area ^7- ^3Upper Level"
 }
-// entity 212
+// entity 210
 {
 "classname" "info_location"
 "origin" "-1088.000000 -896.000000 -128.000000"
 "netname" "^1Docking Area ^7- ^3Upper Level"
 }
-// entity 213
+// entity 211
 {
 "classname" "info_location"
 "origin" "-128.000000 -1024.000000 160.000000"
 "netname" "^1Control Room"
 }
-// entity 214
+// entity 212
 {
 "classname" "info_location"
 "origin" "-128.000000 0.000000 -64.000000"
 "netname" "^1Main Room ^7- ^3Upper Level"
 }
-// entity 215
+// entity 213
 {
 "classname" "info_location"
 "origin" "0.000000 256.000000 -448.000000"
 "netname" "^1Main Room ^7- ^3Lower Level"
 }
-// entity 216
+// entity 214
 {
 "classname" "info_location"
 "origin" "640.000000 0.000000 -384.000000"
 "netname" "^1Main Room ^7- ^3Lower Level"
 }
-// entity 217
+// entity 215
 {
 "classname" "info_location"
 "origin" "160.000000 -448.000000 -192.000000"
 "netname" "^1Main Room ^7- ^3Lower Level"
 }
-// entity 218
+// entity 216
 {
 "classname" "info_location"
 "origin" "0.000000 -1024.000000 -384.000000"
 "netname" "^1Transportation Ramps"
 }
-// entity 219
+// entity 217
 {
 "classname" "info_location"
 "origin" "-256.000000 -512.000000 -384.000000"
 "netname" "^1Transportation Ramps"
 }
-// entity 220
+// entity 218
 {
 "classname" "info_location"
 "origin" "-256.000000 -1024.000000 -384.000000"
 "netname" "^1Transportation Ramps"
 }
-// entity 221
+// entity 219
 {
 "classname" "info_location"
 "origin" "-768.000000 -1024.000000 -384.000000"
 "netname" "^1Transportation Ramps"
 }
-// entity 222
+// entity 220
 {
 "classname" "info_location"
 "origin" "-1344.000000 0.000000 -384.000000"
 "netname" "^1Docking Area ^7- ^3Lower Level"
 }
-// entity 223
+// entity 221
 {
 "classname" "info_location"
 "origin" "-1408.000000 416.000000 -384.000000"
 "netname" "^1Docking Area ^7- ^3Lower Level"
 }
-// entity 224
+// entity 222
 {
 "classname" "info_location"
 "origin" "0.000000 -256.000000 -384.000000"
 "netname" "^1Main Room ^7- ^3Lower Level"
 }
-// entity 225
+// entity 223
 {
 "classname" "info_location"
 "origin" "320.000000 0.000000 64.000000"
 "netname" "^1Main Room ^7- ^3Upper Level"
 }
-// entity 226
+// entity 224
 {
 "classname" "info_location"
 "origin" "320.000000 1024.000000 64.000000"
 "netname" "^1Storage Room"
 }
-// entity 227
+// entity 225
 {
 "classname" "info_location"
 "origin" "-128.000000 1024.000000 64.000000"
 "netname" "^1Storage Room"
 }
-// entity 228
+// entity 226
 {
 "classname" "info_location"
 "origin" "768.000000 960.000000 224.000000"
 "netname" "^1AC Duct"
 }
-// entity 229
+// entity 227
 {
 "classname" "info_location"
 "origin" "1472.000000 960.000000 208.000000"
 "netname" "^1AC Duct"
 }
-// entity 230
+// entity 228
 {
 "classname" "info_location"
 "origin" "1472.000000 320.000000 160.000000"
 "netname" "^1AC Duct"
 }
-// entity 231
+// entity 229
 {
 "classname" "info_location"
 "origin" "1536.000000 0.000000 64.000000"
 "netname" "^1Inspection Room"
 }
-// entity 232
+// entity 230
 {
 "classname" "info_location"
 "origin" "1536.000000 -1024.000000 160.000000"
 "netname" "^1Control Room"
 }
-// entity 233
+// entity 231
 {
 "classname" "info_location"
 "origin" "960.000000 -1024.000000 160.000000"
 "netname" "^1Control Room"
 }
-// entity 234
+// entity 232
 {
 "classname" "info_location"
 "origin" "320.000000 -1024.000000 160.000000"
 "netname" "^1Control Room"
 }
-// entity 235
+// entity 233
 {
 "classname" "func_group"
 "_lightmapscale" "0.125"
@@ -15125,7 +15200,7 @@ exx/wall-metalrib01
 ( 384 760 64 ) ( 384 760 48 ) ( 384 640 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 236
+// entity 234
 {
 "classname" "func_group"
 "_lightmapscale" "0.125"
@@ -15175,13 +15250,7 @@ exx/wall-metalrib01
 ( 256 -760 64 ) ( 256 -760 48 ) ( 256 -640 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 }
-// entity 237
-{
-"classname" "info_null"
-"origin" "1536.000000 0.000000 48.000000"
-"targetname" "info_null_light1"
-}
-// entity 238
+// entity 235
 {
 "classname" "light"
 "origin" "1536.000000 -1024.000000 232.000000"
@@ -15189,13 +15258,13 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light2"
 }
-// entity 239
+// entity 236
 {
 "classname" "info_null"
 "origin" "1536.000000 -1024.000000 168.000000"
 "targetname" "info_null_light2"
 }
-// entity 240
+// entity 237
 {
 "classname" "light"
 "origin" "1280.000000 -1024.000000 232.000000"
@@ -15203,13 +15272,13 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light3"
 }
-// entity 241
+// entity 238
 {
 "classname" "info_null"
 "origin" "1280.000000 -1024.000000 136.000000"
 "targetname" "info_null_light3"
 }
-// entity 242
+// entity 239
 {
 "classname" "light"
 "origin" "1024.000000 -1024.000000 232.000000"
@@ -15217,13 +15286,13 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light4"
 }
-// entity 243
+// entity 240
 {
 "classname" "info_null"
 "origin" "1024.000000 -1024.000000 136.000000"
 "targetname" "info_null_light4"
 }
-// entity 244
+// entity 241
 {
 "classname" "light"
 "origin" "832.000000 -1024.000000 232.000000"
@@ -15231,13 +15300,13 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light5"
 }
-// entity 245
+// entity 242
 {
 "classname" "info_null"
 "origin" "832.000000 -1024.000000 136.000000"
 "targetname" "info_null_light5"
 }
-// entity 246
+// entity 243
 {
 "classname" "light"
 "origin" "576.000000 -1024.000000 232.000000"
@@ -15245,13 +15314,13 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light6"
 }
-// entity 247
+// entity 244
 {
 "classname" "info_null"
 "origin" "576.000000 -1024.000000 136.000000"
 "targetname" "info_null_light6"
 }
-// entity 248
+// entity 245
 {
 "classname" "light"
 "origin" "320.000000 -1024.000000 232.000000"
@@ -15259,130 +15328,123 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light7"
 }
-// entity 249
+// entity 246
 {
 "classname" "info_null"
 "origin" "320.000000 -1024.000000 168.000000"
 "targetname" "info_null_light7"
 }
-// entity 250
+// entity 247
 {
 "classname" "info_null"
 "origin" "480.000000 -1232.000000 136.000000"
 "targetname" "info_null_lightcomp1"
 }
-// entity 251
+// entity 248
 {
 "classname" "light"
 "origin" "1376.000000 -1232.000000 184.000000"
-"light" "128"
+"light" "196"
 "_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp2"
 }
-// entity 252
+// entity 249
 {
 "classname" "info_null"
 "origin" "1376.000000 -1232.000000 136.000000"
 "targetname" "info_null_lightcomp2"
 }
-// entity 253
+// entity 250
 {
 "classname" "light"
 "origin" "608.000000 -808.000000 184.000000"
-"light" "128"
+"light" "196"
 "_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp3"
 }
-// entity 254
+// entity 251
 {
 "classname" "info_null"
 "origin" "608.000000 -808.000000 136.000000"
 "targetname" "info_null_lightcomp3"
 }
-// entity 255
+// entity 252
 {
 "classname" "light"
 "origin" "928.000000 -808.000000 184.000000"
-"light" "128"
+"light" "196"
 "_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp4"
 }
-// entity 256
+// entity 253
 {
 "classname" "info_null"
 "origin" "928.000000 -808.000000 136.000000"
 "targetname" "info_null_lightcomp4"
 }
-// entity 257
+// entity 254
 {
 "classname" "light"
 "origin" "1248.000000 -808.000000 184.000000"
-"light" "128"
+"light" "196"
 "_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp5"
 }
-// entity 258
+// entity 255
 {
 "classname" "info_null"
 "origin" "1248.000000 -808.000000 136.000000"
 "targetname" "info_null_lightcomp5"
 }
-// entity 259
+// entity 256
 {
 "classname" "light"
 "origin" "1280.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 260
+// entity 257
 {
 "classname" "light"
 "origin" "1024.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 261
+// entity 258
 {
 "classname" "light"
 "origin" "832.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 262
+// entity 259
 {
 "classname" "light"
 "origin" "576.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 263
+// entity 260
 {
 "classname" "light"
 "origin" "320.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 264
+// entity 261
 {
 "classname" "light"
 "origin" "1536.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 265
-{
-"classname" "light"
-"origin" "1536.000000 0.000000 136.000000"
-"_color" "1 0.927962 0.703319"
-"light" "100"
-}
-// entity 266
+// entity 262
 {
 "classname" "info_null"
 "origin" "1480.000000 -608.000000 144.000000"
 "targetname" "info_null1"
 }
-// entity 267
+// entity 263
 {
 "classname" "light"
 "origin" "1624.000000 -608.000000 72.000000"
@@ -15390,21 +15452,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null2"
 }
-// entity 268
+// entity 264
 {
 "classname" "info_null"
 "origin" "1592.000000 -608.000000 144.000000"
 "targetname" "info_null2"
 "angle" "-179.999985"
 }
-// entity 269
+// entity 265
 {
 "classname" "light"
 "origin" "1536.000000 -608.000000 144.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 270
+// entity 266
 {
 "classname" "light"
 "origin" "1448.000000 -416.000000 8.000000"
@@ -15412,13 +15474,13 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null3"
 }
-// entity 271
+// entity 267
 {
 "classname" "info_null"
 "origin" "1480.000000 -416.000000 80.000000"
 "targetname" "info_null3"
 }
-// entity 272
+// entity 268
 {
 "classname" "light"
 "origin" "1624.000000 -416.000000 8.000000"
@@ -15426,28 +15488,28 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null4"
 }
-// entity 273
+// entity 269
 {
 "classname" "info_null"
 "origin" "1592.000000 -416.000000 80.000000"
 "targetname" "info_null4"
 "angle" "-179.999985"
 }
-// entity 274
+// entity 270
 {
 "classname" "light"
 "origin" "1536.000000 -416.000000 80.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 275
+// entity 271
 {
 "classname" "light"
 "origin" "1656.000000 128.000000 136.000000"
 "light" "128"
 "_color" "0.766934 0.980133 0.982223"
 }
-// entity 276
+// entity 272
 {
 "classname" "light"
 "origin" "1120.000000 88.000000 8.000000"
@@ -15455,14 +15517,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null5"
 }
-// entity 277
+// entity 273
 {
 "classname" "info_null"
 "origin" "1120.000000 56.000000 80.000000"
 "targetname" "info_null5"
 "angle" "-90.000000"
 }
-// entity 278
+// entity 274
 {
 "classname" "light"
 "origin" "1120.000000 -88.000000 8.000000"
@@ -15470,21 +15532,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null6"
 }
-// entity 279
+// entity 275
 {
 "classname" "info_null"
 "origin" "1120.000000 -56.000000 80.000000"
 "targetname" "info_null6"
 "angle" "90.000008"
 }
-// entity 280
+// entity 276
 {
 "classname" "light"
 "origin" "1120.000000 0.000000 80.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 281
+// entity 277
 {
 "classname" "light"
 "origin" "928.000000 88.000000 64.000000"
@@ -15492,14 +15554,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null9"
 }
-// entity 282
+// entity 278
 {
 "classname" "info_null"
 "origin" "928.000000 56.000000 136.000000"
 "targetname" "info_null9"
 "angle" "-90.000000"
 }
-// entity 283
+// entity 279
 {
 "classname" "light"
 "origin" "928.000000 -88.000000 64.000000"
@@ -15507,33 +15569,33 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null10"
 }
-// entity 284
+// entity 280
 {
 "classname" "info_null"
 "origin" "928.000000 -56.000000 136.000000"
 "targetname" "info_null10"
 "angle" "90.000008"
 }
-// entity 285
+// entity 281
 {
 "classname" "light"
 "origin" "928.000000 0.000000 136.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 286
+// entity 282
 {
 "classname" "info_null"
 "origin" "320.000000 0.000000 128.000000"
 "targetname" "info_null_mainroom"
 }
-// entity 287
+// entity 283
 {
 "classname" "info_null"
 "origin" "320.000000 0.000000 -192.000000"
 "targetname" "info_null11"
 }
-// entity 288
+// entity 284
 {
 "classname" "light"
 "origin" "408.000000 -608.000000 64.000000"
@@ -15541,14 +15603,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null13"
 }
-// entity 289
+// entity 285
 {
 "classname" "info_null"
 "origin" "376.000000 -608.000000 136.000000"
 "targetname" "info_null13"
 "angle" "-179.999985"
 }
-// entity 290
+// entity 286
 {
 "classname" "light"
 "origin" "232.000000 -608.000000 64.000000"
@@ -15556,21 +15618,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null12"
 }
-// entity 291
+// entity 287
 {
 "classname" "info_null"
 "origin" "264.000000 -608.000000 136.000000"
 "targetname" "info_null12"
 "angle" "0.000009"
 }
-// entity 292
+// entity 288
 {
 "classname" "light"
 "origin" "320.000000 -608.000000 136.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 293
+// entity 289
 {
 "classname" "light"
 "origin" "408.000000 608.000000 64.000000"
@@ -15578,14 +15640,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null15"
 }
-// entity 294
+// entity 290
 {
 "classname" "info_null"
 "origin" "376.000000 608.000000 136.000000"
 "targetname" "info_null15"
 "angle" "-179.999985"
 }
-// entity 295
+// entity 291
 {
 "classname" "light"
 "origin" "232.000000 608.000000 64.000000"
@@ -15593,21 +15655,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null14"
 }
-// entity 296
+// entity 292
 {
 "classname" "info_null"
 "origin" "264.000000 608.000000 136.000000"
 "targetname" "info_null14"
 "angle" "0.000009"
 }
-// entity 297
+// entity 293
 {
 "classname" "light"
 "origin" "320.000000 608.000000 136.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 298
+// entity 294
 {
 "classname" "light"
 "origin" "-544.000000 936.000000 64.000000"
@@ -15615,14 +15677,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null17"
 }
-// entity 299
+// entity 295
 {
 "classname" "info_null"
 "origin" "-544.000000 968.000000 136.000000"
 "targetname" "info_null17"
 "angle" "90.000015"
 }
-// entity 300
+// entity 296
 {
 "classname" "light"
 "origin" "-544.000000 1112.000000 64.000000"
@@ -15630,27 +15692,27 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null16"
 }
-// entity 301
+// entity 297
 {
 "classname" "info_null"
 "origin" "-544.000000 1080.000000 136.000000"
 "targetname" "info_null16"
 "angle" "-90.000000"
 }
-// entity 302
+// entity 298
 {
 "classname" "light"
 "origin" "-544.000000 1024.000000 136.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 303
+// entity 299
 {
 "classname" "info_null"
 "origin" "-128.000000 1200.000000 88.000000"
 "targetname" "info_null18"
 }
-// entity 304
+// entity 300
 {
 "classname" "light"
 "origin" "128.000000 1256.000000 24.000000"
@@ -15658,13 +15720,13 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null19"
 }
-// entity 305
+// entity 301
 {
 "classname" "info_null"
 "origin" "128.000000 1200.000000 88.000000"
 "targetname" "info_null19"
 }
-// entity 306
+// entity 302
 {
 "classname" "light"
 "origin" "128.000000 792.000000 24.000000"
@@ -15672,14 +15734,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null20"
 }
-// entity 307
+// entity 303
 {
 "classname" "info_null"
 "origin" "128.000000 840.000000 88.000000"
 "targetname" "info_null20"
 "angle" "-179.999985"
 }
-// entity 308
+// entity 304
 {
 "classname" "light"
 "origin" "-128.000000 792.000000 24.000000"
@@ -15687,14 +15749,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null21"
 }
-// entity 309
+// entity 305
 {
 "classname" "info_null"
 "origin" "-128.000000 840.000000 88.000000"
 "targetname" "info_null21"
 "angle" "-179.999985"
 }
-// entity 310
+// entity 306
 {
 "classname" "light"
 "origin" "384.000000 1256.000000 24.000000"
@@ -15702,13 +15764,13 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null22"
 }
-// entity 311
+// entity 307
 {
 "classname" "info_null"
 "origin" "384.000000 1200.000000 88.000000"
 "targetname" "info_null22"
 }
-// entity 312
+// entity 308
 {
 "classname" "light"
 "origin" "616.000000 1152.000000 24.000000"
@@ -15716,14 +15778,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null23"
 }
-// entity 313
+// entity 309
 {
 "classname" "info_null"
 "origin" "560.000000 1152.000000 88.000000"
 "targetname" "info_null23"
 "angle" "-90.000000"
 }
-// entity 314
+// entity 310
 {
 "classname" "light"
 "origin" "616.000000 896.000000 24.000000"
@@ -15731,14 +15793,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null24"
 }
-// entity 315
+// entity 311
 {
 "classname" "info_null"
 "origin" "560.000000 896.000000 88.000000"
 "targetname" "info_null24"
 "angle" "-90.000000"
 }
-// entity 316
+// entity 312
 {
 "classname" "light"
 "origin" "400.000000 888.000000 56.000000"
@@ -15746,14 +15808,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null25"
 }
-// entity 317
+// entity 313
 {
 "classname" "info_null"
 "origin" "400.000000 936.000000 120.000000"
 "targetname" "info_null25"
 "angle" "-179.999985"
 }
-// entity 318
+// entity 314
 {
 "classname" "light"
 "origin" "240.000000 888.000000 56.000000"
@@ -15761,14 +15823,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null26"
 }
-// entity 319
+// entity 315
 {
 "classname" "info_null"
 "origin" "240.000000 936.000000 120.000000"
 "targetname" "info_null26"
 "angle" "-179.999985"
 }
-// entity 320
+// entity 316
 {
 "classname" "light"
 "origin" "-264.000000 944.000000 56.000000"
@@ -15776,14 +15838,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null27"
 }
-// entity 321
+// entity 317
 {
 "classname" "info_null"
 "origin" "-208.000000 944.000000 120.000000"
 "targetname" "info_null27"
 "angle" "90.000015"
 }
-// entity 322
+// entity 318
 {
 "classname" "light"
 "origin" "-264.000000 1104.000000 56.000000"
@@ -15791,91 +15853,91 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null28"
 }
-// entity 323
+// entity 319
 {
 "classname" "info_null"
 "origin" "-208.000000 1104.000000 120.000000"
 "targetname" "info_null28"
 "angle" "90.000015"
 }
-// entity 324
+// entity 320
 {
 "classname" "light"
 "origin" "-256.000000 1104.000000 64.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 325
+// entity 321
 {
 "classname" "light"
 "origin" "-256.000000 944.000000 64.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 326
+// entity 322
 {
 "classname" "light"
 "origin" "400.000000 896.000000 64.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 327
+// entity 323
 {
 "classname" "light"
 "origin" "240.000000 896.000000 64.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 328
+// entity 324
 {
 "classname" "light"
 "origin" "384.000000 1248.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 329
+// entity 325
 {
 "classname" "light"
 "origin" "128.000000 1248.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 330
+// entity 326
 {
 "classname" "light"
 "origin" "-128.000000 1248.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 331
+// entity 327
 {
 "classname" "light"
 "origin" "608.000000 1152.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 332
+// entity 328
 {
 "classname" "light"
 "origin" "608.000000 896.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 333
+// entity 329
 {
 "classname" "light"
 "origin" "128.000000 800.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 334
+// entity 330
 {
 "classname" "light"
 "origin" "-128.000000 800.000000 32.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 335
+// entity 331
 {
 "classname" "light"
 "origin" "-544.000000 -936.000000 72.000000"
@@ -15883,14 +15945,14 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null7"
 }
-// entity 336
+// entity 332
 {
 "classname" "info_null"
 "origin" "-544.000000 -968.000000 144.000000"
 "targetname" "info_null7"
 "angle" "-90.000000"
 }
-// entity 337
+// entity 333
 {
 "classname" "light"
 "origin" "-544.000000 -1112.000000 72.000000"
@@ -15898,21 +15960,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null8"
 }
-// entity 338
+// entity 334
 {
 "classname" "info_null"
 "origin" "-544.000000 -1080.000000 144.000000"
 "targetname" "info_null8"
 "angle" "90.000008"
 }
-// entity 339
+// entity 335
 {
 "classname" "light"
 "origin" "-544.000000 -1024.000000 144.000000"
 "light" "128"
 "_color" "1 0.927962 0.703319"
 }
-// entity 340
+// entity 336
 {
 "classname" "light"
 "origin" "328.000000 176.000000 -456.000000"
@@ -15920,21 +15982,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null29"
 }
-// entity 341
+// entity 337
 {
 "classname" "info_null"
 "origin" "272.000000 176.000000 -392.000000"
 "targetname" "info_null29"
 "angle" "-90.000000"
 }
-// entity 342
+// entity 338
 {
 "classname" "light"
 "origin" "320.000000 176.000000 -448.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 343
+// entity 339
 {
 "classname" "light"
 "origin" "328.000000 336.000000 -456.000000"
@@ -15942,21 +16004,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null30"
 }
-// entity 344
+// entity 340
 {
 "classname" "info_null"
 "origin" "272.000000 336.000000 -392.000000"
 "targetname" "info_null30"
 "angle" "-90.000000"
 }
-// entity 345
+// entity 341
 {
 "classname" "light"
 "origin" "320.000000 336.000000 -448.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 346
+// entity 342
 {
 "classname" "light"
 "origin" "-176.000000 -264.000000 -456.000000"
@@ -15964,21 +16026,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null31"
 }
-// entity 347
+// entity 343
 {
 "classname" "info_null"
 "origin" "-176.000000 -208.000000 -392.000000"
 "targetname" "info_null31"
 "angle" "-179.999985"
 }
-// entity 348
+// entity 344
 {
 "classname" "light"
 "origin" "-176.000000 -256.000000 -448.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 349
+// entity 345
 {
 "classname" "light"
 "origin" "-336.000000 -264.000000 -456.000000"
@@ -15986,21 +16048,21 @@ exx/wall-metalrib01
 "_color" "1 0.927962 0.703319"
 "target" "info_null32"
 }
-// entity 350
+// entity 346
 {
 "classname" "info_null"
 "origin" "-336.000000 -208.000000 -392.000000"
 "targetname" "info_null32"
 "angle" "-179.999985"
 }
-// entity 351
+// entity 347
 {
 "classname" "light"
 "origin" "-336.000000 -256.000000 -448.000000"
 "light" "96"
 "_color" "1 0.927962 0.703319"
 }
-// entity 352
+// entity 348
 {
 "classname" "light"
 "origin" "-96.000000 1024.000000 288.000000"
@@ -16008,20 +16070,20 @@ exx/wall-metalrib01
 "target" "info_null33"
 "_color" "1 0.886091 0.622858"
 }
-// entity 353
+// entity 349
 {
 "classname" "info_null"
 "origin" "-96.000000 1024.000000 120.000000"
 "targetname" "info_null33"
 }
-// entity 354
+// entity 350
 {
 "classname" "light"
 "origin" "-96.000000 1024.000000 272.000000"
 "light" "25"
 "_color" "1 0.886091 0.622858"
 }
-// entity 355
+// entity 351
 {
 "classname" "light"
 "origin" "320.000000 1024.000000 288.000000"
@@ -16029,20 +16091,20 @@ exx/wall-metalrib01
 "target" "info_null34"
 "_color" "1 0.886091 0.622858"
 }
-// entity 356
+// entity 352
 {
 "classname" "info_null"
 "origin" "320.000000 1024.000000 120.000000"
 "targetname" "info_null34"
 }
-// entity 357
+// entity 353
 {
 "classname" "light"
 "origin" "320.000000 1024.000000 272.000000"
 "light" "25"
 "_color" "1 0.886091 0.622858"
 }
-// entity 358
+// entity 354
 {
 "classname" "light"
 "origin" "-192.000000 -1024.000000 232.000000"
@@ -16050,44 +16112,72 @@ exx/wall-metalrib01
 "light" "1280"
 "target" "info_null_light8"
 }
-// entity 359
+// entity 355
 {
 "classname" "info_null"
 "origin" "-192.000000 -1024.000000 136.000000"
 "targetname" "info_null_light8"
 }
-// entity 360
+// entity 356
 {
 "classname" "light"
 "origin" "-192.000000 -1024.000000 208.000000"
 "_color" "1 0.927962 0.703319"
 "light" "100"
 }
-// entity 361
+// entity 357
 {
 "classname" "light"
 "origin" "-1120.000000 -448.000000 -384.000000"
 "light" "160"
 "_color" "1 0.927962 0.703319"
 }
-// entity 362
+// entity 358
 {
 "classname" "light"
 "origin" "-1120.000000 -256.000000 -384.000000"
 "light" "160"
 "_color" "1 0.927962 0.703319"
 }
-// entity 363
+// entity 359
 {
 "classname" "light"
 "origin" "-1120.000000 256.000000 -384.000000"
 "light" "160"
 "_color" "1 0.927962 0.703319"
 }
-// entity 364
+// entity 360
 {
 "classname" "light"
 "origin" "-1120.000000 448.000000 -384.000000"
 "light" "160"
 "_color" "1 0.927962 0.703319"
 }
+// entity 361
+{
+"classname" "light"
+"origin" "1536.000000 0.000000 224.000000"
+"light" "1000"
+"target" "info_null36"
+"_color" "1 0.886091 0.622858"
+}
+// entity 362
+{
+"classname" "info_null"
+"origin" "1536.000000 0.000000 104.000000"
+"targetname" "info_null36"
+}
+// entity 363
+{
+"classname" "light"
+"origin" "1536.000000 0.000000 136.000000"
+"light" "16"
+"_color" "1 0.886091 0.622858"
+}
+// entity 364
+{
+"classname" "light"
+"origin" "1536.000000 0.000000 208.000000"
+"light" "16"
+"_color" "1 0.886091 0.622858"
+}

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 5fe332aa16708a59f7da987d754e849ff6611842..9c68a726435868889ada839029e3c43a6af5dbb5 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -504,6 +504,33 @@ textures/exx/floor-grate04
                blendfunc filter
        }
 }
+
+textures/exx/floor-grate04-cull
+{
+       qer_editorimage textures/exx/floor/floor_grate04.tga
+       surfaceparm trans
+       surfaceparm metalsteps
+       q3map_bounceScale  0.75
+       surfaceparm alphashadow
+       surfaceparm nomarks
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_grate04.tga
+            alphaFunc GT0
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+
 textures/exx/floor-metal02
 {
        qer_editorimage textures/exx/floor/floor_metal02.tga