Merge branch 'master' into cbrutail/darkzone

diff --git a/maps/afterslime.map.options b/maps/afterslime.map.options
index 3b7ad877e8257198def9581541f60e93a341634f..b0e408887b9003812a58af1562e77dc05d351386 100644 (file)
--- a/maps/afterslime.map.options
+++ b/maps/afterslime.map.options
@@ -2,5 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
+-nosRGB
 Version: 9
-

diff --git a/maps/courtfun.map.options b/maps/courtfun.map.options
index eb4f4e7029f6094ad5dcb9d0012ce1f45a61cb33..d993a5712bc8ad65e6743371a2ed314e94a5821d 100644 (file)
--- a/maps/courtfun.map.options
+++ b/maps/courtfun.map.options
@@ -2,4 +2,5 @@
 -light + -dirtscale 2 -bounce 8
 -vis +
 -minimap +
+-nosRGB
 Version: 4

diff --git a/maps/courtfun.mapinfo b/maps/courtfun.mapinfo
index 6318d5e4482877d93eb39df4920f1f7b1a7f8cf9..ead5dd2a58e3afdddbc59df9491b2585da4478fd 100644 (file)
--- a/maps/courtfun.mapinfo
+++ b/maps/courtfun.mapinfo
@@ -3,7 +3,7 @@ description A classic large scale CTF map
 author SavageX & Calinou
 cdtrack 9
 has weapons
-gametype ctf // defaults: timelimit=20 pointlimit=300 caplimit=10 leadlimit=0
+gametype ctf // defaults: timelimit=20 caplimit=10 leadlimit=0
 gametype rc
 gametype cts
 gametype ons

diff --git a/maps/dance.map.options b/maps/dance.map.options
index 404426d008c0aaa320ae3acc9428f3f6bad374f5..dad9ed35faa4bf962ea2d3fdf7243340e079eac7 100644 (file)
--- a/maps/dance.map.options
+++ b/maps/dance.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
+-nosRGB
 Version: 3

diff --git a/maps/g-23.map b/maps/g-23.map
index eb185eab82afb7ee7bd0941a2ff8039eb716026f..7519a7c65c65a2b998486b8bb0368a6c5cf60c3d 100644 (file)
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@ -1,7 +1,7 @@
 {
 "classname" "worldspawn"
 "message" "Loading Dock G-23 by Moo"
-"_floodlight" "255 215.952674035014 114.950374623747 1024 64"
+"_floodlight" "1 0.93 0.7 1024 64"
 "gridsize" "48 48 96"
 {
 ( 704 1344 256 ) ( 704 704 256 ) ( 640 768 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -1123,17 +1123,15 @@ exx/base-metal03
 ( -320 -320 64 ) ( -328 -328 -64 ) ( -320 -320 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -192 -384 -480 ) ( -320 -296 -480 ) ( -192 -296 -480 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0
-( -320 -288 -488 ) ( -192 -288 -504 ) ( -192 -288 -488 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0
+( -192 -384 -480 ) ( -320 -296 -480 ) ( -192 -296 -480 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 134217728 0 0
 ( -192 -336 -512 ) ( -192 -288 -488 ) ( -192 -288 -504 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -384 -512 ) ( -192 -296 -512 ) ( -320 -296 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -336 -480 ) ( -320 -288 -504 ) ( -320 -288 -488 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -192 -384 -512 ) ( -320 -384 -480 ) ( -192 -384 -480 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -192 -296 -480 ) ( -320 -288 -488 ) ( -192 -288 -488 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0
-( -320 -296 -512 ) ( -192 -288 -504 ) ( -320 -288 -504 ) exx/trim-psimple05 128 448 0 0.5 0.5 134217728 0 0
+( -64 -304 -480 ) ( -64 -304 -488 ) ( 64 -304 -480 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -192 -448 -448 ) ( -320 -384 -480 ) ( -192 -384 -480 ) exx/trim-psimple05 128 0 0 0.5 0.5 134217728 0 0
+( -192 -448 -448 ) ( -320 -384 -480 ) ( -192 -384 -480 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 134217728 0 0
 ( -192 -448 -448 ) ( -192 -384 -480 ) ( -192 -448 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -448 -512 ) ( -192 -448 -512 ) ( -320 -320 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -448 -512 ) ( -320 -448 -448 ) ( -192 -448 -512 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -1181,14 +1179,6 @@ exx/base-metal03
 ( 192 -960 -416 ) ( -192 -960 -416 ) ( -128 -896 -416 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -320 -512 -320 ) ( -320 -960 -320 ) ( -384 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -320 -512 -320 ) ( -320 -960 -448 ) ( -320 -960 -320 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( -320 -512 -448 ) ( -384 -896 -448 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( -320 -448 -416 ) ( -304 -944 -416 ) ( -320 -960 -416 ) exx/floor-wrn01 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -448 -416 ) ( -320 -960 -416 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 ( -320 -448 -448 ) ( -320 -960 -448 ) ( -304 -944 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
@@ -1205,14 +1195,6 @@ exx/base-metal03
 ( -208 -944 -448 ) ( -192 -960 -416 ) ( -192 -960 -448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -192 -512 -320 ) ( -128 -896 -320 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -192 -512 -448 ) ( -192 -960 -448 ) ( -128 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
-( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-}
-{
 ( 64 -960 -448 ) ( 192 -1088 -448 ) ( 64 -1088 -448 ) exx/floor-grate04 -0 0 0 0.5 0.5 134217728 0 0
 ( 64 -960 -392 ) ( 192 -960 -456 ) ( 192 -960 -392 ) common/nodraw 0 224 0 0.25 0.25 134217728 0 0
 ( 192 -960 -448 ) ( 192 -1088 -512 ) ( 192 -1088 -448 ) common/nodraw 0 0 0 0.25 0.25 134217728 0 0
@@ -1955,12 +1937,12 @@ exx/base-metal03
 ( 704 1344 32 ) ( 704 704 32 ) ( 640 768 32 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -63.4227600098 349.4939575195 -400 ) ( -112.4062652588 231.2373657227 -400 ) ( -181.6793823242 398.4773864746 -400 ) exx/panel-q201e 85.522277832 1.3617553711 67.5 0.2499999702 0.2499999702 134217728 0 0
-( -87.9145355225 290.3656616211 -240 ) ( -206.1710662842 339.3492126465 -240 ) ( -87.9145355225 290.3656616211 -528 ) exx/panel-q201e 131.3678894043 192 0 -0.2309698313 0.25 134217728 0 0
-( -119.4896392822 381.3767700195 -240 ) ( -119.4896392822 381.3767700195 -528 ) ( -168.4730834961 263.1201171875 -240 ) exx/panel-q201e 172.8045654297 192 0 0.2309701592 0.25 134217728 0 0
-( -223.2717895508 277.159362793 -464 ) ( -105.0151824951 228.1759185791 -464 ) ( -174.2883300781 395.416015625 -464 ) exx/panel-q201e 85.5236206055 1.3603515625 67.5 0.2500006258 0.2500003576 134217728 0 0
-( -230.6628723145 280.2208251953 -528 ) ( -230.6628723145 280.2208251953 -240 ) ( -112.4062652588 231.2373657227 -528 ) exx/panel-q201e 25.3301696777 192 0 -0.2309701443 0.25 134217728 0 0
-( -230.6628723145 280.2208251953 -528 ) ( -181.6793823242 398.4773864746 -528 ) ( -230.6628723145 280.2208251953 -240 ) exx/panel-q201e 66.7673339844 192 0 0.2309703827 0.25 134217728 0 0
+( -52.426864624 289.0081787109 -420 ) ( -143.4293518066 198.9940032959 -420 ) ( -142.441116333 380.0106201172 -420 ) exx/panel-q201e 104.1297149658 201.3624267578 44.6871986389 0.2500004768 0.2500001192 134217728 0 0
+( -97.9281311035 244.0011138916 -260 ) ( -187.9422454834 335.0036010742 -260 ) ( -97.9281311035 244.0011138916 -548 ) exx/panel-q201e 163.1962890625 112 0 0.1777392626 0.25 134217728 0 0
+( -91.7463531494 340.1353759766 -260 ) ( -91.7463531494 340.1353759766 -548 ) ( -182.7487945557 250.12109375 -260 ) exx/panel-q201e 36.1849365234 112 0 0.177739203 0.25 134217728 0 0
+( -227.8176422119 284.3087768555 -484 ) ( -137.8034057617 193.306350708 -484 ) ( -136.8151855469 374.323059082 -484 ) exx/panel-q201e 104.129699707 201.3624267578 44.6871986389 0.250000447 0.2500001192 134217728 0 0
+( -233.443572998 289.9964599609 -548 ) ( -233.443572998 289.9964599609 -260 ) ( -143.4293518066 198.9940032959 -548 ) exx/panel-q201e 160.4155273438 112 0 0.1777391434 0.25 134217728 0 0
+( -233.443572998 289.9964599609 -548 ) ( -142.441116333 380.0106201172 -548 ) ( -233.443572998 289.9964599609 -260 ) exx/panel-q201e 33.4028320312 112 0 0.177739501 0.25 134217728 0 0
 }
 {
 ( 768 184 -448 ) ( 520 328 -448 ) ( 768 328 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
@@ -2078,20 +2060,12 @@ exx/base-metal03
 ( -272 1344 0 ) ( -288 1216 8 ) ( -272 1216 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 704 -192 64 ) ( 704 -256 64 ) ( 704 -192 -64 ) exx/trim-psimple05 0 0 0 0.25 0.25 134217728 0 0
-( 704 -192 64 ) ( 704 -192 -64 ) ( 768 -192 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
-( 744 -256 -448 ) ( 744 -192 -448 ) ( 680 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 768 -256 -64 ) ( 768 -256 64 ) ( 768 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 768 -256 -64 ) ( 704 -256 -64 ) ( 768 -256 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
-( 768 -896 -64 ) ( 752 -896 -48 ) ( 768 -768 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 576 -384 64 ) ( 512 -384 64 ) ( 576 -384 -64 ) exx/trim-psimple05 0 0 0 0.25 0.25 134217728 0 0
-( 576 -384 64 ) ( 576 -384 -64 ) ( 576 -448 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
-( 512 -424 -448 ) ( 576 -424 -448 ) ( 512 -360 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 576 -384 64 ) ( 512 -384 64 ) ( 576 -384 -64 ) exx/floor-tile03 168 0 0 0.125 0.25 134217728 0 0
+( 512 -424 -448 ) ( 576 -424 -448 ) ( 512 -360 -448 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
 ( 512 -448 -64 ) ( 512 -448 64 ) ( 576 -448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 512 -448 -64 ) ( 512 -384 -64 ) ( 512 -448 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
-( -128 -448 -64 ) ( -128 -432 -48 ) ( 0 -448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -448 -64 ) ( 512 -384 -64 ) ( 512 -448 64 ) exx/floor-tile03 -0 0 0 -0.25 0.25 134217728 0 0
+( -128 -448 -64 ) ( -128 -432 -48 ) ( 0 -448 -64 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
+( 520 -400 -64 ) ( 520 -416 -64 ) ( 520 -400 64 ) exx/base-metal07rust 256 0 0 -0.25 0.25 134217728 0 0
 }
 {
 ( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01-phoenix 256 0 -90 0.25 0.25 0 0 0
@@ -2118,24 +2092,6 @@ exx/base-metal03
 ( 528 64 8 ) ( 512 64 0 ) ( 528 -64 8 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
 }
 {
-( 712 -184 0 ) ( 520 -184 0 ) ( 712 -184 -448 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
-( 512 -384 -448 ) ( 704 -384 -448 ) ( 512 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 504 -384 -448 ) ( 504 -256 -448 ) ( 504 -384 0 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
-( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
-( 544 128 -432 ) ( 576 128 -432 ) ( 544 0 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 584 -184 -64 ) ( 584 -208 -64 ) ( 584 -184 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
-( 576 -264 -64 ) ( 560 -264 -64 ) ( 576 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 696 -256 -424 ) ( 696 -384 -424 ) ( 504 -256 -424 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( 712 -184 0 ) ( 520 -184 0 ) ( 712 -184 -448 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 504 -384 -448 ) ( 504 -256 -448 ) ( 504 -384 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 544 0 -432 ) ( 576 128 -432 ) ( 544 128 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 584 -184 -64 ) ( 584 -208 -64 ) ( 584 -184 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 576 -264 -64 ) ( 560 -264 -64 ) ( 576 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-}
-{
 ( -384 -768 256 ) ( -448 -1344 256 ) ( -448 -704 256 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -384 -1280 192 ) ( -384 -768 256 ) ( -384 -768 192 ) exx/trim-baseboard 0 0 0 0.25 0.25 0 0 0
 ( -384 -1280 192 ) ( -448 -704 192 ) ( -448 -1344 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -4453,10 +4409,10 @@ exx/base-metal03
 }
 {
 ( -192 -448 -512 ) ( -320 -960 -512 ) ( -192 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -320 -448 -448 ) ( -192 -960 -448 ) ( -320 -960 -448 ) exx/trim-psimple05 128 0 0 0.5 0.5 0 0 0
+( -320 -448 -448 ) ( -192 -960 -448 ) ( -320 -960 -448 ) map_g-23/conveyor_belt 128 120 180 0.5 0.5 0 0 0
 ( -512 -448 -448 ) ( 768 -448 -512 ) ( 768 -448 -448 ) common/caulk 0 0 180 0.25 0.25 0 0 0
 ( -320 -448 -512 ) ( -320 -960 -448 ) ( -320 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -192 -960 -448 ) ( -320 -960 -512 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -950 -448 ) ( -320 -950 -512 ) ( -320 -950 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -192 -448 -448 ) ( -192 -960 -512 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -5756,14 +5712,6 @@ exx/floor-simplines
 ( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
 ( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 768 -448 -448 ) ( 392 -448 -512 ) ( 392 -448 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
-( 584 -192 -64 ) ( 640 -192 -64 ) ( 584 -192 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-}
-{
-( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
-( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 768 184 -512 ) ( 392 184 -448 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 480 64 64 ) ( 504 64 -64 ) ( 480 64 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -5969,12 +5917,12 @@ exx/floor-simplines
 ( -64 520 -480 ) ( -64 544 -480 ) ( 64 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 0 768 -552 ) ( 32 768 -488 ) ( 0 768 -488 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 32 448 -480 ) ( 32 512 -544 ) ( 32 448 -544 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( -64 512 -512 ) ( 64 504 -512 ) ( 64 512 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -64 448 -512 ) ( 64 464 -504 ) ( 64 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
-( -64 520 -480 ) ( 64 544 -480 ) ( 64 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
-( -32 448 -544 ) ( -32 512 -544 ) ( -32 448 -480 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( -32 768 -552 ) ( 0 768 -488 ) ( -32 768 -488 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -96 512 -512 ) ( 32 504 -512 ) ( 32 512 -512 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -96 448 -512 ) ( 32 464 -504 ) ( 32 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
+( -96 520 -480 ) ( 32 544 -480 ) ( 32 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
+( -64 448 -544 ) ( -64 512 -544 ) ( -64 448 -480 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( -32 544 -64 ) ( -32 528 -64 ) ( -32 544 64 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 1280 -1152 192 ) ( 1280 -1160 192 ) ( 1216 -1152 192 ) common/full_clip 0 0 0 0.25 0.25 134217728 0 0
@@ -8563,7 +8511,7 @@ exx/base-metal03
 }
 {
 ( -704 -960 -512 ) ( -768 -1088 -512 ) ( -704 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( -704 -960 -448 ) ( -704 -1088 -448 ) ( -768 -1088 -448 ) exx/trim-psimple05 128 512 90 0.5 0.5 0 0 0
+( -704 -960 -448 ) ( -704 -1088 -448 ) ( -768 -1088 -448 ) map_g-23/conveyor_belt 128 512 90 0.5 0.5 0 0 0
 ( -704 -1088 -448 ) ( -768 -1088 -512 ) ( -768 -1088 -448 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 ( -704 -960 -512 ) ( -768 -960 -448 ) ( -768 -960 -512 ) exx/wall-bigrib02 0 0 0 0.25 0.25 0 0 0
 ( -704 -960 -448 ) ( -704 -1088 -512 ) ( -704 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -8571,10 +8519,10 @@ exx/base-metal03
 }
 {
 ( -768 -960 -512 ) ( -832 -1088 -512 ) ( -768 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
-( -832 -960 -448 ) ( -768 -1088 -448 ) ( -832 -1088 -448 ) exx/trim-psimple05 128 512 90 0.5 0.5 0 0 0
+( -832 -960 -448 ) ( -768 -1088 -448 ) ( -832 -1088 -448 ) map_g-23/conveyor_belt 128 512 90 0.5 0.5 0 0 0
 ( -832 -1088 -512 ) ( -768 -1088 -448 ) ( -768 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -832 -960 -448 ) ( -768 -960 -512 ) ( -768 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -832 -960 -448 ) ( -832 -1088 -448 ) ( -832 -1088 -512 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0
+( -814 -960 -448 ) ( -814 -1088 -448 ) ( -814 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -768 -960 -448 ) ( -768 -1088 -512 ) ( -768 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -9339,10 +9287,10 @@ exx/base-metal03
 }
 {
 ( -704 -960 -512 ) ( 64 -1088 -512 ) ( 64 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -704 -1088 -448 ) ( 64 -960 -448 ) ( 64 -1088 -448 ) exx/trim-psimple05 128 0 90 0.5 0.5 0 0 0
-( -704 -960 -448 ) ( 64 -960 -512 ) ( 64 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -704 -1088 -448 ) ( 64 -960 -448 ) ( 64 -1088 -448 ) map_g-23/conveyor_belt 128 0 90 0.5 0.5 0 0 0
+( -704 -960 -448 ) ( 64 -960 -512 ) ( 64 -960 -448 ) map_g-23/conveyor_belt 128 0 90 0.5 0.5 0 0 0
 ( -704 -1088 -448 ) ( 64 -1088 -448 ) ( 64 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 64 -960 -448 ) ( 64 -1088 -512 ) ( 64 -1088 -448 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0
+( 46 -960 -448 ) ( 46 -1088 -512 ) ( 46 -1088 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -704 -960 -512 ) ( -704 -1088 -448 ) ( -704 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
@@ -11965,12 +11913,378 @@ exx/wall-metalrib01
 ( 1280 -1184 -64 ) ( 1280 -1192 -64 ) ( 1280 -1184 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 1224 -1184 64 ) ( 1232 -1184 -64 ) ( 1224 -1184 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
+{
+( 32 768 -552 ) ( 64 768 -488 ) ( 32 768 -488 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( 64 448 -480 ) ( 64 512 -544 ) ( 64 448 -544 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( -32 512 -512 ) ( 96 504 -512 ) ( 96 512 -512 ) common/caulk 128 0 0 0.25 0.25 0 0 0
+( -32 448 -512 ) ( 96 464 -504 ) ( 96 448 -512 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
+( -32 520 -480 ) ( 96 544 -480 ) ( 96 520 -480 ) exx/trim-psimple04 0 0 0 0.25 0.25 0 0 0
+( 32 544 64 ) ( 32 528 -64 ) ( 32 544 -64 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+map_g-23/conveyor_belt
+( 3 3 0 0 0 )
+(
+( ( -814 -1088 -448 0 -0.1796875 ) ( -834 -1088 -464 0 -0.3046875 ) ( -814 -1088 -480 0 -0.4296875 ) )
+( ( -814 -1024 -448 0.5 -0.1796875 ) ( -834 -1024 -464 0.5 -0.3046875 ) ( -814 -1024 -480 0.5 -0.4296875 ) )
+( ( -814 -960 -448 1 -0.1796875 ) ( -834 -960 -464 1 -0.3046875 ) ( -814 -960 -480 1 -0.4296875 ) )
+)
+}
+}
+{
+patchDef2
+{
+map_g-23/conveyor_belt
+( 3 3 0 0 0 )
+(
+( ( -192 -304 -512 0 0.296875 ) ( -192 -284 -496 0 0.171875 ) ( -192 -304 -480 0 0.046875 ) )
+( ( -256 -304 -512 0.5 0.296875 ) ( -256 -284 -496 0.5 0.171875 ) ( -256 -304 -480 0.5 0.046875 ) )
+( ( -320 -304 -512 1 0.296875 ) ( -320 -284 -496 1 0.171875 ) ( -320 -304 -480 1 0.046875 ) )
+)
+}
+}
+{
+( -192 -950 -480 ) ( -192 -960 -480 ) ( -320 -950 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -950 -448 ) ( -320 -950 -448 ) ( -192 -950 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -950 -448 ) ( -192 -950 -512 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -960 -512 ) ( -192 -960 -512 ) ( -320 -950 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -960 -512 ) ( -320 -960 -448 ) ( -192 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -960 -512 ) ( -320 -950 -512 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -320 -512 -320 ) ( -320 -960 -320 ) ( -384 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0
+( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -64 -448 ) ( -160 64 -448 ) ( -192 64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -192 -512 -320 ) ( -128 -896 -320 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 0 0 0.25 0.25 0 0 0
+( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -64 -448 ) ( -160 64 -448 ) ( -192 64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -192 -512 -480 ) ( -192 -960 -480 ) ( -128 -896 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0
+( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -304 -928 -64 ) ( -288 -928 -64 ) ( -304 -928 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) exx/base-metal03 0 384 0 0.25 0.25 0 0 0
+( -320 -512 -480 ) ( -384 -896 -480 ) ( -320 -960 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -304 -928 -64 ) ( -288 -928 -64 ) ( -304 -928 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -320 -512 -384 ) ( -384 -512 -384 ) ( -320 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -320 -512 -352 ) ( -320 -960 -480 ) ( -320 -960 -352 ) common/caulk 0 384 0 0.25 0.25 0 0 0
+( -320 -512 -480 ) ( -384 -896 -480 ) ( -320 -960 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -384 -512 -448 ) ( -384 -896 -320 ) ( -384 -896 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -384 -896 -320 ) ( -320 -960 -320 ) ( -320 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -304 -928 64 ) ( -288 -928 -64 ) ( -304 -928 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -128 -512 -384 ) ( -192 -512 -384 ) ( -128 -512 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -128 -512 -320 ) ( -128 -896 -448 ) ( -128 -896 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -512 -480 ) ( -192 -960 -480 ) ( -128 -896 -480 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 -512 -448 ) ( -192 -960 -320 ) ( -192 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -128 -896 -320 ) ( -192 -960 -448 ) ( -192 -960 -320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -192 64 -448 ) ( -160 64 -448 ) ( -192 -64 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( -304 -928 64 ) ( -288 -928 -64 ) ( -304 -928 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( -832 -1088 -448 ) ( -832 -1064 -448 ) ( -824 -1088 -448 ) exx/trim-vert01 -0 256 180 0.25 0.25 0 0 0
+( -832 -1088 -448 ) ( -824 -1088 -448 ) ( -832 -1088 -456 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -832 -1088 -448 ) ( -832 -1088 -456 ) ( -832 -1064 -448 ) exx/floor-tile03 0 0 0 -0.25 0.25 0 0 0
+( -824 -1064 -512 ) ( -832 -1064 -512 ) ( -824 -1088 -512 ) common/caulk 256 0 180 0.25 0.25 0 0 0
+( -824 -960 -456 ) ( -824 -960 -448 ) ( -832 -960 -456 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( -824 -1064 -456 ) ( -824 -1088 -456 ) ( -824 -1064 -448 ) exx/base-metal01 0 0 0 -0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+map_g-23/conveyor_belt
+( 3 3 0 0 0 )
+(
+( ( -192 -950 -448 0 0.5234375 ) ( -192 -970 -464 0 0.3984375 ) ( -192 -950 -480 0 0.2734375 ) )
+( ( -256 -950 -448 0.5 0.5234375 ) ( -256 -970 -464 0.5 0.3984375 ) ( -256 -950 -480 0.5 0.2734375 ) )
+( ( -320 -950 -448 1 0.5234375 ) ( -320 -970 -464 1 0.3984375 ) ( -320 -950 -480 1 0.2734375 ) )
+)
+}
+}
+{
+( 56 -1088 -448 ) ( 56 -1096 -448 ) ( 40 -1088 -448 ) common/caulk 0 224 0 0.25 0.25 0 0 0
+( 56 -1088 -448 ) ( 40 -1088 -448 ) ( 56 -1088 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 56 -1088 -448 ) ( 56 -1088 -512 ) ( 56 -1096 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 40 -1096 -512 ) ( 56 -1096 -512 ) ( 40 -1088 -512 ) common/caulk 0 224 0 0.25 0.25 0 0 0
+( 40 -1096 -512 ) ( 40 -1096 -448 ) ( 56 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -1096 -512 ) ( 40 -1088 -512 ) ( 40 -1096 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+}
+{
+( 56 -952 -448 ) ( 56 -960 -448 ) ( 40 -952 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 56 -952 -448 ) ( 40 -952 -448 ) ( 56 -952 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 56 -952 -448 ) ( 56 -952 -512 ) ( 56 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -960 -512 ) ( 56 -960 -512 ) ( 40 -952 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -960 -512 ) ( 40 -960 -448 ) ( 56 -960 -512 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+( 40 -960 -512 ) ( 40 -952 -512 ) ( 40 -960 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 56 -1088 -512 ) ( 56 -1096 -512 ) ( 40 -1088 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 64 -960 -512 ) ( 48 -960 -512 ) ( 64 -960 -520 ) common/caulk 224 0 0 0.25 0.25 0 0 0
+( 56 -1088 -512 ) ( 56 -1088 -520 ) ( 56 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -1096 -520 ) ( 56 -1096 -520 ) ( 40 -1088 -520 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -1088 -520 ) ( 40 -1088 -512 ) ( 56 -1088 -520 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 40 -1096 -520 ) ( 40 -1088 -520 ) ( 40 -1096 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+patchDef2
+{
+map_g-23/conveyor_belt
+( 3 3 0 0 0 )
+(
+( ( 46 -1088 -480 0 1.4296875 ) ( 66 -1088 -464 0 1.3046875 ) ( 46 -1088 -448 0 1.1796875 ) )
+( ( 46 -1024 -480 0.5 1.4296875 ) ( 66 -1024 -464 0.5 1.3046875 ) ( 46 -1024 -448 0.5 1.1796875 ) )
+( ( 46 -960 -480 1 1.4296875 ) ( 66 -960 -464 1 1.3046875 ) ( 46 -960 -448 1 1.1796875 ) )
+)
+}
+}
+{
+( 64 -960 -448 ) ( 64 -984 -448 ) ( 56 -960 -448 ) exx/trim-vert01 -0 256 0 0.25 0.25 0 0 0
+( 64 -960 -448 ) ( 56 -960 -448 ) ( 64 -960 -456 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 64 -960 -448 ) ( 64 -960 -456 ) ( 64 -984 -448 ) exx/floor-tile03 0 0 0 0.25 0.25 0 0 0
+( 56 -984 -512 ) ( 64 -984 -512 ) ( 56 -960 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 56 -1088 -456 ) ( 56 -1088 -448 ) ( 64 -1088 -456 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 56 -984 -456 ) ( 56 -960 -456 ) ( 56 -984 -448 ) exx/base-metal01 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 576 -384 64 ) ( 512 -384 64 ) ( 576 -384 -64 ) exx/floor-tile03 232 0 0 0.125 0.25 134217728 0 0
+( 576 -384 64 ) ( 576 -384 -64 ) ( 576 -448 64 ) exx/floor-tile03 -0 0 0 -0.25 0.25 134217728 0 0
+( 512 -424 -448 ) ( 576 -424 -448 ) ( 512 -360 -448 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
+( 512 -448 -64 ) ( 512 -448 64 ) ( 576 -448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -128 -448 -64 ) ( -128 -432 -48 ) ( 0 -448 -64 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
+( 568 -400 64 ) ( 568 -424 -64 ) ( 568 -400 -64 ) exx/base-metal07rust 256 0 0 -0.25 0.25 134217728 0 0
+}
+{
+( 576 -392 64 ) ( 512 -392 64 ) ( 576 -392 -64 ) exx/trim-psimple05 0 0 0 0.25 0.25 134217728 0 0
+( 512 -424 -448 ) ( 576 -424 -448 ) ( 512 -360 -448 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
+( 512 -448 -64 ) ( 512 -448 64 ) ( 576 -448 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -128 -448 -64 ) ( -128 -432 -48 ) ( 0 -448 -64 ) common/caulk -0 256 -90 0.25 0.25 134217728 0 0
+( 568 -400 -64 ) ( 568 -424 -64 ) ( 568 -400 64 ) common/caulk -0 0 0 -0.25 0.25 134217728 0 0
+( 520 -400 64 ) ( 520 -416 -64 ) ( 520 -400 -64 ) common/caulk -0 0 0 -0.25 0.25 134217728 0 0
+}
+{
+( 712 -192 64 ) ( 712 -256 64 ) ( 712 -192 -64 ) exx/trim-psimple05 0 0 0 0.25 0.25 134217728 0 0
+( 744 -256 -448 ) ( 744 -192 -448 ) ( 680 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -256 -64 ) ( 768 -256 64 ) ( 768 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -896 -64 ) ( 752 -896 -48 ) ( 768 -768 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 720 -200 -64 ) ( 744 -200 -64 ) ( 720 -200 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 720 -248 64 ) ( 736 -248 -64 ) ( 720 -248 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 704 -192 64 ) ( 704 -256 64 ) ( 704 -192 -64 ) exx/floor-tile03 168 0 0 0.125 0.25 134217728 0 0
+( 744 -256 -448 ) ( 744 -192 -448 ) ( 680 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -256 -64 ) ( 768 -256 64 ) ( 768 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -256 -64 ) ( 704 -256 -64 ) ( 768 -256 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
+( 768 -896 -64 ) ( 752 -896 -48 ) ( 768 -768 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 720 -248 -64 ) ( 736 -248 -64 ) ( 720 -248 64 ) exx/base-metal07rust 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 704 -192 64 ) ( 704 -256 64 ) ( 704 -192 -64 ) exx/floor-tile03 232 0 0 0.125 0.25 134217728 0 0
+( 704 -192 64 ) ( 704 -192 -64 ) ( 768 -192 64 ) exx/floor-tile03 0 0 0 0.25 0.25 134217728 0 0
+( 744 -256 -448 ) ( 744 -192 -448 ) ( 680 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -256 -64 ) ( 768 -256 64 ) ( 768 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 768 -896 -64 ) ( 752 -896 -48 ) ( 768 -768 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 720 -200 64 ) ( 744 -200 -64 ) ( 720 -200 -64 ) exx/base-metal07rust 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 712 -200 -8 ) ( 712 -248 -8 ) ( 704 -200 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 712 -200 -8 ) ( 704 -200 -8 ) ( 712 -200 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 712 -200 -8 ) ( 712 -200 -448 ) ( 712 -248 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 704 -248 -448 ) ( 712 -248 -448 ) ( 704 -200 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 704 -248 -448 ) ( 704 -248 -8 ) ( 712 -248 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 704 -248 -448 ) ( 704 -200 -448 ) ( 704 -248 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 568 -384 -8 ) ( 568 -392 -8 ) ( 520 -384 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 568 -384 -8 ) ( 520 -384 -8 ) ( 568 -384 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 568 -384 -8 ) ( 568 -384 -448 ) ( 568 -392 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 520 -392 -448 ) ( 568 -392 -448 ) ( 520 -384 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 520 -392 -448 ) ( 520 -392 -8 ) ( 568 -392 -448 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 520 -392 -448 ) ( 520 -384 -448 ) ( 520 -392 -8 ) common/clip 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -200 -64 ) ( 664 -200 -64 ) ( 648 -200 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 656 -248 64 ) ( 664 -248 -64 ) ( 656 -248 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 712 -384 -448 ) ( 712 -192 -512 ) ( 712 -192 -448 ) exx/trim-psimple05 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -200 -64 ) ( 664 -200 -64 ) ( 648 -200 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 656 -248 64 ) ( 664 -248 -64 ) ( 656 -248 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -208 64 ) ( 648 -224 -64 ) ( 648 -208 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 712 -64 -512 ) ( 704 64 -504 ) ( 712 64 -512 ) exx/wall-panel05 42.6665039062 448 90 0.1875 0.125 0 0 0
+}
+{
+( 648 -200 -448 ) ( 640 -256 -448 ) ( 640 -192 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 640 -192 -512 ) ( 640 -256 -512 ) ( 648 -200 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -200 -448 ) ( 640 -192 -448 ) ( 640 -192 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -248 -448 ) ( 640 -256 -512 ) ( 640 -256 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 648 -208 -64 ) ( 648 -224 -64 ) ( 648 -208 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 640 -192 -512 ) ( 640 -256 -448 ) ( 640 -256 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -256 -448 ) ( 648 -248 -448 ) ( 768 -248 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -256 -512 ) ( 648 -248 -512 ) ( 640 -256 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -248 -512 ) ( 648 -248 -448 ) ( 648 -248 -512 ) exx/base-metal07rust 0 0 0 0.25 0.25 0 0 0
+( 640 -256 64 ) ( 648 -256 -64 ) ( 640 -256 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 640 -256 -448 ) ( 648 -248 -512 ) ( 648 -248 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -192 -448 ) ( 648 -200 -448 ) ( 640 -192 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -192 -512 ) ( 648 -200 -512 ) ( 768 -200 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 584 -192 -64 ) ( 640 -192 -64 ) ( 584 -192 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -200 -448 ) ( 648 -200 -512 ) ( 648 -200 -448 ) exx/base-metal07rust 0 0 0 0.25 0.25 0 0 0
+( 640 -192 -512 ) ( 648 -200 -448 ) ( 648 -200 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 584 -192 -64 ) ( 640 -192 -64 ) ( 584 -192 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 640 -184 -64 ) ( 640 -200 -64 ) ( 640 -184 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 640 -256 64 ) ( 648 -256 -64 ) ( 640 -256 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 576 -448 -448 ) ( 568 -328 -448 ) ( 576 -320 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 576 -448 -512 ) ( 568 -328 -512 ) ( 568 -448 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 392 -448 -512 ) ( 392 -448 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 568 -448 -448 ) ( 568 -328 -512 ) ( 568 -328 -448 ) exx/base-metal07rust 256 0 0 -0.25 0.25 0 0 0
+( 576 -320 -512 ) ( 568 -328 -448 ) ( 568 -328 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -328 -64 ) ( 576 -336 -64 ) ( 576 -328 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 392 -448 -512 ) ( 392 -448 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 568 -392 -448 ) ( 568 -328 -448 ) ( 568 -392 -512 ) exx/trim-baseboard02 265.7627563477 35.4921417236 45 0.25 0.25 0 0 0
+( 384 -392 -448 ) ( 576 -392 -512 ) ( 576 -392 -448 ) exx/trim-psimple05 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -392 -448 ) ( 576 -392 -512 ) ( 384 -392 -448 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 512 -328 -64 ) ( 512 -336 -64 ) ( 512 -328 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 -320 -64 ) ( 520 -320 -64 ) ( 512 -320 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 568 -392 -448 ) ( 568 -328 -448 ) ( 568 -392 -512 ) exx/trim-baseboard02 265.7627563477 35.4921417236 45 0.25 0.25 0 0 0
+( 520 -328 -504 ) ( 520 -328 -440 ) ( 520 -392 -504 ) exx/trim-baseboard02 265.7627563477 35.4921417236 45 0.25 0.25 0 0 0
+( 704 -392 -512 ) ( 832 -384 -504 ) ( 832 -392 -512 ) exx/wall-panel05 42.6665039062 448 0 0.1875 0.125 0 0 0
+( 544 -328 -64 ) ( 552 -328 -64 ) ( 544 -328 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 512 -392 -448 ) ( 520 -328 -448 ) ( 520 -392 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 512 -392 -512 ) ( 520 -328 -512 ) ( 512 -320 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -392 -448 ) ( 576 -392 -512 ) ( 384 -392 -448 ) common/caulk 0 -0 0 0.25 0.25 0 0 0
+( 520 -392 -448 ) ( 520 -328 -448 ) ( 520 -328 -512 ) exx/base-metal07rust 256 0 0 -0.25 0.25 0 0 0
+( 512 -328 64 ) ( 512 -336 -64 ) ( 512 -328 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 512 -320 -448 ) ( 520 -328 -512 ) ( 520 -328 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 392 -448 -512 ) ( 392 -448 -448 ) common/caulk 32 0 0 0.25 0.25 0 0 0
+( 576 -320 -64 ) ( 584 -320 -64 ) ( 576 -320 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -328 64 ) ( 576 -336 -64 ) ( 576 -328 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 768 -448 -448 ) ( 392 184 -448 ) ( 768 184 -448 ) exx/floor-crete01 256 0 -90 0.25 0.25 0 0 0
+( 392 -448 -512 ) ( 768 184 -512 ) ( 392 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 640 -256 -64 ) ( 648 -256 -64 ) ( 640 -256 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 576 -320 64 ) ( 584 -320 -64 ) ( 576 -320 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 768 -448 -448 ) ( 768 184 -448 ) ( 768 184 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 392 -448 -448 ) ( 392 184 -512 ) ( 392 184 -448 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 568 -328 -448 ) ( 512 -320 -448 ) ( 576 -320 -448 ) exx/floor-wrn01 256 0 -90 0.25 0.25 0 0 0
+( 576 -320 -512 ) ( 512 -320 -512 ) ( 568 -328 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 568 -328 -512 ) ( 576 -320 -448 ) ( 576 -320 -512 ) exx/trim-baseboard02 265.7627563477 35.4921417236 45 0.25 0.25 0 0 0
+( 520 -328 -448 ) ( 512 -320 -512 ) ( 512 -320 -448 ) exx/trim-baseboard02 265.7627563477 35.4921417236 45 0.25 0.25 0 0 0
+( 576 -320 -512 ) ( 512 -320 -448 ) ( 512 -320 -512 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+( 544 -328 64 ) ( 552 -328 -64 ) ( 544 -328 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 712 -184 0 ) ( 520 -184 0 ) ( 712 -184 -448 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 512 -384 -448 ) ( 704 -384 -448 ) ( 512 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 544 128 -432 ) ( 576 128 -432 ) ( 544 0 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 584 -184 -64 ) ( 584 -208 -64 ) ( 584 -184 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 552 -192 64 ) ( 560 -192 -64 ) ( 552 -192 -64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 512 -384 -448 ) ( 704 -384 -448 ) ( 512 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 544 128 -432 ) ( 576 128 -432 ) ( 544 0 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 552 -192 -64 ) ( 560 -192 -64 ) ( 552 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 544 -192 -64 ) ( 512 -224 -64 ) ( 544 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 64 ) ( 512 -232 -64 ) ( 512 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 696 -256 -424 ) ( 696 -384 -424 ) ( 504 -256 -424 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 544 0 -432 ) ( 576 128 -432 ) ( 544 128 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 552 -192 -64 ) ( 560 -192 -64 ) ( 552 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 544 -192 -64 ) ( 512 -224 -64 ) ( 544 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 64 ) ( 512 -232 -64 ) ( 512 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 696 -256 -424 ) ( 696 -384 -424 ) ( 504 -256 -424 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
+( 504 -384 -448 ) ( 504 -256 -448 ) ( 504 -384 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 544 0 -432 ) ( 576 128 -432 ) ( 544 128 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 -64 ) ( 512 -232 -64 ) ( 512 -224 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 576 -264 -64 ) ( 560 -264 -64 ) ( 576 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 512 -384 -448 ) ( 704 -384 -448 ) ( 512 -256 -448 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 504 -384 -448 ) ( 504 -256 -448 ) ( 504 -384 0 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 544 128 -432 ) ( 576 128 -432 ) ( 544 0 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 -64 ) ( 512 -232 -64 ) ( 512 -224 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+( 576 -264 -64 ) ( 560 -264 -64 ) ( 576 -264 64 ) exx/trim-simple03 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 696 -256 -424 ) ( 696 -384 -424 ) ( 504 -256 -424 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
+( 712 -184 0 ) ( 520 -184 0 ) ( 712 -184 -448 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 464 -264 -64 ) ( 472 -256 -64 ) ( 464 -264 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 544 0 -432 ) ( 576 128 -432 ) ( 544 128 -432 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 552 -192 64 ) ( 560 -192 -64 ) ( 552 -192 -64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 584 -184 -64 ) ( 584 -208 -64 ) ( 584 -184 64 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+}
 }
 {
 "classname" "light"
 "origin" "1448.000000 -608.000000 72.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null1"
 }
 {
@@ -11998,19 +12312,19 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-256.000000 336.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "512.000000 336.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-256.000000 -336.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12023,7 +12337,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-400.000000 -192.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12036,14 +12350,14 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 0.000000 280.000000"
 "light" "1280"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null_mainroom"
 }
 {
 "classname" "light"
 "origin" "728.000000 -408.000000 -312.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12077,7 +12391,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "128.000000 -336.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12090,13 +12404,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-400.000000 192.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "656.000000 192.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12130,93 +12444,15 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "128.000000 336.000000 96.000000"
 "light" "384"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
-"origin" "63.941071 649.941101 -479.999847"
+"origin" "79.941071 649.941101 -479.999847"
 "model" "models/map/forklift.md3"
 "angle" "90.000000"
 "spawnflags" "2"
-}
-{
-"classname" "func_plat"
-"speed" "300"
-"sound1" "sound/machines/Elevator_Up.wav"
-{
-( 576 -192 0 ) ( 576 -256 0 ) ( 512 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 576 -192 -32 ) ( 512 -192 -32 ) ( 576 -192 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
-( 576 -192 -32 ) ( 576 -192 -64 ) ( 576 -256 -32 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
-( 536 -256 -424 ) ( 600 -256 -424 ) ( 536 -192 -424 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 512 -256 -64 ) ( 512 -256 -32 ) ( 576 -256 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -256 -64 ) ( 512 -192 -64 ) ( 512 -256 -32 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -224 -96 ) ( 520 -216 -96 ) ( 512 -224 32 ) exx/trim-psimple04 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 576 -384 0 ) ( 384 -384 0 ) ( 576 -320 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 576 -384 0 ) ( 576 -320 0 ) ( 576 -384 -64 ) exx/trim-baseboard02 0 0 45 0.25 0.25 134217728 0 0
-( 576 -384 0 ) ( 576 -384 -64 ) ( 384 -384 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 512 -320 -56 ) ( 512 -320 8 ) ( 512 -384 -56 ) exx/trim-baseboard02 0 0 45 0.25 0.25 134217728 0 0
-( 832 -384 -64 ) ( 832 -376 -56 ) ( 704 -384 -64 ) exx/trim-psimple05 0 0 0 0.25 0.25 134217728 0 0
-( 832 -352 0 ) ( 832 -360 -8 ) ( 704 -352 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 704 -192 0 ) ( 704 -384 0 ) ( 640 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 704 -192 0 ) ( 640 -192 0 ) ( 704 -192 -64 ) exx/trim-baseboard02 0 0 -45 0.25 0.25 134217728 0 0
-( 704 -192 0 ) ( 704 -192 -64 ) ( 704 -384 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 640 -256 -56 ) ( 640 -256 8 ) ( 704 -256 -56 ) exx/trim-baseboard02 0 0 -45 0.25 0.25 134217728 0 0
-( 704 64 -64 ) ( 696 64 -56 ) ( 704 -64 -64 ) exx/trim-psimple05 0 0 90 0.25 0.25 134217728 0 0
-( 672 64 0 ) ( 680 64 -8 ) ( 672 -64 0 ) exx/base-metal03 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 520 -384 0 ) ( 520 -384 448 ) ( 584 -384 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -384 -64 ) ( 520 -376 -64 ) ( 512 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 704 -384 64 ) ( 696 -376 -64 ) ( 704 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 656 -376 -64 ) ( 680 -376 -64 ) ( 656 -376 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
-( 704 -184 448 ) ( 704 -184 0 ) ( 704 -344 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
-( 512 -384 -64 ) ( 520 -376 -64 ) ( 512 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 704 -384 -64 ) ( 696 -376 -64 ) ( 704 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 696 -216 64 ) ( 696 -224 -64 ) ( 696 -216 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
-( 512 -352 0 ) ( 512 -192 0 ) ( 512 -352 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -384 64 ) ( 520 -376 -64 ) ( 512 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 520 -352 64 ) ( 520 -296 -64 ) ( 520 -352 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 512 -224 -64 ) ( 520 -224 -64 ) ( 512 -224 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 576 -192 448 ) ( 512 -192 448 ) ( 576 -192 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
-( 512 -384 64 ) ( 520 -376 -64 ) ( 512 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 552 -200 64 ) ( 568 -200 -64 ) ( 552 -200 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 544 -192 64 ) ( 544 -200 -64 ) ( 544 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 256 0.02734375 45 0.1767800003 0.1767800003 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( 512 -224 -32 ) ( 520 -216 -32 ) ( 512 -224 96 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
-( 544 -192 -64 ) ( 544 -200 -64 ) ( 544 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 520 -224 64 ) ( 528 -216 -64 ) ( 520 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 512 -224 64 ) ( 520 -224 -64 ) ( 512 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
-{
-( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) trak5x/panel-panel2a 23.2727050781 442.1818237305 0 0.34375 0.34375 134217728 0 0
-( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
-( 696 -216 -64 ) ( 696 -224 -64 ) ( 696 -216 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 552 -200 -64 ) ( 568 -200 -64 ) ( 552 -200 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 520 -224 -64 ) ( 528 -216 -64 ) ( 520 -224 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 520 -352 -64 ) ( 520 -296 -64 ) ( 520 -352 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( 656 -376 64 ) ( 680 -376 -64 ) ( 656 -376 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-}
+"modelscale" "0.650000"
 }
 {
 "classname" "misc_model"
@@ -12273,7 +12509,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "480.000000 -1232.000000 184.000000"
 "light" "196"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp1"
 }
 {
@@ -12403,14 +12639,14 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-128.000000 1256.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null18"
 }
 {
 "classname" "light"
 "origin" "608.000000 -288.000000 216.000015"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12423,37 +12659,37 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-32.000000 -1024.000000 -384.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1376.000000 960.000000 160.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-256.000000 -544.000000 -384.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1472.000000 352.000000 160.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1056.000000 960.000000 160.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "736.000000 960.000000 224.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "trigger_impulse"
@@ -12681,15 +12917,16 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 0.000000 -104.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null11"
 }
 {
 "classname" "misc_model"
-"origin" "-70.058891 190.058929 -511.999847"
+"origin" "-118.058891 214.058929 -511.999847"
 "model" "models/map/forklift.md3"
 "angle" "-45.000008"
 "spawnflags" "2"
+"modelscale" "0.650000"
 }
 {
 "classname" "info_player_deathmatch"
@@ -12719,7 +12956,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-1056.000000 1176.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12926,7 +13163,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-680.000000 -616.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "angle" "63"
 }
 {
@@ -12940,7 +13177,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-1056.000000 -1176.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "misc_model"
@@ -12953,43 +13190,43 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-1024.000000 -480.000000 224.000000"
 "light" "1024"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-680.000000 616.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-1024.000000 480.000000 224.000000"
 "light" "1024"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-800.000000 256.000000 224.000000"
 "light" "1024"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-800.000000 0.000000 224.000000"
 "light" "1024"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-800.000000 -256.000000 224.000000"
 "light" "1024"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-608.000000 -1024.000000 -384.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "target_speaker"
@@ -13551,7 +13788,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1472.000000 672.000000 160.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "func_rotating"
@@ -13915,7 +14152,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "1536.000000 -1024.000000 232.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "1280"
 "target" "info_null_light2"
 }
@@ -13927,7 +14164,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "320.000000 -1024.000000 232.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "1280"
 "target" "info_null_light7"
 }
@@ -13945,7 +14182,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1376.000000 -1232.000000 184.000000"
 "light" "196"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp2"
 }
 {
@@ -13957,7 +14194,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "608.000000 -808.000000 184.000000"
 "light" "196"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp3"
 }
 {
@@ -13969,7 +14206,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "928.000000 -808.000000 184.000000"
 "light" "196"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp4"
 }
 {
@@ -13981,7 +14218,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1248.000000 -808.000000 184.000000"
 "light" "196"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 "target" "info_null_lightcomp5"
 }
 {
@@ -13992,13 +14229,13 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "320.000000 -1024.000000 208.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "100"
 }
 {
 "classname" "light"
 "origin" "1536.000000 -1024.000000 208.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "100"
 }
 {
@@ -14010,7 +14247,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1624.000000 -608.000000 72.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null2"
 }
 {
@@ -14023,13 +14260,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1536.000000 -608.000000 144.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1448.000000 -416.000000 8.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null3"
 }
 {
@@ -14041,7 +14278,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1624.000000 -416.000000 8.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null4"
 }
 {
@@ -14054,19 +14291,19 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1536.000000 -416.000000 80.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1656.000000 128.000000 136.000000"
 "light" "128"
-"_color" "0.549291358544912 0.955399185525627 0.960035360090104"
+"_color" "0.766934 0.980133 0.982223"
 }
 {
 "classname" "light"
 "origin" "1120.000000 88.000000 8.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null5"
 }
 {
@@ -14079,7 +14316,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1120.000000 -88.000000 8.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null6"
 }
 {
@@ -14092,13 +14329,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1120.000000 0.000000 80.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "928.000000 88.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null9"
 }
 {
@@ -14111,7 +14348,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "928.000000 -88.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null10"
 }
 {
@@ -14124,7 +14361,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "928.000000 0.000000 136.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "info_null"
@@ -14140,7 +14377,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "408.000000 -608.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null13"
 }
 {
@@ -14153,7 +14390,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "232.000000 -608.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null12"
 }
 {
@@ -14166,13 +14403,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 -608.000000 136.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "408.000000 608.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null15"
 }
 {
@@ -14185,7 +14422,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "232.000000 608.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null14"
 }
 {
@@ -14198,13 +14435,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 608.000000 136.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-544.000000 936.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null17"
 }
 {
@@ -14217,7 +14454,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-544.000000 1112.000000 64.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null16"
 }
 {
@@ -14230,7 +14467,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-544.000000 1024.000000 136.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "info_null"
@@ -14241,7 +14478,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "128.000000 1256.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null19"
 }
 {
@@ -14253,7 +14490,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "128.000000 792.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null20"
 }
 {
@@ -14266,7 +14503,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-128.000000 792.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null21"
 }
 {
@@ -14279,7 +14516,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "384.000000 1256.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null22"
 }
 {
@@ -14291,7 +14528,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "616.000000 1152.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null23"
 }
 {
@@ -14304,7 +14541,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "616.000000 896.000000 24.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null24"
 }
 {
@@ -14317,7 +14554,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "400.000000 888.000000 56.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null25"
 }
 {
@@ -14330,7 +14567,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "240.000000 888.000000 56.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null26"
 }
 {
@@ -14343,7 +14580,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-264.000000 944.000000 56.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null27"
 }
 {
@@ -14356,7 +14593,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-264.000000 1104.000000 56.000000"
 "light" "256"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null28"
 }
 {
@@ -14369,73 +14606,73 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-256.000000 1104.000000 64.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-256.000000 944.000000 64.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "400.000000 896.000000 64.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "240.000000 896.000000 64.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "384.000000 1248.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "128.000000 1248.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-128.000000 1248.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "608.000000 1152.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "608.000000 896.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "128.000000 800.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-128.000000 800.000000 32.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-544.000000 -936.000000 72.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null7"
 }
 {
@@ -14448,7 +14685,7 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-544.000000 -1112.000000 72.000000"
 "light" "768"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null8"
 }
 {
@@ -14461,13 +14698,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-544.000000 -1024.000000 144.000000"
 "light" "128"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "328.000000 176.000000 -456.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null29"
 }
 {
@@ -14480,13 +14717,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 176.000000 -448.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "328.000000 336.000000 -456.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null30"
 }
 {
@@ -14499,13 +14736,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 336.000000 -448.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-176.000000 -264.000000 -456.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null31"
 }
 {
@@ -14518,13 +14755,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-176.000000 -256.000000 -448.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-336.000000 -264.000000 -456.000000"
 "light" "512"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "target" "info_null32"
 }
 {
@@ -14537,14 +14774,14 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-336.000000 -256.000000 -448.000000"
 "light" "96"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-96.000000 1024.000000 288.000000"
 "light" "2000"
 "target" "info_null33"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "info_null"
@@ -14555,14 +14792,14 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "-96.000000 1024.000000 272.000000"
 "light" "25"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "light"
 "origin" "320.000000 1024.000000 288.000000"
 "light" "2000"
 "target" "info_null34"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "info_null"
@@ -14573,12 +14810,12 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "320.000000 1024.000000 272.000000"
 "light" "25"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "light"
 "origin" "-192.000000 -1024.000000 232.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "1280"
 "target" "info_null_light8"
 }
@@ -14590,39 +14827,39 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "-192.000000 -1024.000000 208.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "100"
 }
 {
 "classname" "light"
 "origin" "-1120.000000 -448.000000 -384.000000"
 "light" "160"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-1120.000000 -256.000000 -384.000000"
 "light" "160"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-1120.000000 256.000000 -384.000000"
 "light" "160"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "-1120.000000 448.000000 -384.000000"
 "light" "160"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 }
 {
 "classname" "light"
 "origin" "1536.000000 0.000000 224.000000"
 "light" "1000"
 "target" "info_null36"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "info_null"
@@ -14633,13 +14870,13 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1536.000000 0.000000 136.000000"
 "light" "16"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "light"
 "origin" "1536.000000 0.000000 208.000000"
 "light" "16"
-"_color" "1 0.760168702863142 0.345881265317807"
+"_color" "1 0.886091 0.622858"
 }
 {
 "classname" "func_group"
@@ -14773,7 +15010,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "1088.000000 -1008.000000 232.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "1280"
 "target" "info_null_light1"
 }
@@ -14785,7 +15022,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "1088.000000 -1008.000000 208.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "100"
 }
 {
@@ -14804,7 +15041,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "768.000000 -1008.000000 232.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "1280"
 "target" "info_null_light3"
 }
@@ -14816,7 +15053,7 @@ exx/wall-metalrib01
 {
 "classname" "light"
 "origin" "768.000000 -1008.000000 208.000000"
-"_color" "1 0.843883015823565 0.452729450817907"
+"_color" "1 0.927962 0.703319"
 "light" "100"
 }
 {
@@ -14829,19 +15066,19 @@ exx/wall-metalrib01
 "classname" "light"
 "origin" "1232.000000 -1176.000000 144.000000"
 "light" "32"
-"_color" "1 0.0200607273624878 0"
+"_color" "1 0.151965 0"
 }
 {
 "classname" "light"
 "origin" "736.000000 -1176.000000 176.000000"
 "light" "32"
-"_color" "1 0.0200607273624878 0"
+"_color" "1 0.151965 0"
 }
 {
 "classname" "light"
 "origin" "1008.000000 -1176.000000 168.000000"
 "light" "32"
-"_color" "1 0.0200607273624878 0"
+"_color" "1 0.151965 0"
 }
 {
 "classname" "weapon_hlac"
@@ -14851,3 +15088,130 @@ exx/wall-metalrib01
 "classname" "item_cells"
 "origin" "-864.000000 -640.000000 -256.000000"
 }
+{
+"classname" "trigger_impulse"
+}
+{
+"classname" "func_plat"
+"sound1" "sound/machines/Elevator_Up.wav"
+"speed" "300"
+"lip" "32"
+{
+( 576 -192 0 ) ( 576 -256 0 ) ( 512 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 576 -192 -32 ) ( 512 -192 -32 ) ( 576 -192 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
+( 576 -192 -32 ) ( 576 -192 -64 ) ( 576 -256 -32 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
+( 536 -248 -448 ) ( 600 -248 -448 ) ( 536 -184 -448 ) common/caulk 0 32 0 0.25 0.25 134217728 0 0
+( 512 -256 -64 ) ( 512 -256 -32 ) ( 576 -256 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -256 -64 ) ( 512 -192 -64 ) ( 512 -256 -32 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 -96 ) ( 520 -216 -96 ) ( 512 -224 32 ) exx/trim-psimple04 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 576 -392 0 ) ( 384 -392 0 ) ( 576 -328 0 ) common/caulk 0 224 0 0.25 0.25 134217728 0 0
+( 568 -392 0 ) ( 568 -328 0 ) ( 568 -392 -64 ) exx/trim-baseboard02 22.6273956299 22.6275024414 45 0.25 0.25 134217728 0 0
+( 576 -392 0 ) ( 576 -392 -64 ) ( 384 -392 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 520 -328 -56 ) ( 520 -328 8 ) ( 520 -392 -56 ) exx/trim-baseboard02 22.6273956299 22.6275024414 45 0.25 0.25 134217728 0 0
+( 832 -392 -64 ) ( 832 -384 -56 ) ( 704 -392 -64 ) exx/trim-psimple05 0 480 0 0.25 0.25 134217728 0 0
+( 832 -360 0 ) ( 832 -368 -8 ) ( 704 -360 0 ) exx/base-metal03 0 480 0 0.25 0.25 134217728 0 0
+}
+{
+( 712 -192 0 ) ( 712 -384 0 ) ( 648 -192 0 ) common/caulk 224 0 0 0.25 0.25 134217728 0 0
+( 712 -200 0 ) ( 648 -200 0 ) ( 712 -200 -64 ) exx/trim-baseboard02 489.3726196289 22.6275024414 -45 0.25 0.25 134217728 0 0
+( 712 -192 0 ) ( 712 -192 -64 ) ( 712 -384 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 648 -248 -56 ) ( 648 -248 8 ) ( 712 -248 -56 ) exx/trim-baseboard02 489.3726196289 22.6275024414 -45 0.25 0.25 134217728 0 0
+( 712 64 -64 ) ( 704 64 -56 ) ( 712 -64 -64 ) exx/trim-psimple05 0 480 90 0.25 0.25 134217728 0 0
+( 680 64 0 ) ( 688 64 -8 ) ( 680 -64 0 ) exx/base-metal03 480 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 520 -384 0 ) ( 520 -384 448 ) ( 584 -384 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -384 -64 ) ( 520 -376 -64 ) ( 512 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 704 -384 64 ) ( 696 -376 -64 ) ( 704 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 656 -376 -64 ) ( 680 -376 -64 ) ( 656 -376 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
+( 704 -184 448 ) ( 704 -184 0 ) ( 704 -344 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
+( 512 -384 -64 ) ( 520 -376 -64 ) ( 512 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 704 -384 -64 ) ( 696 -376 -64 ) ( 704 -384 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 696 -216 64 ) ( 696 -224 -64 ) ( 696 -216 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 90 0.25 0.25 134217728 0 0
+( 512 -352 0 ) ( 512 -192 0 ) ( 512 -352 448 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -384 64 ) ( 520 -376 -64 ) ( 512 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 520 -352 64 ) ( 520 -296 -64 ) ( 520 -352 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 -64 ) ( 520 -224 -64 ) ( 512 -224 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 576 -192 448 ) ( 512 -192 448 ) ( 576 -192 0 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/trim-horz01 0 0 0 0.25 0.25 134217728 0 0
+( 512 -384 64 ) ( 520 -376 -64 ) ( 512 -384 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 552 -200 64 ) ( 568 -200 -64 ) ( 552 -200 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 544 -192 64 ) ( 544 -200 -64 ) ( 544 -192 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) exx/trim-horz01 256 0.02734375 45 0.1767800003 0.1767800003 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 -32 ) ( 520 -216 -32 ) ( 512 -224 96 ) exx/trim-baseboard02 0 0 0 0.25 0.25 134217728 0 0
+( 544 -192 -64 ) ( 544 -200 -64 ) ( 544 -192 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 520 -224 64 ) ( 528 -216 -64 ) ( 520 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 512 -224 64 ) ( 520 -224 -64 ) ( 512 -224 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+{
+( 592 -192 32 ) ( 592 -352 32 ) ( 528 -192 32 ) trak5x/panel-panel2a 23.2727050781 442.1818237305 0 0.34375 0.34375 134217728 0 0
+( 512 -352 0 ) ( 576 -352 0 ) ( 512 -192 0 ) exx/base-metal01 0 0 0 0.25 0.25 134217728 0 0
+( 696 -216 -64 ) ( 696 -224 -64 ) ( 696 -216 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 552 -200 -64 ) ( 568 -200 -64 ) ( 552 -200 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 520 -224 -64 ) ( 528 -216 -64 ) ( 520 -224 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 520 -352 -64 ) ( 520 -296 -64 ) ( 520 -352 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( 656 -376 64 ) ( 680 -376 -64 ) ( 656 -376 -64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+}
+}
+{
+"classname" "trigger_conveyor"
+"spawnflags" "1"
+"speed" "64"
+"angle" "270"
+{
+( -320 -448 -432 ) ( -192 -512 -432 ) ( -320 -512 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -192 -448 -434 ) ( -320 -448 -434 ) ( -192 -448 -466 ) common/trigger 0 184 0 0.25 0.25 0 0 0
+( -192 -448 -432 ) ( -192 -512 -448 ) ( -192 -512 -432 ) common/trigger 104 192 0 0.25 0.25 0 0 0
+( -192 -448 -448 ) ( -320 -512 -448 ) ( -192 -512 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -328 -960 -408 ) ( -200 -960 -424 ) ( -328 -960 -424 ) common/trigger 16 32 0 0.25 0.25 0 0 0
+( -320 -448 -448 ) ( -320 -512 -432 ) ( -320 -512 -448 ) common/trigger 104 192 0 0.25 0.25 0 0 0
+}
+{
+( -192 -294 -464 ) ( -192 -368 -464 ) ( -320 -294 -464 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -192 -294 -466 ) ( -320 -294 -466 ) ( -192 -294 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
+( -192 -294 -464 ) ( -192 -294 -496 ) ( -192 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
+( -320 -368 -480 ) ( -192 -368 -480 ) ( -320 -294 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -316 -384 -496 ) ( -316 -384 -464 ) ( -188 -384 -496 ) common/trigger 240 64 0 0.25 0.25 0 0 0
+( -320 -368 -496 ) ( -320 -294 -496 ) ( -320 -368 -464 ) common/trigger 0 64 0 0.25 0.25 0 0 0
+}
+{
+( -320 -384 -464 ) ( -192 -448 -432 ) ( -320 -448 -432 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -192 -384 -466 ) ( -320 -384 -466 ) ( -192 -384 -498 ) common/trigger 0 56 0 0.25 0.25 0 0 0
+( -192 -384 -464 ) ( -192 -448 -448 ) ( -192 -448 -432 ) common/trigger 104 64 0 0.25 0.25 0 0 0
+( -192 -384 -480 ) ( -320 -448 -448 ) ( -192 -448 -448 ) common/trigger 0 152 0 0.25 0.25 0 0 0
+( -320 -448 -432 ) ( -192 -448 -448 ) ( -320 -448 -448 ) common/trigger 240 64 0 0.25 0.25 0 0 0
+( -320 -384 -480 ) ( -320 -448 -432 ) ( -320 -448 -448 ) common/trigger 104 64 0 0.25 0.25 0 0 0
+}
+}
+{
+"classname" "trigger_conveyor"
+"spawnflags" "1"
+"speed" "64"
+"angle" "180"
+{
+( -752 -976 -432 ) ( -752 -1024 -432 ) ( -824 -976 -432 ) common/trigger 0 192 0 0.25 0.25 0 0 0
+( -752 -960 -432 ) ( -824 -960 -432 ) ( -752 -960 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( 46 -1016 -432 ) ( 46 -1016 -480 ) ( 46 -1064 -432 ) common/trigger 224 0 0 0.25 0.25 0 0 0
+( -816 -1024 -448 ) ( -744 -1024 -448 ) ( -816 -976 -448 ) common/trigger 224 192 0 0.25 0.25 0 0 0
+( -824 -1072 -480 ) ( -824 -1072 -432 ) ( -752 -1072 -480 ) common/trigger 0 0 0 0.25 0.25 0 0 0
+( -824 -1024 -480 ) ( -824 -976 -480 ) ( -824 -1024 -432 ) common/trigger 64 0 0 0.25 0.25 0 0 0
+}
+}

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index 2fa574891710a52a210318f9b3c53e31bf50ec15..ecce2c7bb62e58b85ae3389f21266145f084a313 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -1,5 +1,6 @@
--bsp + -sRGBtex -samplesize 4
--light + -sRGBtex -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
+-bsp + -samplesize 4
+-light + -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
 -vis +
 -minimap +
-Version: 5
+-sRGB
+Version: 6.1

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index aba059e466640529b4858e54f368f0f990364ccc..1bb3ac281ea42d7533e2c1bfdc357372025add62 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 6 -bouncegrid -dirtscale 1.5
 -vis +
 -minimap +
+-nosRGB
 Version: 9

diff --git a/maps/leave_em_behind.map.options b/maps/leave_em_behind.map.options
index eb22e8b96671cadd48ae8a329ff5ed2cdea298a6..c1358d1de098f6e8663f4ec34e097b6fed9205d9 100644 (file)
--- a/maps/leave_em_behind.map.options
+++ b/maps/leave_em_behind.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8
 -vis +
 -minimap +
+-nosRGB
 Version: 4

diff --git a/maps/lightspeed.map.options b/maps/lightspeed.map.options
index 892d9afdbfcbf52664523c59f29799de215efd03..8cb2065ed1b4c2dc3f6f2ee89aeea68b5e7da0bc 100644 (file)
--- a/maps/lightspeed.map.options
+++ b/maps/lightspeed.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8
 -vis +
 -minimap +
+-nosRGB
 Version: 2

diff --git a/maps/newtonian-nightmare.map.options b/maps/newtonian-nightmare.map.options
index 090a3e1c33ac34cbdaf65aa6da31feceb043faa3..b738865059a82ba882f1022ebc68f779df3d7683 100644 (file)
--- a/maps/newtonian-nightmare.map.options
+++ b/maps/newtonian-nightmare.map.options
@@ -2,4 +2,5 @@
 -light +
 -vis + -fast
 -minimap +
+-nosRGB
 Version: 5

diff --git a/maps/nexballarena.map.options b/maps/nexballarena.map.options
index fe9038ec885c8743da0dd935a36bdc479faba418..6f2029fd06fcd5621fee1bef70208483540b8913 100644 (file)
--- a/maps/nexballarena.map.options
+++ b/maps/nexballarena.map.options
@@ -2,3 +2,5 @@
 -light + -bounce 8 -dirtscale 2 -bouncescale 1.15 -exposure 150
 -vis +
 -minimap +
+-nosRGB
+Version: 1

diff --git a/maps/red-planet.map b/maps/red-planet.map
index 39f582e9ca9951ee94307700bd2126c1770585f0..06843a1f60e4ea37f0f1e8f46166be5e92931328 100644 (file)
--- a/maps/red-planet.map
+++ b/maps/red-planet.map
@@ -64997,6 +64997,7 @@ exx/trim-vert01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -65143,6 +65144,7 @@ exx/floor-clang01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -72837,6 +72839,7 @@ exx/trim-vert01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2
@@ -72983,6 +72986,7 @@ exx/floor-clang01
 }
 {
 "classname" "func_plat"
+"lip" "8"
 "speed" "250"
 {
 patchDef2

diff --git a/maps/red-planet.map.options b/maps/red-planet.map.options
index 8989c7cacc4740b38e5ebfdae5c1c303adac66f2..d940db1a7e783af7591b5638cc8231ffafe3e22c 100644 (file)
--- a/maps/red-planet.map.options
+++ b/maps/red-planet.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8 -dirtscale 2 -bouncescale 1.15 -exposure 150 -areascale 1.25 -pointscale 1.4
 -vis +
 -minimap +
+-nosRGB
 Version: 3

diff --git a/maps/runningman.map.options b/maps/runningman.map.options
index 2682546b42eaeb669399de29bb87766c0d00142e..8e7f70600e0a109372abbcb429a64f755b1a9890 100644 (file)
--- a/maps/runningman.map.options
+++ b/maps/runningman.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8 -dirtscale 2 -bouncescale 1.15 -exposure 225 -areascale 1.25 -pointscale 1.5
 -vis +
 -minimap +
+-nosRGB
 Version: 2

diff --git a/maps/space-elevator.map.options b/maps/space-elevator.map.options
index 09662c4088bd4d518d5201a691adf60cc1f9c271..118ade897f0b982b6e25f6f9dfb8864ec2a3132f 100644 (file)
--- a/maps/space-elevator.map.options
+++ b/maps/space-elevator.map.options
@@ -2,4 +2,5 @@
 -light +
 -vis +
 -minimap +
+-nosRGB
 Version: 3

diff --git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index c5c9f0b88cd0e2ad817eb40cb47db5ad59af0cc4..7d0320589eca0f6ed5fb73c9a66381aec6d548c8 100644 (file)
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@ -2,4 +2,5 @@
 -light + -bounce 8 -dirtscale 2
 -vis +
 -minimap +
+-nosRGB
 Version: 6

diff --git a/maps/techassault.map.options b/maps/techassault.map.options
index 1e40df2b9ca8f828a8f08dd4a3bc89e89dd1a4d8..118ade897f0b982b6e25f6f9dfb8864ec2a3132f 100644 (file)
--- a/maps/techassault.map.options
+++ b/maps/techassault.map.options
@@ -2,5 +2,5 @@
 -light +
 -vis +
 -minimap +
+-nosRGB
 Version: 3
-

diff --git a/maps/xoylent.map.options b/maps/xoylent.map.options
index b912c482c13c2095cd1d9f6d3af98e5a4b50fe72..54ad7e84f9349a8c4bba2ab47350492e46a42045 100644 (file)
--- a/maps/xoylent.map.options
+++ b/maps/xoylent.map.options
@@ -2,4 +2,5 @@
 -light +
 -vis +
 -minimap +
+-nosRGB
 Version: 2

diff --git a/scripts/alphamod.shader b/scripts/alphamod.shader
new file mode 100644 (file)
index 0000000..c9d12df
--- /dev/null
+++ b/scripts/alphamod.shader
@@ -0,0 +1,1111 @@
+textures/alphamod/alpha_000
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.00
+}
+textures/alphamod/alpha_001
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.01
+}
+textures/alphamod/alpha_002
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.02
+}
+textures/alphamod/alpha_003
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.03
+}
+textures/alphamod/alpha_004
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.04
+}
+textures/alphamod/alpha_005
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.05
+}
+textures/alphamod/alpha_006
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.06
+}
+textures/alphamod/alpha_007
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.07
+}
+textures/alphamod/alpha_008
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.08
+}
+textures/alphamod/alpha_009
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.09
+}
+textures/alphamod/alpha_010
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.10
+}
+textures/alphamod/alpha_011
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.11
+}
+textures/alphamod/alpha_012
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.12
+}
+textures/alphamod/alpha_013
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.13
+}
+textures/alphamod/alpha_014
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.14
+}
+textures/alphamod/alpha_015
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.15
+}
+textures/alphamod/alpha_016
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.16
+}
+textures/alphamod/alpha_017
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.17
+}
+textures/alphamod/alpha_018
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.18
+}
+textures/alphamod/alpha_019
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.19
+}
+textures/alphamod/alpha_020
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.20
+}
+textures/alphamod/alpha_021
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.21
+}
+textures/alphamod/alpha_022
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.22
+}
+textures/alphamod/alpha_023
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.23
+}
+textures/alphamod/alpha_024
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.24
+}
+textures/alphamod/alpha_025
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.25
+}
+textures/alphamod/alpha_026
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.26
+}
+textures/alphamod/alpha_027
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.27
+}
+textures/alphamod/alpha_028
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.28
+}
+textures/alphamod/alpha_029
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.29
+}
+textures/alphamod/alpha_030
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.30
+}
+textures/alphamod/alpha_031
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.31
+}
+textures/alphamod/alpha_032
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.32
+}
+textures/alphamod/alpha_033
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.33
+}
+textures/alphamod/alpha_034
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.34
+}
+textures/alphamod/alpha_035
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.35
+}
+textures/alphamod/alpha_036
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.36
+}
+textures/alphamod/alpha_037
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.37
+}
+textures/alphamod/alpha_038
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.38
+}
+textures/alphamod/alpha_039
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.39
+}
+textures/alphamod/alpha_040
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.40
+}
+textures/alphamod/alpha_041
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.41
+}
+textures/alphamod/alpha_042
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.42
+}
+textures/alphamod/alpha_043
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.43
+}
+textures/alphamod/alpha_044
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.44
+}
+textures/alphamod/alpha_045
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.45
+}
+textures/alphamod/alpha_046
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.46
+}
+textures/alphamod/alpha_047
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.47
+}
+textures/alphamod/alpha_048
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.48
+}
+textures/alphamod/alpha_049
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.49
+}
+textures/alphamod/alpha_050
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.50
+}
+textures/alphamod/alpha_051
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.51
+}
+textures/alphamod/alpha_052
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.52
+}
+textures/alphamod/alpha_053
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.53
+}
+textures/alphamod/alpha_054
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.54
+}
+textures/alphamod/alpha_055
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.55
+}
+textures/alphamod/alpha_056
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.56
+}
+textures/alphamod/alpha_057
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.57
+}
+textures/alphamod/alpha_058
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.58
+}
+textures/alphamod/alpha_059
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.59
+}
+textures/alphamod/alpha_060
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.60
+}
+textures/alphamod/alpha_061
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.61
+}
+textures/alphamod/alpha_062
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.62
+}
+textures/alphamod/alpha_063
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.63
+}
+textures/alphamod/alpha_064
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.64
+}
+textures/alphamod/alpha_065
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.65
+}
+textures/alphamod/alpha_066
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.66
+}
+textures/alphamod/alpha_067
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.67
+}
+textures/alphamod/alpha_068
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.68
+}
+textures/alphamod/alpha_069
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.69
+}
+textures/alphamod/alpha_070
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.70
+}
+textures/alphamod/alpha_071
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.71
+}
+textures/alphamod/alpha_072
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.72
+}
+textures/alphamod/alpha_073
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.73
+}
+textures/alphamod/alpha_074
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.74
+}
+textures/alphamod/alpha_075
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.75
+}
+textures/alphamod/alpha_076
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.76
+}
+textures/alphamod/alpha_077
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.77
+}
+textures/alphamod/alpha_078
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.78
+}
+textures/alphamod/alpha_079
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.79
+}
+textures/alphamod/alpha_080
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.80
+}
+textures/alphamod/alpha_081
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.81
+}
+textures/alphamod/alpha_082
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.82
+}
+textures/alphamod/alpha_083
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.83
+}
+textures/alphamod/alpha_084
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.84
+}
+textures/alphamod/alpha_085
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.85
+}
+textures/alphamod/alpha_086
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.86
+}
+textures/alphamod/alpha_087
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.87
+}
+textures/alphamod/alpha_088
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.88
+}
+textures/alphamod/alpha_089
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.89
+}
+textures/alphamod/alpha_090
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.90
+}
+textures/alphamod/alpha_091
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.91
+}
+textures/alphamod/alpha_092
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.92
+}
+textures/alphamod/alpha_093
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.93
+}
+textures/alphamod/alpha_094
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.94
+}
+textures/alphamod/alpha_095
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.95
+}
+textures/alphamod/alpha_096
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.96
+}
+textures/alphamod/alpha_097
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.97
+}
+textures/alphamod/alpha_098
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.98
+}
+textures/alphamod/alpha_099
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 0.99
+}
+textures/alphamod/alpha_100
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const 1.00
+}

diff --git a/scripts/entities.def b/scripts/entities.def
index e7233e37980a8bf099608a29755709b22cb622bd..be1dc9fc63f675713f2ed0207e1fae196c6d3f5d 100644 (file)
--- a/scripts/entities.def
+++ b/scripts/entities.def
@@ -129,6 +129,26 @@ health: (default 0) if set to any non-zero value, the button must take damage (a
 NOSPLASH: if set, splash damage cannot activate the door, only direct damage can (requires health to be set)
 */
 
+/*QUAKED func_conveyor (0 .5 .8) ? START_ON
+A conveyor. Solid brush version.
+-------- KEYS --------
+targetname: if set, it can be turned on/off
+angle: determines the opening direction
+speed: movement speed (200 default)
+-------- SPAWNFLAGS --------
+START_ON: the conveyor is turned on if not triggered
+*/
+
+/*QUAKED trigger_conveyor (0 .5 .8) ? START_ON
+A conveyor. Nonsolid trigger version.
+-------- KEYS --------
+targetname: if set, it can be turned on/off
+angle: determines the opening direction
+speed: movement speed (200 default)
+-------- SPAWNFLAGS --------
+START_ON: the conveyor is turned on if not triggered
+*/
+
 /*QUAKED func_door (0 .5 .8) ? START_OPEN - DOOR_DONT_LINK GOLD_KEY SILVER_KEY TOGGLE - - NOSPLASH
 Normal sliding door entity. By default, the door will activate when player walks close to it or when damage is inflicted to it.
 If DOOR_DONT_LINK is not set, the door will be linked with all doors it touches. Note however that for linked doors to work properly, it is necessary that ALL linked doors have SOME volume of common area (that is, there must be a point that is part of ALL doors).

diff --git a/scripts/entities.ent b/scripts/entities.ent
index a757a09c7f8598955ea18d00f30b300567051518..45f87cb8a93c94d4796147d4987f21a554b9b522 100644 (file)
--- a/scripts/entities.ent
+++ b/scripts/entities.ent
@@ -131,6 +131,26 @@ When a button is touched by a player, it moves in the direction set by the &quot
 <flag key="NOSPLASH" name="NOSPLASH" bit="8">if set, splash damage cannot activate the door, only direct damage can (requires health to be set)</flag>
 </group>
 
+<group name="func_conveyor" color="0 .5 .8">
+A conveyor. Solid brush version.
+-------- KEYS --------
+<targetname key="targetname" name="targetname">if set, it can be turned on/off</targetname>
+<direction key="angle" name="angle">determines the opening direction</direction>
+<real key="speed" name="speed">movement speed (200 default)</real>
+-------- SPAWNFLAGS --------
+<flag key="START_ON" name="START_ON" bit="0">the conveyor is turned on if not triggered</flag>
+</group>
+
+<group name="trigger_conveyor" color="0 .5 .8">
+A conveyor. Nonsolid trigger version.
+-------- KEYS --------
+<targetname key="targetname" name="targetname">if set, it can be turned on/off</targetname>
+<direction key="angle" name="angle">determines the opening direction</direction>
+<real key="speed" name="speed">movement speed (200 default)</real>
+-------- SPAWNFLAGS --------
+<flag key="START_ON" name="START_ON" bit="0">the conveyor is turned on if not triggered</flag>
+</group>
+
 <group name="func_door" color="0 .5 .8">
 Normal sliding door entity. By default, the door will activate when player walks close to it or when damage is inflicted to it.
 If DOOR_DONT_LINK is not set, the door will be linked with all doors it touches. Note however that for linked doors to work properly, it is necessary that ALL linked doors have SOME volume of common area (that is, there must be a point that is part of ALL doors).
@@ -338,7 +358,9 @@ Attacking team's player spawning location in Assault. Should touch the floor, bu
 Normal player spawning location in game types without team spawns. Should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
 <real key="cnt" name="cnt">weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.</real>
-<target key="target" name="target">trigger all entities with this targetname when someone spawns</target>
+<target key="target2" name="target2">trigger all entities with this targetname when someone spawns</target>
+<target key="target3" name="target3">trigger all entities with this targetname when someone spawns</target>
+<target key="target4" name="target4">trigger all entities with this targetname when someone spawns</target>
 <targetname key="targetname" name="targetname">when targeted by a func_button, pressing the button will assign the spawn point to the team of the activator as an additional spawn point, or reassign it if it was already assigned. Also used to assign spawn points to Onslaught control points.</targetname>
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
@@ -359,7 +381,9 @@ Defending team's player spawning location in Assault. Should touch the floor, bu
 Red team's player spawning location in e.g. CTF and Onslaught. Should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
 <real key="cnt" name="cnt">weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.</real>
-<target key="target" name="target">trigger all entities with this targetname when someone spawns</target>
+<target key="target2" name="target2">trigger all entities with this targetname when someone spawns</target>
+<target key="target3" name="target3">trigger all entities with this targetname when someone spawns</target>
+<target key="target4" name="target4">trigger all entities with this targetname when someone spawns</target>
 <targetname key="targetname" name="targetname">when targeted by a func_button, pressing the button will reassign the spawn point to the team of the activator. If a team has no more spawn point left, it immediately loses.</targetname>
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
@@ -368,7 +392,9 @@ Red team's player spawning location in e.g. CTF and Onslaught. Should touch the
 Blue team's player spawning location in e.g. CTF and Onslaught. Should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
 <real key="cnt" name="cnt">weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.</real>
-<target key="target" name="target">trigger all entities with this targetname when someone spawns</target>
+<target key="target2" name="target2">trigger all entities with this targetname when someone spawns</target>
+<target key="target3" name="target3">trigger all entities with this targetname when someone spawns</target>
+<target key="target4" name="target4">trigger all entities with this targetname when someone spawns</target>
 <targetname key="targetname" name="targetname">when targeted by a func_button, pressing the button will reassign the spawn point to the team of the activator. If a team has no more spawn point left, it immediately loses.</targetname>
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
@@ -377,7 +403,9 @@ Blue team's player spawning location in e.g. CTF and Onslaught. Should touch the
 Yellow team's player spawning location, but there is no game mode to use this yet. Anyway, should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
 <real key="cnt" name="cnt">weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.</real>
-<target key="target" name="target">trigger all entities with this targetname when someone spawns</target>
+<target key="target2" name="target2">trigger all entities with this targetname when someone spawns</target>
+<target key="target3" name="target3">trigger all entities with this targetname when someone spawns</target>
+<target key="target4" name="target4">trigger all entities with this targetname when someone spawns</target>
 <targetname key="targetname" name="targetname">when targeted by a func_button, pressing the button will reassign the spawn point to the team of the activator. If a team has no more spawn point left, it immediately loses.</targetname>
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>
@@ -386,7 +414,9 @@ Yellow team's player spawning location, but there is no game mode to use this ye
 Pink team's player spawning location, but there is no game mode to use this yet. Anyway, should touch the floor, but not the walls, and should point where the player should look when he spawns there.
 -------- KEYS --------
 <real key="cnt" name="cnt">weight of spawn point for random selection. Set to a lower value if you have many spawn points close together. Default value is 1.</real>
-<target key="target" name="target">trigger all entities with this targetname when someone spawns</target>
+<target key="target2" name="target2">trigger all entities with this targetname when someone spawns</target>
+<target key="target3" name="target3">trigger all entities with this targetname when someone spawns</target>
+<target key="target4" name="target4">trigger all entities with this targetname when someone spawns</target>
 <targetname key="targetname" name="targetname">when targeted by a func_button, pressing the button will reassign the spawn point to the team of the activator. If a team has no more spawn point left, it immediately loses.</targetname>
 <real key="restriction" name="restriction">when 1, only bots can spawn here; when 2, only humans can spawn here (be careful with these, or the game will crash because someone cannot spawn)</real>
 </point>

diff --git a/scripts/liquids_water.shader b/scripts/liquids_water.shader
index baf700f0dd072a31f48b43319c3ae58cf54b0ec6..5fb16f1f28562a65650422a24db1b966256fa639 100644 (file)
--- a/scripts/liquids_water.shader
+++ b/scripts/liquids_water.shader
@@ -44,6 +44,32 @@ textures/liquids_water/water0_cubemap
        dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4
 }
 
+textures/liquids_water/water0_cubemap_alphamod
+{
+       qer_trans 20
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm water
+       surfaceparm nolightmap
+       cull none
+       q3map_globaltexture
+       //tessSize 256
+       qer_editorimage textures/liquids_water/water0c_reflect.tga
+       {
+               map textures/liquids_water/water0c.tga
+               tcMod turb 0 0.4 0 0.08
+               blendfunc GL_SRC_ALPHA GL_ONE
+               alphaGen vertex
+       }
+       dpreflectcube cubemaps/default/sky
+       {
+               map $lightmap
+               blendfunc add
+               tcGen lightmap
+       }
+       dp_water 0.1 0.9  3 3  1 1 1  1 1 1  0.4
+}
+
 textures/liquids_water/water1
 {
        qer_editorimage textures/liquids_water/water1.tga

diff --git a/scripts/map_g-23.shader b/scripts/map_g-23.shader
new file mode 100644 (file)
index 0000000..a2cbf50
--- /dev/null
+++ b/scripts/map_g-23.shader
@@ -0,0 +1,14 @@
+textures/map_g-23/conveyor_belt
+{
+       qer_editorimage textures/map_g-23/conveyorbelt/conveyorbelt.tga
+       surfaceparm metalsteps
+       q3map_bounceScale  1.5
+       dpoffsetmapping - 2 match8 230
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+       
+       {
+               map textures/map_g-23/conveyorbelt/conveyorbelt.tga
+               tcMod scroll 0 0.25
+       }
+}
\ No newline at end of file

diff --git a/scripts/shader-audit.sh b/scripts/shader-audit.sh
index cb7d907fb196a65e66cf15a8eb646e712f6239c2..6d74b354a593a22148bc4a66253a24035c274fc8 100755 (executable)
--- a/scripts/shader-audit.sh
+++ b/scripts/shader-audit.sh
@@ -234,8 +234,8 @@ use_texture()
                                        ;;
                        esac
                        ;;
-               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava
-               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*)
+               ## RULE: textures/FOO/* must use textures/FOO/*, for FOO in decals, liquids_water, liquids_slime, liquids_lava, alphamod
+               textures/decals/*|textures/liquids_*/*|textures/effects_*/*|textures/screens/*|textures/logos/*|textures/alphamod/*)
                        pre=`echo "$1" | cut -d / -f 1-2`
                        case "$2" in
                                "$pre"/*)

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 886d988d3e814d85a6b5aee726a80e7754537462..5d16535204a46efec956f0594ab5f57ad4b8d9bd 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1,3 +1,4 @@
+alphamod
 common
 decals
 effects_beam

diff --git a/textures/alphamod/alpha_000.tga b/textures/alphamod/alpha_000.tga
new file mode 100644 (file)
index 0000000..3be7af1
Binary files /dev/null and b/textures/alphamod/alpha_000.tga differ

diff --git a/textures/alphamod/alpha_001.tga b/textures/alphamod/alpha_001.tga
new file mode 100644 (file)
index 0000000..ebc027d
Binary files /dev/null and b/textures/alphamod/alpha_001.tga differ

diff --git a/textures/alphamod/alpha_002.tga b/textures/alphamod/alpha_002.tga
new file mode 100644 (file)
index 0000000..700d2bb
Binary files /dev/null and b/textures/alphamod/alpha_002.tga differ

diff --git a/textures/alphamod/alpha_003.tga b/textures/alphamod/alpha_003.tga
new file mode 100644 (file)
index 0000000..a07175b
Binary files /dev/null and b/textures/alphamod/alpha_003.tga differ

diff --git a/textures/alphamod/alpha_004.tga b/textures/alphamod/alpha_004.tga
new file mode 100644 (file)
index 0000000..7bac064
Binary files /dev/null and b/textures/alphamod/alpha_004.tga differ

diff --git a/textures/alphamod/alpha_005.tga b/textures/alphamod/alpha_005.tga
new file mode 100644 (file)
index 0000000..b817d08
Binary files /dev/null and b/textures/alphamod/alpha_005.tga differ

diff --git a/textures/alphamod/alpha_006.tga b/textures/alphamod/alpha_006.tga
new file mode 100644 (file)
index 0000000..31e0716
Binary files /dev/null and b/textures/alphamod/alpha_006.tga differ

diff --git a/textures/alphamod/alpha_007.tga b/textures/alphamod/alpha_007.tga
new file mode 100644 (file)
index 0000000..74d16cd
Binary files /dev/null and b/textures/alphamod/alpha_007.tga differ

diff --git a/textures/alphamod/alpha_008.tga b/textures/alphamod/alpha_008.tga
new file mode 100644 (file)
index 0000000..3dd5931
Binary files /dev/null and b/textures/alphamod/alpha_008.tga differ

diff --git a/textures/alphamod/alpha_009.tga b/textures/alphamod/alpha_009.tga
new file mode 100644 (file)
index 0000000..5b60da3
Binary files /dev/null and b/textures/alphamod/alpha_009.tga differ

diff --git a/textures/alphamod/alpha_010.tga b/textures/alphamod/alpha_010.tga
new file mode 100644 (file)
index 0000000..800f73c
Binary files /dev/null and b/textures/alphamod/alpha_010.tga differ

diff --git a/textures/alphamod/alpha_011.tga b/textures/alphamod/alpha_011.tga
new file mode 100644 (file)
index 0000000..08b1346
Binary files /dev/null and b/textures/alphamod/alpha_011.tga differ

diff --git a/textures/alphamod/alpha_012.tga b/textures/alphamod/alpha_012.tga
new file mode 100644 (file)
index 0000000..21e10d9
Binary files /dev/null and b/textures/alphamod/alpha_012.tga differ

diff --git a/textures/alphamod/alpha_013.tga b/textures/alphamod/alpha_013.tga
new file mode 100644 (file)
index 0000000..7638275
Binary files /dev/null and b/textures/alphamod/alpha_013.tga differ

diff --git a/textures/alphamod/alpha_014.tga b/textures/alphamod/alpha_014.tga
new file mode 100644 (file)
index 0000000..768cd77
Binary files /dev/null and b/textures/alphamod/alpha_014.tga differ

diff --git a/textures/alphamod/alpha_015.tga b/textures/alphamod/alpha_015.tga
new file mode 100644 (file)
index 0000000..441a3e0
Binary files /dev/null and b/textures/alphamod/alpha_015.tga differ

diff --git a/textures/alphamod/alpha_016.tga b/textures/alphamod/alpha_016.tga
new file mode 100644 (file)
index 0000000..c7fbc57
Binary files /dev/null and b/textures/alphamod/alpha_016.tga differ

diff --git a/textures/alphamod/alpha_017.tga b/textures/alphamod/alpha_017.tga
new file mode 100644 (file)
index 0000000..d8677d2
Binary files /dev/null and b/textures/alphamod/alpha_017.tga differ

diff --git a/textures/alphamod/alpha_018.tga b/textures/alphamod/alpha_018.tga
new file mode 100644 (file)
index 0000000..e7e03b6
Binary files /dev/null and b/textures/alphamod/alpha_018.tga differ

diff --git a/textures/alphamod/alpha_019.tga b/textures/alphamod/alpha_019.tga
new file mode 100644 (file)
index 0000000..dd67897
Binary files /dev/null and b/textures/alphamod/alpha_019.tga differ

diff --git a/textures/alphamod/alpha_020.tga b/textures/alphamod/alpha_020.tga
new file mode 100644 (file)
index 0000000..01d28fa
Binary files /dev/null and b/textures/alphamod/alpha_020.tga differ

diff --git a/textures/alphamod/alpha_021.tga b/textures/alphamod/alpha_021.tga
new file mode 100644 (file)
index 0000000..5e9a644
Binary files /dev/null and b/textures/alphamod/alpha_021.tga differ

diff --git a/textures/alphamod/alpha_022.tga b/textures/alphamod/alpha_022.tga
new file mode 100644 (file)
index 0000000..b844f2a
Binary files /dev/null and b/textures/alphamod/alpha_022.tga differ

diff --git a/textures/alphamod/alpha_023.tga b/textures/alphamod/alpha_023.tga
new file mode 100644 (file)
index 0000000..33acf9f
Binary files /dev/null and b/textures/alphamod/alpha_023.tga differ

diff --git a/textures/alphamod/alpha_024.tga b/textures/alphamod/alpha_024.tga
new file mode 100644 (file)
index 0000000..dcb9a88
Binary files /dev/null and b/textures/alphamod/alpha_024.tga differ

diff --git a/textures/alphamod/alpha_025.tga b/textures/alphamod/alpha_025.tga
new file mode 100644 (file)
index 0000000..4057179
Binary files /dev/null and b/textures/alphamod/alpha_025.tga differ

diff --git a/textures/alphamod/alpha_026.tga b/textures/alphamod/alpha_026.tga
new file mode 100644 (file)
index 0000000..b1eb2e1
Binary files /dev/null and b/textures/alphamod/alpha_026.tga differ

diff --git a/textures/alphamod/alpha_027.tga b/textures/alphamod/alpha_027.tga
new file mode 100644 (file)
index 0000000..c45aa7e
Binary files /dev/null and b/textures/alphamod/alpha_027.tga differ

diff --git a/textures/alphamod/alpha_028.tga b/textures/alphamod/alpha_028.tga
new file mode 100644 (file)
index 0000000..a46a6fa
Binary files /dev/null and b/textures/alphamod/alpha_028.tga differ

diff --git a/textures/alphamod/alpha_029.tga b/textures/alphamod/alpha_029.tga
new file mode 100644 (file)
index 0000000..f13ef4f
Binary files /dev/null and b/textures/alphamod/alpha_029.tga differ

diff --git a/textures/alphamod/alpha_030.tga b/textures/alphamod/alpha_030.tga
new file mode 100644 (file)
index 0000000..c48795e
Binary files /dev/null and b/textures/alphamod/alpha_030.tga differ

diff --git a/textures/alphamod/alpha_031.tga b/textures/alphamod/alpha_031.tga
new file mode 100644 (file)
index 0000000..b2e3680
Binary files /dev/null and b/textures/alphamod/alpha_031.tga differ

diff --git a/textures/alphamod/alpha_032.tga b/textures/alphamod/alpha_032.tga
new file mode 100644 (file)
index 0000000..1aa1163
Binary files /dev/null and b/textures/alphamod/alpha_032.tga differ

diff --git a/textures/alphamod/alpha_033.tga b/textures/alphamod/alpha_033.tga
new file mode 100644 (file)
index 0000000..ad446c9
Binary files /dev/null and b/textures/alphamod/alpha_033.tga differ

diff --git a/textures/alphamod/alpha_034.tga b/textures/alphamod/alpha_034.tga
new file mode 100644 (file)
index 0000000..4249b9d
Binary files /dev/null and b/textures/alphamod/alpha_034.tga differ

diff --git a/textures/alphamod/alpha_035.tga b/textures/alphamod/alpha_035.tga
new file mode 100644 (file)
index 0000000..698e1c1
Binary files /dev/null and b/textures/alphamod/alpha_035.tga differ

diff --git a/textures/alphamod/alpha_036.tga b/textures/alphamod/alpha_036.tga
new file mode 100644 (file)
index 0000000..df498c5
Binary files /dev/null and b/textures/alphamod/alpha_036.tga differ

diff --git a/textures/alphamod/alpha_037.tga b/textures/alphamod/alpha_037.tga
new file mode 100644 (file)
index 0000000..c9da185
Binary files /dev/null and b/textures/alphamod/alpha_037.tga differ

diff --git a/textures/alphamod/alpha_038.tga b/textures/alphamod/alpha_038.tga
new file mode 100644 (file)
index 0000000..314346e
Binary files /dev/null and b/textures/alphamod/alpha_038.tga differ

diff --git a/textures/alphamod/alpha_039.tga b/textures/alphamod/alpha_039.tga
new file mode 100644 (file)
index 0000000..224b146
Binary files /dev/null and b/textures/alphamod/alpha_039.tga differ

diff --git a/textures/alphamod/alpha_040.tga b/textures/alphamod/alpha_040.tga
new file mode 100644 (file)
index 0000000..b3d5077
Binary files /dev/null and b/textures/alphamod/alpha_040.tga differ

diff --git a/textures/alphamod/alpha_041.tga b/textures/alphamod/alpha_041.tga
new file mode 100644 (file)
index 0000000..8ceacba
Binary files /dev/null and b/textures/alphamod/alpha_041.tga differ

diff --git a/textures/alphamod/alpha_042.tga b/textures/alphamod/alpha_042.tga
new file mode 100644 (file)
index 0000000..2657127
Binary files /dev/null and b/textures/alphamod/alpha_042.tga differ

diff --git a/textures/alphamod/alpha_043.tga b/textures/alphamod/alpha_043.tga
new file mode 100644 (file)
index 0000000..05156e1
Binary files /dev/null and b/textures/alphamod/alpha_043.tga differ

diff --git a/textures/alphamod/alpha_044.tga b/textures/alphamod/alpha_044.tga
new file mode 100644 (file)
index 0000000..2e8cf72
Binary files /dev/null and b/textures/alphamod/alpha_044.tga differ

diff --git a/textures/alphamod/alpha_045.tga b/textures/alphamod/alpha_045.tga
new file mode 100644 (file)
index 0000000..6cc95ee
Binary files /dev/null and b/textures/alphamod/alpha_045.tga differ

diff --git a/textures/alphamod/alpha_046.tga b/textures/alphamod/alpha_046.tga
new file mode 100644 (file)
index 0000000..d2ed7c8
Binary files /dev/null and b/textures/alphamod/alpha_046.tga differ

diff --git a/textures/alphamod/alpha_047.tga b/textures/alphamod/alpha_047.tga
new file mode 100644 (file)
index 0000000..c0ccf4d
Binary files /dev/null and b/textures/alphamod/alpha_047.tga differ

diff --git a/textures/alphamod/alpha_048.tga b/textures/alphamod/alpha_048.tga
new file mode 100644 (file)
index 0000000..217c87f
Binary files /dev/null and b/textures/alphamod/alpha_048.tga differ

diff --git a/textures/alphamod/alpha_049.tga b/textures/alphamod/alpha_049.tga
new file mode 100644 (file)
index 0000000..5046a27
Binary files /dev/null and b/textures/alphamod/alpha_049.tga differ

diff --git a/textures/alphamod/alpha_050.tga b/textures/alphamod/alpha_050.tga
new file mode 100644 (file)
index 0000000..a7c60d1
Binary files /dev/null and b/textures/alphamod/alpha_050.tga differ

diff --git a/textures/alphamod/alpha_051.tga b/textures/alphamod/alpha_051.tga
new file mode 100644 (file)
index 0000000..ee012b5
Binary files /dev/null and b/textures/alphamod/alpha_051.tga differ

diff --git a/textures/alphamod/alpha_052.tga b/textures/alphamod/alpha_052.tga
new file mode 100644 (file)
index 0000000..95faf23
Binary files /dev/null and b/textures/alphamod/alpha_052.tga differ

diff --git a/textures/alphamod/alpha_053.tga b/textures/alphamod/alpha_053.tga
new file mode 100644 (file)
index 0000000..ea39d2f
Binary files /dev/null and b/textures/alphamod/alpha_053.tga differ

diff --git a/textures/alphamod/alpha_054.tga b/textures/alphamod/alpha_054.tga
new file mode 100644 (file)
index 0000000..50a0e4b
Binary files /dev/null and b/textures/alphamod/alpha_054.tga differ

diff --git a/textures/alphamod/alpha_055.tga b/textures/alphamod/alpha_055.tga
new file mode 100644 (file)
index 0000000..df95331
Binary files /dev/null and b/textures/alphamod/alpha_055.tga differ

diff --git a/textures/alphamod/alpha_056.tga b/textures/alphamod/alpha_056.tga
new file mode 100644 (file)
index 0000000..65d620a
Binary files /dev/null and b/textures/alphamod/alpha_056.tga differ

diff --git a/textures/alphamod/alpha_057.tga b/textures/alphamod/alpha_057.tga
new file mode 100644 (file)
index 0000000..e9a8d50
Binary files /dev/null and b/textures/alphamod/alpha_057.tga differ

diff --git a/textures/alphamod/alpha_058.tga b/textures/alphamod/alpha_058.tga
new file mode 100644 (file)
index 0000000..9027905
Binary files /dev/null and b/textures/alphamod/alpha_058.tga differ

diff --git a/textures/alphamod/alpha_059.tga b/textures/alphamod/alpha_059.tga
new file mode 100644 (file)
index 0000000..398c3e1
Binary files /dev/null and b/textures/alphamod/alpha_059.tga differ

diff --git a/textures/alphamod/alpha_060.tga b/textures/alphamod/alpha_060.tga
new file mode 100644 (file)
index 0000000..f5da427
Binary files /dev/null and b/textures/alphamod/alpha_060.tga differ

diff --git a/textures/alphamod/alpha_061.tga b/textures/alphamod/alpha_061.tga
new file mode 100644 (file)
index 0000000..59f2b6c
Binary files /dev/null and b/textures/alphamod/alpha_061.tga differ

diff --git a/textures/alphamod/alpha_062.tga b/textures/alphamod/alpha_062.tga
new file mode 100644 (file)
index 0000000..c6283e1
Binary files /dev/null and b/textures/alphamod/alpha_062.tga differ

diff --git a/textures/alphamod/alpha_063.tga b/textures/alphamod/alpha_063.tga
new file mode 100644 (file)
index 0000000..f3f3176
Binary files /dev/null and b/textures/alphamod/alpha_063.tga differ

diff --git a/textures/alphamod/alpha_064.tga b/textures/alphamod/alpha_064.tga
new file mode 100644 (file)
index 0000000..680321a
Binary files /dev/null and b/textures/alphamod/alpha_064.tga differ

diff --git a/textures/alphamod/alpha_065.tga b/textures/alphamod/alpha_065.tga
new file mode 100644 (file)
index 0000000..76fe625
Binary files /dev/null and b/textures/alphamod/alpha_065.tga differ

diff --git a/textures/alphamod/alpha_066.tga b/textures/alphamod/alpha_066.tga
new file mode 100644 (file)
index 0000000..37519f8
Binary files /dev/null and b/textures/alphamod/alpha_066.tga differ

diff --git a/textures/alphamod/alpha_067.tga b/textures/alphamod/alpha_067.tga
new file mode 100644 (file)
index 0000000..b2ce665
Binary files /dev/null and b/textures/alphamod/alpha_067.tga differ

diff --git a/textures/alphamod/alpha_068.tga b/textures/alphamod/alpha_068.tga
new file mode 100644 (file)
index 0000000..455aac6
Binary files /dev/null and b/textures/alphamod/alpha_068.tga differ

diff --git a/textures/alphamod/alpha_069.tga b/textures/alphamod/alpha_069.tga
new file mode 100644 (file)
index 0000000..65ede8f
Binary files /dev/null and b/textures/alphamod/alpha_069.tga differ

diff --git a/textures/alphamod/alpha_070.tga b/textures/alphamod/alpha_070.tga
new file mode 100644 (file)
index 0000000..f1e6c39
Binary files /dev/null and b/textures/alphamod/alpha_070.tga differ

diff --git a/textures/alphamod/alpha_071.tga b/textures/alphamod/alpha_071.tga
new file mode 100644 (file)
index 0000000..3755d55
Binary files /dev/null and b/textures/alphamod/alpha_071.tga differ

diff --git a/textures/alphamod/alpha_072.tga b/textures/alphamod/alpha_072.tga
new file mode 100644 (file)
index 0000000..41db8d5
Binary files /dev/null and b/textures/alphamod/alpha_072.tga differ

diff --git a/textures/alphamod/alpha_073.tga b/textures/alphamod/alpha_073.tga
new file mode 100644 (file)
index 0000000..a1dfca0
Binary files /dev/null and b/textures/alphamod/alpha_073.tga differ

diff --git a/textures/alphamod/alpha_074.tga b/textures/alphamod/alpha_074.tga
new file mode 100644 (file)
index 0000000..e43d954
Binary files /dev/null and b/textures/alphamod/alpha_074.tga differ

diff --git a/textures/alphamod/alpha_075.tga b/textures/alphamod/alpha_075.tga
new file mode 100644 (file)
index 0000000..8e06f72
Binary files /dev/null and b/textures/alphamod/alpha_075.tga differ

diff --git a/textures/alphamod/alpha_076.tga b/textures/alphamod/alpha_076.tga
new file mode 100644 (file)
index 0000000..f72f852
Binary files /dev/null and b/textures/alphamod/alpha_076.tga differ

diff --git a/textures/alphamod/alpha_077.tga b/textures/alphamod/alpha_077.tga
new file mode 100644 (file)
index 0000000..e648e29
Binary files /dev/null and b/textures/alphamod/alpha_077.tga differ

diff --git a/textures/alphamod/alpha_078.tga b/textures/alphamod/alpha_078.tga
new file mode 100644 (file)
index 0000000..24196cc
Binary files /dev/null and b/textures/alphamod/alpha_078.tga differ

diff --git a/textures/alphamod/alpha_079.tga b/textures/alphamod/alpha_079.tga
new file mode 100644 (file)
index 0000000..58649f1
Binary files /dev/null and b/textures/alphamod/alpha_079.tga differ

diff --git a/textures/alphamod/alpha_080.tga b/textures/alphamod/alpha_080.tga
new file mode 100644 (file)
index 0000000..0888f9f
Binary files /dev/null and b/textures/alphamod/alpha_080.tga differ

diff --git a/textures/alphamod/alpha_081.tga b/textures/alphamod/alpha_081.tga
new file mode 100644 (file)
index 0000000..aa5f0db
Binary files /dev/null and b/textures/alphamod/alpha_081.tga differ

diff --git a/textures/alphamod/alpha_082.tga b/textures/alphamod/alpha_082.tga
new file mode 100644 (file)
index 0000000..bdebce2
Binary files /dev/null and b/textures/alphamod/alpha_082.tga differ

diff --git a/textures/alphamod/alpha_083.tga b/textures/alphamod/alpha_083.tga
new file mode 100644 (file)
index 0000000..b640610
Binary files /dev/null and b/textures/alphamod/alpha_083.tga differ

diff --git a/textures/alphamod/alpha_084.tga b/textures/alphamod/alpha_084.tga
new file mode 100644 (file)
index 0000000..cb31b16
Binary files /dev/null and b/textures/alphamod/alpha_084.tga differ

diff --git a/textures/alphamod/alpha_085.tga b/textures/alphamod/alpha_085.tga
new file mode 100644 (file)
index 0000000..14222cd
Binary files /dev/null and b/textures/alphamod/alpha_085.tga differ

diff --git a/textures/alphamod/alpha_086.tga b/textures/alphamod/alpha_086.tga
new file mode 100644 (file)
index 0000000..2e24d8f
Binary files /dev/null and b/textures/alphamod/alpha_086.tga differ

diff --git a/textures/alphamod/alpha_087.tga b/textures/alphamod/alpha_087.tga
new file mode 100644 (file)
index 0000000..074c745
Binary files /dev/null and b/textures/alphamod/alpha_087.tga differ

diff --git a/textures/alphamod/alpha_088.tga b/textures/alphamod/alpha_088.tga
new file mode 100644 (file)
index 0000000..eb4886e
Binary files /dev/null and b/textures/alphamod/alpha_088.tga differ

diff --git a/textures/alphamod/alpha_089.tga b/textures/alphamod/alpha_089.tga
new file mode 100644 (file)
index 0000000..c63d5e3
Binary files /dev/null and b/textures/alphamod/alpha_089.tga differ

diff --git a/textures/alphamod/alpha_090.tga b/textures/alphamod/alpha_090.tga
new file mode 100644 (file)
index 0000000..27b99d5
Binary files /dev/null and b/textures/alphamod/alpha_090.tga differ

diff --git a/textures/alphamod/alpha_091.tga b/textures/alphamod/alpha_091.tga
new file mode 100644 (file)
index 0000000..5a5c789
Binary files /dev/null and b/textures/alphamod/alpha_091.tga differ

diff --git a/textures/alphamod/alpha_092.tga b/textures/alphamod/alpha_092.tga
new file mode 100644 (file)
index 0000000..f6f3296
Binary files /dev/null and b/textures/alphamod/alpha_092.tga differ

diff --git a/textures/alphamod/alpha_093.tga b/textures/alphamod/alpha_093.tga
new file mode 100644 (file)
index 0000000..9ad20f1
Binary files /dev/null and b/textures/alphamod/alpha_093.tga differ

diff --git a/textures/alphamod/alpha_094.tga b/textures/alphamod/alpha_094.tga
new file mode 100644 (file)
index 0000000..85b49e9
Binary files /dev/null and b/textures/alphamod/alpha_094.tga differ

diff --git a/textures/alphamod/alpha_095.tga b/textures/alphamod/alpha_095.tga
new file mode 100644 (file)
index 0000000..c672023
Binary files /dev/null and b/textures/alphamod/alpha_095.tga differ

diff --git a/textures/alphamod/alpha_096.tga b/textures/alphamod/alpha_096.tga
new file mode 100644 (file)
index 0000000..e5b575d
Binary files /dev/null and b/textures/alphamod/alpha_096.tga differ

diff --git a/textures/alphamod/alpha_097.tga b/textures/alphamod/alpha_097.tga
new file mode 100644 (file)
index 0000000..e0b45d1
Binary files /dev/null and b/textures/alphamod/alpha_097.tga differ

diff --git a/textures/alphamod/alpha_098.tga b/textures/alphamod/alpha_098.tga
new file mode 100644 (file)
index 0000000..3659e03
Binary files /dev/null and b/textures/alphamod/alpha_098.tga differ

diff --git a/textures/alphamod/alpha_099.tga b/textures/alphamod/alpha_099.tga
new file mode 100644 (file)
index 0000000..64a5a3a
Binary files /dev/null and b/textures/alphamod/alpha_099.tga differ

diff --git a/textures/alphamod/alpha_100.tga b/textures/alphamod/alpha_100.tga
new file mode 100644 (file)
index 0000000..73c4c3b
Binary files /dev/null and b/textures/alphamod/alpha_100.tga differ

diff --git a/textures/alphamod/make.sh b/textures/alphamod/make.sh
new file mode 100644 (file)
index 0000000..4f7e30e
--- /dev/null
+++ b/textures/alphamod/make.sh
@@ -0,0 +1,40 @@
+for x in `seq 0 100`; do
+       nnn=`printf %03d $x`
+       a=$(($x * 20 / 9))
+       b=$((33 + $x * 20 / 9))
+       convert \
+               -size 128x128 \
+               xc:"rgb($a,$a,$a)" \
+               -fill "rgb($b,$b,$b)" \
+               -draw "rectangle 0,0 63,63" \
+               -draw "rectangle 64,64 127,127" \
+               -gravity center \
+               -font "Bitstream-Vera-Sans-Bold" \
+               -pointsize 24 \
+               -fill white \
+               -draw "text -1,-1 '$x%'" \
+               -draw "text 0,-1 '$x%'" \
+               -draw "text 1,-1 '$x%'" \
+               -draw "text -1,0 '$x%'" \
+               -draw "text 1,0 '$x%'" \
+               -draw "text -1,1 '$x%'" \
+               -draw "text 0,1 '$x%'" \
+               -draw "text 1,1 '$x%'" \
+               -fill black \
+               -draw "text 0,0 '$x%'" \
+               PNM:- |\
+               pamtotga -mono -norle > "alpha_$nnn.tga"
+       cat <<EOF
+textures/alphamod/alpha_$nnn
+{
+       qer_trans 0.30
+       surfaceparm nodraw
+       surfaceparm nonsolid
+       surfaceparm skip
+       surfaceparm detail
+       surfaceparm trans
+       q3map_alphaMod volume
+       q3map_alphaMod const ${nnn%??}.${nnn#?}
+}
+EOF
+done > ../../scripts/alphamod.shader

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt.tga b/textures/map_g-23/conveyorbelt/conveyorbelt.tga
new file mode 100644 (file)
index 0000000..0ec7bf1
Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt.tga differ

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga
new file mode 100644 (file)
index 0000000..75fcbaa
Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt_gloss.tga differ

diff --git a/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga
new file mode 100644 (file)
index 0000000..5a2d8ea
Binary files /dev/null and b/textures/map_g-23/conveyorbelt/conveyorbelt_norm.tga differ