Merge remote-tracking branch 'origin/matthiaskrgr/exploding_barrels'

diff --git a/maps/abyss.map b/maps/abyss.map
index d035a31e867e5cf936e7622065b093f7ddd45117..713f18f2946f3b75436beb47ddcaf177b26882ce 100644 (file)
--- a/maps/abyss.map
+++ b/maps/abyss.map
@@ -110137,3 +110137,23 @@ brushDef
 "angle" "-179.999985"
 "modelscale_vec" "1.000000 8.000000 6.000000"
 }
+{
+"classname" "info_autoscreenshot"
+"origin" "-475.53952 -1239.74243 394.492096"
+"angles" "12.8045654 41.050415 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "2202.486084 -2137.091309 81.552094"
+"angles" "12.801977 161.243683 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "-360.787537 612.514954 739.474731"
+"angles" "27.176882 -66.188782 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "5478.990723 811.229675 106.627594"
+"angles" "-1.572815 -35.407349 0"
+}

diff --git a/maps/dance.map b/maps/dance.map
index 4d770d6cf7292ad995f862ba42cbc2e9e5e76a17..92555f5ba840e3a97f265f5d6d00a681dc62c38a 100644 (file)
--- a/maps/dance.map
+++ b/maps/dance.map
@@ -755,102 +755,6 @@
 ( 2048 -2304 0 ) ( 1984 -2368 -128 ) ( 2048 -2304 -128 ) narmorx/base-concrete05_red 256 0 0 0.25 0.25 0 0 0
 }
 {
-( 496 -2000 81 ) ( 496 -1968 81 ) ( 528 -2000 81 ) effects_item/respawnring-red 64 64 0 0.5 0.5 0 0 0
-( 496 -2016 88 ) ( 528 -2016 88 ) ( 496 -2016 80 ) common/nodraw 0 64 0 0.25 0.25 0 0 0
-( 480 -2000 88 ) ( 480 -2000 80 ) ( 480 -1968 88 ) common/nodraw 0 64 0 0.25 0.25 0 0 0
-( 528 -1968 80 ) ( 496 -1968 80 ) ( 528 -2000 80 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 528 -1952 80 ) ( 528 -1952 88 ) ( 496 -1952 80 ) common/nodraw 0 64 0 0.25 0.25 0 0 0
-( 544 -1968 80 ) ( 544 -2000 80 ) ( 544 -1968 88 ) common/nodraw 0 64 0 0.25 0.25 0 0 0
-}
-{
-( 208 -2416 65 ) ( 208 -2384 65 ) ( 240 -2416 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 208 -2432 72 ) ( 240 -2432 72 ) ( 208 -2432 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 192 -2416 72 ) ( 192 -2416 64 ) ( 192 -2384 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 240 -2384 64 ) ( 208 -2384 64 ) ( 240 -2416 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 240 -2368 64 ) ( 240 -2368 72 ) ( 208 -2368 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -2384 64 ) ( 256 -2416 64 ) ( 256 -2384 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 208 -2352 65 ) ( 208 -2320 65 ) ( 240 -2352 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 208 -2368 72 ) ( 240 -2368 72 ) ( 208 -2368 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 192 -2352 72 ) ( 192 -2352 64 ) ( 192 -2320 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 240 -2320 64 ) ( 208 -2320 64 ) ( 240 -2352 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 240 -2304 64 ) ( 240 -2304 72 ) ( 208 -2304 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -2320 64 ) ( 256 -2352 64 ) ( 256 -2320 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 272 -2416 65 ) ( 272 -2384 65 ) ( 304 -2416 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 272 -2432 72 ) ( 304 -2432 72 ) ( 272 -2432 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -2416 72 ) ( 256 -2416 64 ) ( 256 -2384 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 304 -2384 64 ) ( 272 -2384 64 ) ( 304 -2416 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 304 -2368 64 ) ( 304 -2368 72 ) ( 272 -2368 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 320 -2384 64 ) ( 320 -2416 64 ) ( 320 -2384 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 1392 -1552 65 ) ( 1392 -1520 65 ) ( 1424 -1552 65 ) effects_item/respawnring-red 64 64 0 0.5 0.5 0 0 0
-( 1392 -1568 72 ) ( 1424 -1568 72 ) ( 1392 -1568 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1376 -1552 72 ) ( 1376 -1552 64 ) ( 1376 -1520 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 1424 -1520 64 ) ( 1392 -1520 64 ) ( 1424 -1552 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1424 -1504 64 ) ( 1424 -1504 72 ) ( 1392 -1504 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1440 -1520 64 ) ( 1440 -1552 64 ) ( 1440 -1520 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 1392 -1488 65 ) ( 1392 -1456 65 ) ( 1424 -1488 65 ) effects_item/respawnring-red 64 64 0 0.5 0.5 0 0 0
-( 1392 -1504 72 ) ( 1424 -1504 72 ) ( 1392 -1504 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1376 -1488 72 ) ( 1376 -1488 64 ) ( 1376 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 1424 -1456 64 ) ( 1392 -1456 64 ) ( 1424 -1488 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1424 -1440 64 ) ( 1424 -1440 72 ) ( 1392 -1440 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 1440 -1456 64 ) ( 1440 -1488 64 ) ( 1440 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 1872 -1808 -323 ) ( 1840 -1808 -323 ) ( 1872 -1776 -323 ) effects_item/respawnring-red 64 64 -90 0.5 0.5 0 0 0
-( 1888 -1808 -316 ) ( 1888 -1776 -316 ) ( 1888 -1808 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1872 -1824 -316 ) ( 1872 -1824 -324 ) ( 1840 -1824 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( 1840 -1776 -324 ) ( 1840 -1808 -324 ) ( 1872 -1776 -324 ) common/nodraw 128 128 -90 0.5 0.5 0 0 0
-( 1824 -1776 -324 ) ( 1824 -1776 -316 ) ( 1824 -1808 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1840 -1760 -324 ) ( 1872 -1760 -324 ) ( 1840 -1760 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-}
-{
-( 1936 -1872 -323 ) ( 1904 -1872 -323 ) ( 1936 -1840 -323 ) effects_item/respawnring-red 64 64 -90 0.5 0.5 0 0 0
-( 1952 -1872 -316 ) ( 1952 -1840 -316 ) ( 1952 -1872 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1936 -1888 -316 ) ( 1936 -1888 -324 ) ( 1904 -1888 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( 1904 -1840 -324 ) ( 1904 -1872 -324 ) ( 1936 -1840 -324 ) common/nodraw 128 128 -90 0.5 0.5 0 0 0
-( 1888 -1840 -324 ) ( 1888 -1840 -316 ) ( 1888 -1872 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1904 -1824 -324 ) ( 1936 -1824 -324 ) ( 1904 -1824 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-}
-{
-( 1936 -1808 -323 ) ( 1904 -1808 -323 ) ( 1936 -1776 -323 ) effects_item/respawnring-red 64 64 -90 0.5 0.5 0 0 0
-( 1952 -1808 -316 ) ( 1952 -1776 -316 ) ( 1952 -1808 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1936 -1824 -316 ) ( 1936 -1824 -324 ) ( 1904 -1824 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( 1904 -1776 -324 ) ( 1904 -1808 -324 ) ( 1936 -1776 -324 ) common/nodraw 128 128 -90 0.5 0.5 0 0 0
-( 1888 -1776 -324 ) ( 1888 -1776 -316 ) ( 1888 -1808 -324 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1904 -1760 -324 ) ( 1936 -1760 -324 ) ( 1904 -1760 -316 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-}
-{
-( 1328 656 97 ) ( 1296 656 97 ) ( 1328 688 97 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1344 656 104 ) ( 1344 688 104 ) ( 1344 656 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1328 640 104 ) ( 1328 640 96 ) ( 1296 640 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1296 688 96 ) ( 1296 656 96 ) ( 1328 688 96 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1280 688 96 ) ( 1280 688 104 ) ( 1280 656 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1296 704 96 ) ( 1328 704 96 ) ( 1296 704 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-}
-{
-( 1392 592 97 ) ( 1360 592 97 ) ( 1392 624 97 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1408 592 104 ) ( 1408 624 104 ) ( 1408 592 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1392 576 104 ) ( 1392 576 96 ) ( 1360 576 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1360 624 96 ) ( 1360 592 96 ) ( 1392 624 96 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1344 624 96 ) ( 1344 624 104 ) ( 1344 592 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1360 640 96 ) ( 1392 640 96 ) ( 1360 640 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-}
-{
-( 1392 656 97 ) ( 1360 656 97 ) ( 1392 688 97 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1408 656 104 ) ( 1408 688 104 ) ( 1408 656 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1392 640 104 ) ( 1392 640 96 ) ( 1360 640 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1360 688 96 ) ( 1360 656 96 ) ( 1392 688 96 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-( 1344 688 96 ) ( 1344 688 104 ) ( 1344 656 96 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1360 704 96 ) ( 1392 704 96 ) ( 1360 704 104 ) common/nodraw 160 128 0 0.25 0.25 0 0 0
-}
-{
 ( -1216 -1024 -256 ) ( -1216 192 -256 ) ( 256 -1024 -256 ) narmorx/base-concrete05 0 0 0 0.25 0.25 0 0 0
 ( -1344 -1408 -320 ) ( 128 -1408 -320 ) ( -1344 -1408 -448 ) common/caulk 0 0 90 0.5 -0.5 0 0 0
 ( 1536 -1280 64 ) ( 1536 -1216 -64 ) ( 1536 -1280 -64 ) exx/trim-01 0 256 90 0.25 0.25 0 0 0
@@ -876,70 +780,6 @@
 ( 640 256 -64 ) ( 672 224 -64 ) ( 640 256 64 ) exx/base-metal04 256 0 0 0.25 0.25 0 0 0
 }
 {
-( 240 -1488 65 ) ( 240 -1520 65 ) ( 208 -1488 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 240 -1472 72 ) ( 208 -1472 72 ) ( 240 -1472 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -1488 72 ) ( 256 -1488 64 ) ( 256 -1520 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 208 -1520 64 ) ( 240 -1520 64 ) ( 208 -1488 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 208 -1536 64 ) ( 208 -1536 72 ) ( 240 -1536 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 192 -1520 64 ) ( 192 -1488 64 ) ( 192 -1520 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 240 -1424 65 ) ( 240 -1456 65 ) ( 208 -1424 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 240 -1408 72 ) ( 208 -1408 72 ) ( 240 -1408 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -1424 72 ) ( 256 -1424 64 ) ( 256 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 208 -1456 64 ) ( 240 -1456 64 ) ( 208 -1424 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 208 -1472 64 ) ( 208 -1472 72 ) ( 240 -1472 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 192 -1456 64 ) ( 192 -1424 64 ) ( 192 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
-( 784 -2352 65 ) ( 784 -2320 65 ) ( 816 -2352 65 ) effects_item/respawnring-red -0 -0 0 0.5 0.5 0 0 0
-( 784 -2368 72 ) ( 816 -2368 72 ) ( 784 -2368 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 768 -2352 72 ) ( 768 -2352 64 ) ( 768 -2320 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-( 816 -2320 64 ) ( 784 -2320 64 ) ( 816 -2352 64 ) common/nodraw -0 -0 0 0.25 0.25 0 0 0
-( 816 -2304 64 ) ( 816 -2304 72 ) ( 784 -2304 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 832 -2320 64 ) ( 832 -2352 64 ) ( 832 -2320 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-}
-{
-( 720 -2416 65 ) ( 720 -2384 65 ) ( 752 -2416 65 ) effects_item/respawnring-red -0 -0 0 0.5 0.5 0 0 0
-( 720 -2432 72 ) ( 752 -2432 72 ) ( 720 -2432 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 704 -2416 72 ) ( 704 -2416 64 ) ( 704 -2384 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-( 752 -2384 64 ) ( 720 -2384 64 ) ( 752 -2416 64 ) common/nodraw -0 -0 0 0.25 0.25 0 0 0
-( 752 -2368 64 ) ( 752 -2368 72 ) ( 720 -2368 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 768 -2384 64 ) ( 768 -2416 64 ) ( 768 -2384 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-}
-{
-( 784 -2416 65 ) ( 784 -2384 65 ) ( 816 -2416 65 ) effects_item/respawnring-red -0 -0 0 0.5 0.5 0 0 0
-( 784 -2432 72 ) ( 816 -2432 72 ) ( 784 -2432 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 768 -2416 72 ) ( 768 -2416 64 ) ( 768 -2384 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-( 816 -2384 64 ) ( 784 -2384 64 ) ( 816 -2416 64 ) common/nodraw -0 -0 0 0.25 0.25 0 0 0
-( 816 -2368 64 ) ( 816 -2368 72 ) ( 784 -2368 64 ) common/nodraw -0 0 0 0.25 0.00390625 0 0 0
-( 832 -2384 64 ) ( 832 -2416 64 ) ( 832 -2384 72 ) common/nodraw 0 0 0 0.25 0.00390625 0 0 0
-}
-{
-( 1904 -2320 -323 ) ( 1904 -2288 -323 ) ( 1936 -2320 -323 ) effects_item/respawnring-red 64 64 180 0.5 0.5 0 0 0
-( 1904 -2336 -316 ) ( 1936 -2336 -316 ) ( 1904 -2336 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1888 -2320 -316 ) ( 1888 -2320 -324 ) ( 1888 -2288 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1936 -2288 -324 ) ( 1904 -2288 -324 ) ( 1936 -2320 -324 ) common/nodraw 256 128 180 0.5 0.5 0 0 0
-( 1936 -2272 -324 ) ( 1936 -2272 -316 ) ( 1904 -2272 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1952 -2288 -324 ) ( 1952 -2320 -324 ) ( 1952 -2288 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-}
-{
-( 1840 -2384 -323 ) ( 1840 -2352 -323 ) ( 1872 -2384 -323 ) effects_item/respawnring-red 64 64 180 0.5 0.5 0 0 0
-( 1840 -2400 -316 ) ( 1872 -2400 -316 ) ( 1840 -2400 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1824 -2384 -316 ) ( 1824 -2384 -324 ) ( 1824 -2352 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1872 -2352 -324 ) ( 1840 -2352 -324 ) ( 1872 -2384 -324 ) common/nodraw 256 128 180 0.5 0.5 0 0 0
-( 1872 -2336 -324 ) ( 1872 -2336 -316 ) ( 1840 -2336 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1888 -2352 -324 ) ( 1888 -2384 -324 ) ( 1888 -2352 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-}
-{
-( 1904 -2384 -323 ) ( 1904 -2352 -323 ) ( 1936 -2384 -323 ) effects_item/respawnring-red 64 64 180 0.5 0.5 0 0 0
-( 1904 -2400 -316 ) ( 1936 -2400 -316 ) ( 1904 -2400 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1888 -2384 -316 ) ( 1888 -2384 -324 ) ( 1888 -2352 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-( 1936 -2352 -324 ) ( 1904 -2352 -324 ) ( 1936 -2384 -324 ) common/nodraw 256 128 180 0.5 0.5 0 0 0
-( 1936 -2336 -324 ) ( 1936 -2336 -316 ) ( 1904 -2336 -324 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( 1952 -2352 -324 ) ( 1952 -2384 -324 ) ( 1952 -2352 -316 ) common/nodraw 128 24 0 -0.5 0.5 0 0 0
-}
-{
 ( 1088 -128 96 ) ( 1088 320 96 ) ( 1472 -128 96 ) exx/floor-clang01 256 256 0 0.25 0.25 0 0 0
 ( 1472 320 80 ) ( 1088 320 80 ) ( 1472 -128 80 ) exx/floor-clang01 256 256 0 0.25 0.25 0 0 0
 ( 1408 320 480 ) ( 1376 352 352 ) ( 1408 320 352 ) narmorx/base-concrete05_red 256 192 0 0.25 0.25 0 0 0
@@ -989,30 +829,6 @@
 ( 600 -2368 -384 ) ( 584 -2352 -400 ) ( 584 -2352 -384 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1296 -1200 65 ) ( 1296 -1168 65 ) ( 1328 -1200 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1296 -1216 72 ) ( 1328 -1216 72 ) ( 1296 -1216 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1280 -1200 72 ) ( 1280 -1200 64 ) ( 1280 -1168 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1328 -1168 64 ) ( 1296 -1168 64 ) ( 1328 -1200 64 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1328 -1152 64 ) ( 1328 -1152 72 ) ( 1296 -1152 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1344 -1168 64 ) ( 1344 -1200 64 ) ( 1344 -1168 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-}
-{
-( 1360 -1200 65 ) ( 1360 -1168 65 ) ( 1392 -1200 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1360 -1216 72 ) ( 1392 -1216 72 ) ( 1360 -1216 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1344 -1200 72 ) ( 1344 -1200 64 ) ( 1344 -1168 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1392 -1168 64 ) ( 1360 -1168 64 ) ( 1392 -1200 64 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1392 -1152 64 ) ( 1392 -1152 72 ) ( 1360 -1152 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1408 -1168 64 ) ( 1408 -1200 64 ) ( 1408 -1168 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-}
-{
-( 1040 -624 -191 ) ( 1040 -656 -191 ) ( 1008 -624 -191 ) effects_item/respawnring-red 64.0017089844 64.0010986328 0 0.5000003576 0.5000004768 0 0 0
-( 1040 -608 -104 ) ( 1008 -608 -104 ) ( 1040 -608 -112 ) common/nodraw 87.8453369141 91.8453369141 -135 0.5 0.5 0 0 0
-( 1056 -624 -104 ) ( 1056 -624 -112 ) ( 1056 -656 -104 ) common/nodraw 24.6256408691 28.6256408691 -135 0.5 0.5 0 0 0
-( 1008 -656 -192 ) ( 1040 -656 -192 ) ( 1008 -624 -192 ) common/nodraw 112.4710006714 195.2195739746 -135 0.5 0.5 0 0 0
-( 1008 -672 -112 ) ( 1008 -672 -104 ) ( 1040 -672 -112 ) common/nodraw 87.8453369141 91.8453369141 -135 0.5 0.5 0 0 0
-( 992 -656 -112 ) ( 992 -624 -112 ) ( 992 -656 -104 ) common/nodraw 24.6256408691 28.6256408691 -135 0.5 0.5 0 0 0
-}
-{
 ( -1216 -1024 -196 ) ( -1216 192 -196 ) ( 256 -1024 -196 ) exx/wall-bplate06 31.0579986572 129.5608520508 45 0.25 0.25 0 0 0
 ( 0 -904 -320 ) ( 0 -904 -448 ) ( 0 312 -320 ) common/caulk 240 0 0 -0.5 0.5 0 0 0
 ( 256 192 -208 ) ( -1216 192 -208 ) ( 256 -1024 -208 ) common/caulk 256 128 180 0.5 0.5 0 0 0
@@ -1029,38 +845,6 @@
 ( 0 -448 64 ) ( 32 -448 -64 ) ( 0 -448 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( 1360 -1136 65 ) ( 1360 -1104 65 ) ( 1392 -1136 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 1360 -1152 72 ) ( 1392 -1152 72 ) ( 1360 -1152 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1344 -1136 72 ) ( 1344 -1136 64 ) ( 1344 -1104 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1392 -1104 64 ) ( 1360 -1104 64 ) ( 1392 -1136 64 ) common/nodraw 128 128 0 0.25 0.25 0 0 0
-( 1392 -1088 64 ) ( 1392 -1088 72 ) ( 1360 -1088 64 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-( 1408 -1104 64 ) ( 1408 -1136 64 ) ( 1408 -1104 72 ) common/nodraw 128 0 0 0.25 0.25 0 0 0
-}
-{
-( 704 -656 65 ) ( 704 -624 65 ) ( 736 -656 65 ) effects_item/respawnring-red 32 64 0 0.5 0.5 0 0 0
-( 704 -672 72 ) ( 736 -672 72 ) ( 704 -672 64 ) common/nodraw 64 0 0 0.25 0.00390625 0 0 0
-( 688 -656 72 ) ( 688 -656 64 ) ( 688 -624 72 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-( 736 -624 64 ) ( 704 -624 64 ) ( 736 -656 64 ) common/nodraw 64 128 0 0.25 0.25 0 0 0
-( 736 -608 64 ) ( 736 -608 72 ) ( 704 -608 64 ) common/nodraw 64 0 0 0.25 0.00390625 0 0 0
-( 752 -624 64 ) ( 752 -656 64 ) ( 752 -624 72 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-}
-{
-( 624 -672 65 ) ( 624 -640 65 ) ( 656 -672 65 ) effects_item/respawnring-red 64 32 0 0.5 0.5 0 0 0
-( 624 -688 72 ) ( 656 -688 72 ) ( 624 -688 64 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-( 608 -672 72 ) ( 608 -672 64 ) ( 608 -640 72 ) common/nodraw 192 0 0 0.25 0.00390625 0 0 0
-( 656 -640 64 ) ( 624 -640 64 ) ( 656 -672 64 ) common/nodraw 128 64 0 0.25 0.25 0 0 0
-( 656 -624 64 ) ( 656 -624 72 ) ( 624 -624 64 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-( 672 -640 64 ) ( 672 -672 64 ) ( 672 -640 72 ) common/nodraw 192 0 0 0.25 0.00390625 0 0 0
-}
-{
-( 768 -592 65 ) ( 768 -560 65 ) ( 800 -592 65 ) effects_item/respawnring-red 32 64 0 0.5 0.5 0 0 0
-( 768 -608 72 ) ( 800 -608 72 ) ( 768 -608 64 ) common/nodraw 64 0 0 0.25 0.00390625 0 0 0
-( 752 -592 72 ) ( 752 -592 64 ) ( 752 -560 72 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-( 800 -560 64 ) ( 768 -560 64 ) ( 800 -592 64 ) common/nodraw 64 128 0 0.25 0.25 0 0 0
-( 800 -544 64 ) ( 800 -544 72 ) ( 768 -544 64 ) common/nodraw 64 0 0 0.25 0.00390625 0 0 0
-( 816 -560 64 ) ( 816 -592 64 ) ( 816 -560 72 ) common/nodraw 128 0 0 0.25 0.00390625 0 0 0
-}
-{
 ( 1152 -1600 0 ) ( 1152 -1600 64 ) ( 1088 -1600 0 ) common/caulk 0 0 0 -0.5 0.5 0 0 0
 ( 1152 -1600 -384 ) ( 1152 -1664 -384 ) ( 1152 -1600 -320 ) common/caulk 128 0 0 -0.5 0.5 0 0 0
 ( 1152 -1664 -64 ) ( 1088 -1600 -64 ) ( 1152 -1664 64 ) exx/trim-01 0 256 90 0.25 0.25 0 0 0
@@ -5427,14 +5211,6 @@ exx/wall-bigrib02
 ( 0 -1024 64 ) ( 16 -1040 -64 ) ( 0 -1024 -64 ) common/caulk -0 0 0 0.25 0.25 0 0 0
 }
 {
-( 304 -1424 65 ) ( 304 -1456 65 ) ( 272 -1424 65 ) effects_item/respawnring-red 0 0 0 0.5 0.5 0 0 0
-( 304 -1408 72 ) ( 272 -1408 72 ) ( 304 -1408 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 320 -1424 72 ) ( 320 -1424 64 ) ( 320 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-( 272 -1456 64 ) ( 304 -1456 64 ) ( 272 -1424 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 272 -1472 64 ) ( 272 -1472 72 ) ( 304 -1472 64 ) common/nodraw 0 0 0 0.25 0.25 0 0 0
-( 256 -1456 64 ) ( 256 -1424 64 ) ( 256 -1456 72 ) common/nodraw -0 0 0 0.25 0.25 0 0 0
-}
-{
 patchDef2
 {
 exx/wall-bigrib02
@@ -10294,102 +10070,6 @@ facility114x/misc-tube
 ( -2048 2304 0 ) ( -1984 2368 -128 ) ( -2048 2304 -128 ) narmorx/base-concrete05_blue 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -496 2000 81 ) ( -496 1968 81 ) ( -528 2000 81 ) effects_item/respawnring-blue 64 64 180 0.5 0.5 0 0 0
-( -496 2016 88 ) ( -528 2016 88 ) ( -496 2016 80 ) common/nodraw 0 64 0 -0.25 0.25 0 0 0
-( -480 2000 88 ) ( -480 2000 80 ) ( -480 1968 88 ) common/nodraw 0 64 0 -0.25 0.25 0 0 0
-( -528 1968 80 ) ( -496 1968 80 ) ( -528 2000 80 ) common/nodraw 0 0 180 0.25 0.25 0 0 0
-( -528 1952 80 ) ( -528 1952 88 ) ( -496 1952 80 ) common/nodraw 0 64 0 -0.25 0.25 0 0 0
-( -544 1968 80 ) ( -544 2000 80 ) ( -544 1968 88 ) common/nodraw 0 64 0 -0.25 0.25 0 0 0
-}
-{
-( -208 2416 65 ) ( -208 2384 65 ) ( -240 2416 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -208 2432 72 ) ( -240 2432 72 ) ( -208 2432 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -192 2416 72 ) ( -192 2416 64 ) ( -192 2384 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -240 2384 64 ) ( -208 2384 64 ) ( -240 2416 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -240 2368 64 ) ( -240 2368 72 ) ( -208 2368 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 2384 64 ) ( -256 2416 64 ) ( -256 2384 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -208 2352 65 ) ( -208 2320 65 ) ( -240 2352 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -208 2368 72 ) ( -240 2368 72 ) ( -208 2368 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -192 2352 72 ) ( -192 2352 64 ) ( -192 2320 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -240 2320 64 ) ( -208 2320 64 ) ( -240 2352 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -240 2304 64 ) ( -240 2304 72 ) ( -208 2304 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 2320 64 ) ( -256 2352 64 ) ( -256 2320 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -272 2416 65 ) ( -272 2384 65 ) ( -304 2416 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -272 2432 72 ) ( -304 2432 72 ) ( -272 2432 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 2416 72 ) ( -256 2416 64 ) ( -256 2384 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -304 2384 64 ) ( -272 2384 64 ) ( -304 2416 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -304 2368 64 ) ( -304 2368 72 ) ( -272 2368 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -320 2384 64 ) ( -320 2416 64 ) ( -320 2384 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1392 1552 65 ) ( -1392 1520 65 ) ( -1424 1552 65 ) effects_item/respawnring-blue 64 64 180 0.5 0.5 0 0 0
-( -1392 1568 72 ) ( -1424 1568 72 ) ( -1392 1568 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1376 1552 72 ) ( -1376 1552 64 ) ( -1376 1520 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1424 1520 64 ) ( -1392 1520 64 ) ( -1424 1552 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -1424 1504 64 ) ( -1424 1504 72 ) ( -1392 1504 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1440 1520 64 ) ( -1440 1552 64 ) ( -1440 1520 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1392 1488 65 ) ( -1392 1456 65 ) ( -1424 1488 65 ) effects_item/respawnring-blue 64 64 180 0.5 0.5 0 0 0
-( -1392 1504 72 ) ( -1424 1504 72 ) ( -1392 1504 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1376 1488 72 ) ( -1376 1488 64 ) ( -1376 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1424 1456 64 ) ( -1392 1456 64 ) ( -1424 1488 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -1424 1440 64 ) ( -1424 1440 72 ) ( -1392 1440 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -1440 1456 64 ) ( -1440 1488 64 ) ( -1440 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1872 1808 -323 ) ( -1840 1808 -323 ) ( -1872 1776 -323 ) effects_item/respawnring-blue 64 64 90 0.5 0.5 0 0 0
-( -1888 1808 -316 ) ( -1888 1776 -316 ) ( -1888 1808 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1872 1824 -316 ) ( -1872 1824 -324 ) ( -1840 1824 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( -1840 1776 -324 ) ( -1840 1808 -324 ) ( -1872 1776 -324 ) common/nodraw 128 128 90 0.5 0.5 0 0 0
-( -1824 1776 -324 ) ( -1824 1776 -316 ) ( -1824 1808 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1840 1760 -324 ) ( -1872 1760 -324 ) ( -1840 1760 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-}
-{
-( -1936 1872 -323 ) ( -1904 1872 -323 ) ( -1936 1840 -323 ) effects_item/respawnring-blue 64 64 90 0.5 0.5 0 0 0
-( -1952 1872 -316 ) ( -1952 1840 -316 ) ( -1952 1872 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1936 1888 -316 ) ( -1936 1888 -324 ) ( -1904 1888 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( -1904 1840 -324 ) ( -1904 1872 -324 ) ( -1936 1840 -324 ) common/nodraw 128 128 90 0.5 0.5 0 0 0
-( -1888 1840 -324 ) ( -1888 1840 -316 ) ( -1888 1872 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1904 1824 -324 ) ( -1936 1824 -324 ) ( -1904 1824 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-}
-{
-( -1936 1808 -323 ) ( -1904 1808 -323 ) ( -1936 1776 -323 ) effects_item/respawnring-blue 64 64 90 0.5 0.5 0 0 0
-( -1952 1808 -316 ) ( -1952 1776 -316 ) ( -1952 1808 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1936 1824 -316 ) ( -1936 1824 -324 ) ( -1904 1824 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-( -1904 1776 -324 ) ( -1904 1808 -324 ) ( -1936 1776 -324 ) common/nodraw 128 128 90 0.5 0.5 0 0 0
-( -1888 1776 -324 ) ( -1888 1776 -316 ) ( -1888 1808 -324 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1904 1760 -324 ) ( -1936 1760 -324 ) ( -1904 1760 -316 ) common/nodraw 0 24 0 -0.5 0.5 0 0 0
-}
-{
-( -1328 -656 97 ) ( -1296 -656 97 ) ( -1328 -688 97 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1344 -656 104 ) ( -1344 -688 104 ) ( -1344 -656 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1328 -640 104 ) ( -1328 -640 96 ) ( -1296 -640 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-( -1296 -688 96 ) ( -1296 -656 96 ) ( -1328 -688 96 ) common/nodraw 160 128 180 0.25 0.25 0 0 0
-( -1280 -688 96 ) ( -1280 -688 104 ) ( -1280 -656 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1296 -704 96 ) ( -1328 -704 96 ) ( -1296 -704 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-}
-{
-( -1392 -592 97 ) ( -1360 -592 97 ) ( -1392 -624 97 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1408 -592 104 ) ( -1408 -624 104 ) ( -1408 -592 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1392 -576 104 ) ( -1392 -576 96 ) ( -1360 -576 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-( -1360 -624 96 ) ( -1360 -592 96 ) ( -1392 -624 96 ) common/nodraw 160 128 180 0.25 0.25 0 0 0
-( -1344 -624 96 ) ( -1344 -624 104 ) ( -1344 -592 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1360 -640 96 ) ( -1392 -640 96 ) ( -1360 -640 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-}
-{
-( -1392 -656 97 ) ( -1360 -656 97 ) ( -1392 -688 97 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1408 -656 104 ) ( -1408 -688 104 ) ( -1408 -656 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1392 -640 104 ) ( -1392 -640 96 ) ( -1360 -640 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-( -1360 -688 96 ) ( -1360 -656 96 ) ( -1392 -688 96 ) common/nodraw 160 128 180 0.25 0.25 0 0 0
-( -1344 -688 96 ) ( -1344 -688 104 ) ( -1344 -656 96 ) common/nodraw 128 128 0 -0.25 0.25 0 0 0
-( -1360 -704 96 ) ( -1392 -704 96 ) ( -1360 -704 104 ) common/nodraw 160 128 0 -0.25 0.25 0 0 0
-}
-{
 ( 1216 1024 -256 ) ( 1216 -192 -256 ) ( -256 1024 -256 ) narmorx/base-concrete05 0 -0 180 0.25 0.25 0 0 0
 ( 1344 1408 -320 ) ( -128 1408 -320 ) ( 1344 1408 -448 ) common/caulk 0 0 90 0.5 0.5 0 0 0
 ( -1536 1280 64 ) ( -1536 1216 -64 ) ( -1536 1280 -64 ) exx/trim-01 0 256 90 0.25 -0.25 0 0 0
@@ -10415,70 +10095,6 @@ facility114x/misc-tube
 ( -640 -256 -64 ) ( -672 -224 -64 ) ( -640 -256 64 ) exx/base-metal04 256 0 0 -0.25 0.25 0 0 0
 }
 {
-( -240 1488 65 ) ( -240 1520 65 ) ( -208 1488 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -240 1472 72 ) ( -208 1472 72 ) ( -240 1472 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 1488 72 ) ( -256 1488 64 ) ( -256 1520 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -208 1520 64 ) ( -240 1520 64 ) ( -208 1488 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -208 1536 64 ) ( -208 1536 72 ) ( -240 1536 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -192 1520 64 ) ( -192 1488 64 ) ( -192 1520 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -240 1424 65 ) ( -240 1456 65 ) ( -208 1424 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -240 1408 72 ) ( -208 1408 72 ) ( -240 1408 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 1424 72 ) ( -256 1424 64 ) ( -256 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -208 1456 64 ) ( -240 1456 64 ) ( -208 1424 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -208 1472 64 ) ( -208 1472 72 ) ( -240 1472 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -192 1456 64 ) ( -192 1424 64 ) ( -192 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
-( -784 2352 65 ) ( -784 2320 65 ) ( -816 2352 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -784 2368 72 ) ( -816 2368 72 ) ( -784 2368 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -768 2352 72 ) ( -768 2352 64 ) ( -768 2320 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -816 2320 64 ) ( -784 2320 64 ) ( -816 2352 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -816 2304 64 ) ( -816 2304 72 ) ( -784 2304 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -832 2320 64 ) ( -832 2352 64 ) ( -832 2320 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-}
-{
-( -720 2416 65 ) ( -720 2384 65 ) ( -752 2416 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -720 2432 72 ) ( -752 2432 72 ) ( -720 2432 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -704 2416 72 ) ( -704 2416 64 ) ( -704 2384 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -752 2384 64 ) ( -720 2384 64 ) ( -752 2416 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -752 2368 64 ) ( -752 2368 72 ) ( -720 2368 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -768 2384 64 ) ( -768 2416 64 ) ( -768 2384 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-}
-{
-( -784 2416 65 ) ( -784 2384 65 ) ( -816 2416 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -784 2432 72 ) ( -816 2432 72 ) ( -784 2432 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -768 2416 72 ) ( -768 2416 64 ) ( -768 2384 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -816 2384 64 ) ( -784 2384 64 ) ( -816 2416 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -816 2368 64 ) ( -816 2368 72 ) ( -784 2368 64 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-( -832 2384 64 ) ( -832 2416 64 ) ( -832 2384 72 ) common/nodraw 0 0 0 -0.25 0.00390625 0 0 0
-}
-{
-( -1904 2320 -323 ) ( -1904 2288 -323 ) ( -1936 2320 -323 ) effects_item/respawnring-blue 64 64 -0 0.5 0.5 0 0 0
-( -1904 2336 -316 ) ( -1936 2336 -316 ) ( -1904 2336 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1888 2320 -316 ) ( -1888 2320 -324 ) ( -1888 2288 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1936 2288 -324 ) ( -1904 2288 -324 ) ( -1936 2320 -324 ) common/nodraw 0 128 -0 0.5 0.5 0 0 0
-( -1936 2272 -324 ) ( -1936 2272 -316 ) ( -1904 2272 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1952 2288 -324 ) ( -1952 2320 -324 ) ( -1952 2288 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-}
-{
-( -1840 2384 -323 ) ( -1840 2352 -323 ) ( -1872 2384 -323 ) effects_item/respawnring-blue 64 64 -0 0.5 0.5 0 0 0
-( -1840 2400 -316 ) ( -1872 2400 -316 ) ( -1840 2400 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1824 2384 -316 ) ( -1824 2384 -324 ) ( -1824 2352 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1872 2352 -324 ) ( -1840 2352 -324 ) ( -1872 2384 -324 ) common/nodraw 0 128 -0 0.5 0.5 0 0 0
-( -1872 2336 -324 ) ( -1872 2336 -316 ) ( -1840 2336 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1888 2352 -324 ) ( -1888 2384 -324 ) ( -1888 2352 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-}
-{
-( -1904 2384 -323 ) ( -1904 2352 -323 ) ( -1936 2384 -323 ) effects_item/respawnring-blue 64 64 -0 0.5 0.5 0 0 0
-( -1904 2400 -316 ) ( -1936 2400 -316 ) ( -1904 2400 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1888 2384 -316 ) ( -1888 2384 -324 ) ( -1888 2352 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-( -1936 2352 -324 ) ( -1904 2352 -324 ) ( -1936 2384 -324 ) common/nodraw 0 128 -0 0.5 0.5 0 0 0
-( -1936 2336 -324 ) ( -1936 2336 -316 ) ( -1904 2336 -324 ) common/nodraw 0 24 0 0.5 0.5 0 0 0
-( -1952 2352 -324 ) ( -1952 2384 -324 ) ( -1952 2352 -316 ) common/nodraw 128 24 0 0.5 0.5 0 0 0
-}
-{
 ( -1088 128 96 ) ( -1088 -320 96 ) ( -1472 128 96 ) exx/floor-clang01 256 256 180 0.25 0.25 0 0 0
 ( -1472 -320 80 ) ( -1088 -320 80 ) ( -1472 128 80 ) exx/floor-clang01 256 256 180 0.25 0.25 0 0 0
 ( -1408 -320 480 ) ( -1376 -352 352 ) ( -1408 -320 352 ) narmorx/base-concrete05_blue 256 192 0 -0.25 0.25 0 0 0
@@ -10528,30 +10144,6 @@ facility114x/misc-tube
 ( -600 2368 -384 ) ( -584 2352 -400 ) ( -584 2352 -384 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1296 1200 65 ) ( -1296 1168 65 ) ( -1328 1200 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1296 1216 72 ) ( -1328 1216 72 ) ( -1296 1216 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1280 1200 72 ) ( -1280 1200 64 ) ( -1280 1168 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1328 1168 64 ) ( -1296 1168 64 ) ( -1328 1200 64 ) common/nodraw 128 128 180 0.25 0.25 0 0 0
-( -1328 1152 64 ) ( -1328 1152 72 ) ( -1296 1152 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1344 1168 64 ) ( -1344 1200 64 ) ( -1344 1168 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1360 1200 65 ) ( -1360 1168 65 ) ( -1392 1200 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1360 1216 72 ) ( -1392 1216 72 ) ( -1360 1216 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1344 1200 72 ) ( -1344 1200 64 ) ( -1344 1168 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1392 1168 64 ) ( -1360 1168 64 ) ( -1392 1200 64 ) common/nodraw 128 128 180 0.25 0.25 0 0 0
-( -1392 1152 64 ) ( -1392 1152 72 ) ( -1360 1152 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1408 1168 64 ) ( -1408 1200 64 ) ( -1408 1168 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-}
-{
-( -1040 624 -191 ) ( -1040 656 -191 ) ( -1008 624 -191 ) effects_item/respawnring-blue 64.001953125 64.0009765625 180 0.5000003576 0.5000004768 0 0 0
-( -1040 608 -104 ) ( -1008 608 -104 ) ( -1040 608 -112 ) common/nodraw 87.8452148438 91.8452148438 -45 0.5 -0.5 0 0 0
-( -1056 624 -104 ) ( -1056 624 -112 ) ( -1056 656 -104 ) common/nodraw 24.6258544922 28.6258544922 -45 0.5 -0.5 0 0 0
-( -1008 656 -192 ) ( -1040 656 -192 ) ( -1008 624 -192 ) common/nodraw 112.4710693359 195.2193603516 45 0.5 0.5 0 0 0
-( -1008 672 -112 ) ( -1008 672 -104 ) ( -1040 672 -112 ) common/nodraw 87.8452148438 91.8452148438 -45 0.5 -0.5 0 0 0
-( -992 656 -112 ) ( -992 624 -112 ) ( -992 656 -104 ) common/nodraw 24.6258544922 28.6258544922 -45 0.5 -0.5 0 0 0
-}
-{
 ( 1216 1024 -196 ) ( 1216 -192 -196 ) ( -256 1024 -196 ) exx/wall-bplate06 31.0578613281 129.5612792969 -135 0.25 0.25 0 0 0
 ( 0 904 -320 ) ( 0 904 -448 ) ( 0 -312 -320 ) common/caulk 240 0 0 0.5 0.5 0 0 0
 ( -256 -192 -208 ) ( 1216 -192 -208 ) ( -256 1024 -208 ) common/caulk 0 128 -0 0.5 0.5 0 0 0
@@ -10568,38 +10160,6 @@ facility114x/misc-tube
 ( 0 448 64 ) ( -32 448 -64 ) ( 0 448 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -1360 1136 65 ) ( -1360 1104 65 ) ( -1392 1136 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -1360 1152 72 ) ( -1392 1152 72 ) ( -1360 1152 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1344 1136 72 ) ( -1344 1136 64 ) ( -1344 1104 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1392 1104 64 ) ( -1360 1104 64 ) ( -1392 1136 64 ) common/nodraw 128 128 180 0.25 0.25 0 0 0
-( -1392 1088 64 ) ( -1392 1088 72 ) ( -1360 1088 64 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-( -1408 1104 64 ) ( -1408 1136 64 ) ( -1408 1104 72 ) common/nodraw 128 0 0 -0.25 0.25 0 0 0
-}
-{
-( -704 656 65 ) ( -704 624 65 ) ( -736 656 65 ) effects_item/respawnring-blue 32 64 180 0.5 0.5 0 0 0
-( -704 672 72 ) ( -736 672 72 ) ( -704 672 64 ) common/nodraw 64 0 0 -0.25 0.00390625 0 0 0
-( -688 656 72 ) ( -688 656 64 ) ( -688 624 72 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-( -736 624 64 ) ( -704 624 64 ) ( -736 656 64 ) common/nodraw 64 128 180 0.25 0.25 0 0 0
-( -736 608 64 ) ( -736 608 72 ) ( -704 608 64 ) common/nodraw 64 0 0 -0.25 0.00390625 0 0 0
-( -752 624 64 ) ( -752 656 64 ) ( -752 624 72 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-}
-{
-( -624 672 65 ) ( -624 640 65 ) ( -656 672 65 ) effects_item/respawnring-blue 64 32 180 0.5 0.5 0 0 0
-( -624 688 72 ) ( -656 688 72 ) ( -624 688 64 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-( -608 672 72 ) ( -608 672 64 ) ( -608 640 72 ) common/nodraw 192 0 0 -0.25 0.00390625 0 0 0
-( -656 640 64 ) ( -624 640 64 ) ( -656 672 64 ) common/nodraw 128 64 180 0.25 0.25 0 0 0
-( -656 624 64 ) ( -656 624 72 ) ( -624 624 64 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-( -672 640 64 ) ( -672 672 64 ) ( -672 640 72 ) common/nodraw 192 0 0 -0.25 0.00390625 0 0 0
-}
-{
-( -768 592 65 ) ( -768 560 65 ) ( -800 592 65 ) effects_item/respawnring-blue 32 64 180 0.5 0.5 0 0 0
-( -768 608 72 ) ( -800 608 72 ) ( -768 608 64 ) common/nodraw 64 0 0 -0.25 0.00390625 0 0 0
-( -752 592 72 ) ( -752 592 64 ) ( -752 560 72 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-( -800 560 64 ) ( -768 560 64 ) ( -800 592 64 ) common/nodraw 64 128 180 0.25 0.25 0 0 0
-( -800 544 64 ) ( -800 544 72 ) ( -768 544 64 ) common/nodraw 64 0 0 -0.25 0.00390625 0 0 0
-( -816 560 64 ) ( -816 592 64 ) ( -816 560 72 ) common/nodraw 128 0 0 -0.25 0.00390625 0 0 0
-}
-{
 ( -1152 1600 0 ) ( -1152 1600 64 ) ( -1088 1600 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
 ( -1152 1600 -384 ) ( -1152 1664 -384 ) ( -1152 1600 -320 ) common/caulk 128 0 0 0.5 0.5 0 0 0
 ( -1152 1664 -64 ) ( -1088 1600 -64 ) ( -1152 1664 64 ) exx/trim-01 0 256 90 0.25 -0.25 0 0 0
@@ -14966,14 +14526,6 @@ exx/wall-bigrib02
 ( 0 1024 64 ) ( -16 1040 -64 ) ( 0 1024 -64 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 }
 {
-( -304 1424 65 ) ( -304 1456 65 ) ( -272 1424 65 ) effects_item/respawnring-blue 0 -0 180 0.5 0.5 0 0 0
-( -304 1408 72 ) ( -272 1408 72 ) ( -304 1408 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -320 1424 72 ) ( -320 1424 64 ) ( -320 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -272 1456 64 ) ( -304 1456 64 ) ( -272 1424 64 ) common/nodraw 0 -0 180 0.25 0.25 0 0 0
-( -272 1472 64 ) ( -272 1472 72 ) ( -304 1472 64 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-( -256 1456 64 ) ( -256 1424 64 ) ( -256 1456 72 ) common/nodraw 0 0 0 -0.25 0.25 0 0 0
-}
-{
 patchDef2
 {
 exx/wall-bigrib02

diff --git a/maps/drain.map b/maps/drain.map
index 8d8478f8c52db0e3413a94efa4bc7e2fcd223ad2..2edc036cac7d8ab0db248517eb73561c56b44bf6 100644 (file)
--- a/maps/drain.map
+++ b/maps/drain.map
@@ -4824,14 +4824,6 @@
 ( 128 -64 -128 ) ( 176 64 -128 ) ( 128 64 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -448 -992 -62 ) ( -448 -1056 -62 ) ( -512 -992 -62 ) effects_item/respawnring-blue 63.9997558594 21.3331298828 0 0.375 0.375 0 0 0
-( -440 -1000 -48 ) ( -504 -1000 -48 ) ( -440 -1000 -64 ) common/nodrawnonsolid 96 0 0 0.25 0.25 0 0 0
-( -456 -984 -48 ) ( -456 -984 -64 ) ( -456 -1048 -48 ) common/nodrawnonsolid 224 0 0 0.25 0.25 0 0 0
-( -512 -1056 -64 ) ( -448 -1056 -64 ) ( -512 -992 -64 ) common/nodrawnonsolid 128 0 0 0.25 0.25 0 0 0
-( -520 -1048 -64 ) ( -520 -1048 -48 ) ( -456 -1048 -64 ) common/nodrawnonsolid 160 0 0 0.25 0.25 0 0 0
-( -504 -1064 -64 ) ( -504 -1000 -64 ) ( -504 -1064 -48 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-}
-{
 ( -1024 -784 -252 ) ( -576 -784 -252 ) ( -592 -800 -252 ) phillipk1x/trim-pk01_trims01a 128 384 0 -0.25 0.25 0 0 0
 ( -1024 -784 -252 ) ( -576 -784 -256 ) ( -576 -784 -252 ) phillipk1x/trim-pk01_trims01a 128 384 0 -0.25 0.25 0 0 0
 ( -1008 -800 -256 ) ( -592 -800 -252 ) ( -592 -800 -256 ) phillipk1x/trim-pk01_trims01a 128 384 0 -0.25 0.25 0 0 0
@@ -5948,38 +5940,6 @@
 ( -936 -1240 64 ) ( -976 -1240 -64 ) ( -936 -1240 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -1056 352 -126 ) ( -1056 288 -126 ) ( -1120 352 -126 ) effects_item/respawnring-blue 21.3332519531 21.3333129883 0 0.375 0.375 0 0 0
-( -1048 344 -112 ) ( -1112 344 -112 ) ( -1048 344 -128 ) common/nodrawnonsolid 224 0 0 0.25 0.25 0 0 0
-( -1064 360 -114 ) ( -1064 360 -130 ) ( -1064 296 -114 ) common/nodrawnonsolid 224 248 0 0.25 0.25 0 0 0
-( -1120 288 -128 ) ( -1056 288 -128 ) ( -1120 352 -128 ) common/nodrawnonsolid 0 0 0 0.25 0.25 0 0 0
-( -1128 296 -128 ) ( -1128 296 -112 ) ( -1064 296 -128 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-( -1112 280 -128 ) ( -1112 344 -128 ) ( -1112 280 -112 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-}
-{
-( 272 560 132 ) ( 272 496 132 ) ( 208 560 132 ) effects_item/respawnring-blue 63.9997558594 64 0 0.375 0.375 0 0 0
-( 280 552 144 ) ( 216 552 144 ) ( 280 552 128 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-( 264 568 144 ) ( 264 568 128 ) ( 264 504 144 ) common/nodrawnonsolid 160 0 0 0.25 0.25 0 0 0
-( 208 496 126 ) ( 272 496 126 ) ( 208 560 126 ) common/nodrawnonsolid 64 64 0 0.25 0.25 0 0 0
-( 200 504 128 ) ( 200 504 144 ) ( 264 504 128 ) common/nodrawnonsolid 96 0 0 0.25 0.25 0 0 0
-( 216 488 126 ) ( 216 552 126 ) ( 216 488 142 ) common/nodrawnonsolid 224 248 0 0.25 0.25 0 0 0
-}
-{
-( -160 -144 196 ) ( -160 -208 196 ) ( -224 -144 196 ) effects_item/respawnring-blue 63.9997558594 106.6665039063 0 0.375 0.375 0 0 0
-( -152 -152 208 ) ( -216 -152 208 ) ( -152 -152 192 ) common/nodrawnonsolid 224 0 0 0.25 0.25 0 0 0
-( -168 -136 208 ) ( -168 -136 192 ) ( -168 -200 208 ) common/nodrawnonsolid 160 0 0 0.25 0.25 0 0 0
-( -224 -208 190 ) ( -160 -208 190 ) ( -224 -144 190 ) common/nodrawnonsolid 0 64 0 0.25 0.25 0 0 0
-( -232 -200 192 ) ( -232 -200 208 ) ( -168 -200 192 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-( -216 -216 190 ) ( -216 -152 190 ) ( -216 -216 206 ) common/nodrawnonsolid 224 248 0 0.25 0.25 0 0 0
-}
-{
-( 464 -400 4 ) ( 464 -464 4 ) ( 400 -400 4 ) effects_item/respawnring-blue 63.9998168945 63.999786377 0 0.375 0.375 0 0 0
-( 472 -408 16 ) ( 408 -408 16 ) ( 472 -408 0 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-( 456 -392 16 ) ( 456 -392 0 ) ( 456 -456 16 ) common/nodrawnonsolid 160 0 0 0.25 0.25 0 0 0
-( 400 -464 -2 ) ( 464 -464 -2 ) ( 400 -400 -2 ) common/nodrawnonsolid 64 64 0 0.25 0.25 0 0 0
-( 392 -456 0 ) ( 392 -456 16 ) ( 456 -456 0 ) common/nodrawnonsolid 96 0 0 0.25 0.25 0 0 0
-( 408 -472 -2 ) ( 408 -408 -2 ) ( 408 -472 14 ) common/nodrawnonsolid 224 248 0 0.25 0.25 0 0 0
-}
-{
 ( -560 -800 -128 ) ( -560 -928 -128 ) ( -576 -800 -128 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -560 -800 -128 ) ( -576 -800 -128 ) ( -560 -800 -256 ) common/clip 0 0 0 0.25 0.25 0 0 0
 ( -560 -800 -128 ) ( -560 -800 -256 ) ( -560 -928 -128 ) common/clip 0 0 0 0.25 0.25 0 0 0
@@ -6285,14 +6245,6 @@
 ( -528 -816 64 ) ( -512 -800 -64 ) ( -528 -816 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -352 -512 -254 ) ( -352 -576 -254 ) ( -416 -512 -254 ) effects_item/respawnring-blue 63.9997558594 21.3331184387 0 0.375 0.375 0 0 0
-( -344 -520 -240 ) ( -408 -520 -240 ) ( -344 -520 -256 ) common/nodrawnonsolid 224 0 0 0.25 0.25 0 0 0
-( -360 -504 -240 ) ( -360 -504 -256 ) ( -360 -568 -240 ) common/nodrawnonsolid 96 0 0 0.25 0.25 0 0 0
-( -416 -576 -256 ) ( -352 -576 -256 ) ( -416 -512 -256 ) common/nodrawnonsolid 0 128 0 0.25 0.25 0 0 0
-( -424 -568 -256 ) ( -424 -568 -240 ) ( -360 -568 -256 ) common/nodrawnonsolid 32 0 0 0.25 0.25 0 0 0
-( -408 -584 -258 ) ( -408 -520 -258 ) ( -408 -584 -242 ) common/nodrawnonsolid 160 248 0 0.25 0.25 0 0 0
-}
-{
 ( 0 544 0 ) ( 0 32 0 ) ( -256 544 0 ) phillipk1x/floors-pk01_floor01a 0 128 0 0.25 0.25 0 0 0
 ( 0 544 0 ) ( -256 544 0 ) ( 0 544 -128 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -256 32 -64 ) ( 0 32 -64 ) ( -256 544 -64 ) common/caulk 0 128 0 0.25 0.25 0 0 0

diff --git a/maps/g-23.map.options b/maps/g-23.map.options
index 7762aa5095789e362bfbb84c2739c5470d3ea962..288ca90d7d271190709113aced80cbdb64f3fbb6 100644 (file)
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -sRGB
-Version: 8 // ten times golden section
+Version: 9

diff --git a/maps/glowplant.map.options b/maps/glowplant.map.options
index 121c7ba94af234380bc0cb616d693b64947aa27b..5bf9f6d1950178900b35def33b3d8d829e9a9aba 100644 (file)
--- a/maps/glowplant.map.options
+++ b/maps/glowplant.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 12
\ No newline at end of file
+Version: 13

diff --git a/maps/silentsiege.map b/maps/silentsiege.map
index 3c1695460f6eb8e42572f51b88a7db17897ab889..bc8d482212cfabff291132eac5938ca92d059e1f 100644 (file)
--- a/maps/silentsiege.map
+++ b/maps/silentsiege.map
@@ -5700,17 +5700,6 @@ brushDef
 }
 }
 {
-brushDef
-{
-( 439 -193 321 ) ( 439 -257 321 ) ( 375 -193 321 ) ( ( 0.0125000002 0 3.3125 ) ( 0 0.0125000002 123.4124984741 ) ) effects_item/respawnring-red 0 0 0
-( 439 -185 336 ) ( 375 -185 336 ) ( 439 -185 320 ) ( ( 0.015625 0 10.875 ) ( 0 0.015625 5 ) ) common/nodrawnonsolid 0 0 0
-( 447 -193 336 ) ( 447 -193 320 ) ( 447 -257 336 ) ( ( 0.015625 0 253.25 ) ( 0 0.015625 5 ) ) common/nodrawnonsolid 0 0 0
-( 375 -257 320 ) ( 439 -257 320 ) ( 375 -193 320 ) ( ( 0.015625 0 253.25 ) ( 0 0.015625 10.875 ) ) common/nodrawnonsolid 0 0 0
-( 383 -265 320 ) ( 383 -265 336 ) ( 447 -265 320 ) ( ( 0.015625 0 245.125 ) ( 0 0.015625 5 ) ) common/nodrawnonsolid 0 0 0
-( 367 -257 320 ) ( 367 -193 320 ) ( 367 -257 336 ) ( ( 0.015625 0 2.75 ) ( 0 0.015625 5 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
 patchDef2
 {
 trak5x/base-base1b
@@ -37521,17 +37510,6 @@ brushDef
 {
 brushDef
 {
-( -136 635 17 ) ( -136 539 17 ) ( -232 635 17 ) ( ( 0.015625 0 119.4843978882 ) ( 0 0.0156249981 3.4999997616 ) ) effects_item/respawnring-red 0 0 0
-( -136 609 16 ) ( -232 609 16 ) ( -136 609 -144 ) ( ( 0.015625 0 240.875 ) ( 0 0.015625 248.75 ) ) common/nodrawnonsolid 0 0 0
-( -160 633 16 ) ( -160 633 -144 ) ( -160 537 16 ) ( ( 0.015625 0 2.859375 ) ( 0 0.015625 248.75 ) ) common/nodrawnonsolid 0 0 0
-( -256 537 16 ) ( -160 537 16 ) ( -256 633 16 ) ( ( 0.015625 0 2.859375 ) ( 0 0.015625 240.5 ) ) common/nodrawnonsolid 0 0 0
-( -232 545 -144 ) ( -232 545 16 ) ( -136 545 -144 ) ( ( 0.015625 0 15.125 ) ( 0 0.015625 248.75 ) ) common/nodrawnonsolid 0 0 0
-( -224 537 -144 ) ( -224 633 -144 ) ( -224 537 16 ) ( ( 0.015625 0 253.140625 ) ( 0 0.015625 248.75 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
 ( -544 116 64 ) ( -784 116 64 ) ( -544 116 0 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
 ( -656 68 96 ) ( -656 68 128 ) ( -656 -60 96 ) ( ( 0.0078125 0 0.03125 ) ( 0 0.0078125 0 ) ) exx/floor-wrn01 134217728 0 0
 ( -632 64 0 ) ( -648 64 32 ) ( -632 -64 0 ) ( ( 0.0078125 0 0 ) ( 0 0.0078125 511.7763977051 ) ) exx/floor-wrn01 134217728 0 0
@@ -48652,61 +48630,6 @@ brushDef
 {
 brushDef
 {
-( 256 843 321 ) ( 256 747 321 ) ( 160 843 321 ) ( ( 0.0089285718 0 121.491065979 ) ( 0 0.0089285718 126.7142791748 ) ) effects_item/respawnring-red 0 0 0
-( 256 841 320 ) ( 160 841 320 ) ( 256 841 160 ) ( ( 0.015625 0 247 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 256 841 320 ) ( 256 841 160 ) ( 256 745 320 ) ( ( 0.015625 0 255.609375 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 160 745 320 ) ( 256 745 320 ) ( 160 841 320 ) ( ( 0.015625 0 255.609375 ) ( 0 0.015625 247 ) ) common/nodrawnonsolid 0 0 0
-( 160 729 160 ) ( 160 729 320 ) ( 256 729 160 ) ( ( 0.015625 0 9 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 144 745 160 ) ( 144 841 160 ) ( 144 745 320 ) ( ( 0.015625 0 0.390625 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
-( -232 -341 641 ) ( -232 -437 641 ) ( -328 -341 641 ) ( ( 0.0089285718 0 4.0624933243 ) ( 0 0.0089285718 3.0714199543 ) ) effects_item/respawnring-red 0 0 0
-( -232 -343 640 ) ( -328 -343 640 ) ( -232 -343 480 ) ( ( 0.015625 0 239.375 ) ( 0 0.015625 2.5 ) ) common/nodrawnonsolid 0 0 0
-( -232 -343 640 ) ( -232 -343 480 ) ( -232 -439 640 ) ( ( 0.015625 0 18.109375 ) ( 0 0.015625 2.5 ) ) common/nodrawnonsolid 0 0 0
-( -328 -439 640 ) ( -232 -439 640 ) ( -328 -343 640 ) ( ( 0.015625 0 18.109375 ) ( 0 0.015625 239.375 ) ) common/nodrawnonsolid 0 0 0
-( -328 -455 480 ) ( -328 -455 640 ) ( -232 -455 480 ) ( ( 0.015625 0 16.625 ) ( 0 0.015625 2.5 ) ) common/nodrawnonsolid 0 0 0
-( -344 -439 480 ) ( -344 -343 480 ) ( -344 -439 640 ) ( ( 0.015625 0 237.890625 ) ( 0 0.015625 2.5 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
-( -1608 11 321 ) ( -1608 -85 321 ) ( -1704 11 321 ) ( ( 0.0089285718 0 0.919631958 ) ( 0 0.0089285718 15.357134819 ) ) effects_item/respawnring-red 0 0 0
-( -1608 9 320 ) ( -1704 9 320 ) ( -1608 9 160 ) ( ( 0.015625 0 217.875 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( -1608 9 320 ) ( -1608 9 160 ) ( -1608 -87 320 ) ( ( 0.015625 0 12.609375 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( -1704 -87 320 ) ( -1608 -87 320 ) ( -1704 9 320 ) ( ( 0.015625 0 12.609375 ) ( 0 0.015625 217.875 ) ) common/nodrawnonsolid 0 0 0
-( -1704 -103 160 ) ( -1704 -103 320 ) ( -1608 -103 160 ) ( ( 0.015625 0 38.125 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( -1720 -87 160 ) ( -1720 9 160 ) ( -1720 -87 320 ) ( ( 0.015625 0 243.390625 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
-( -1096 -1109 433 ) ( -1096 -1205 433 ) ( -1192 -1109 433 ) ( ( 0.0089285718 0 10.919631958 ) ( 0 0.0089285718 10.7857055664 ) ) effects_item/respawnring-red 0 0 0
-( -1096 -1111 432 ) ( -1192 -1111 432 ) ( -1096 -1111 272 ) ( ( 0.015625 0 225.875 ) ( 0 0.015625 255.25 ) ) common/nodrawnonsolid 0 0 0
-( -1096 -1111 432 ) ( -1096 -1111 272 ) ( -1096 -1207 432 ) ( ( 0.015625 0 30.109375 ) ( 0 0.015625 255.25 ) ) common/nodrawnonsolid 0 0 0
-( -1192 -1207 432 ) ( -1096 -1207 432 ) ( -1192 -1111 432 ) ( ( 0.015625 0 30.109375 ) ( 0 0.015625 225.875 ) ) common/nodrawnonsolid 0 0 0
-( -1192 -1223 272 ) ( -1192 -1223 432 ) ( -1096 -1223 272 ) ( ( 0.015625 0 30.125 ) ( 0 0.015625 255.25 ) ) common/nodrawnonsolid 0 0 0
-( -1208 -1207 272 ) ( -1208 -1111 272 ) ( -1208 -1207 432 ) ( ( 0.015625 0 225.890625 ) ( 0 0.015625 255.25 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
-( 1184 -1325 321 ) ( 1184 -1421 321 ) ( 1088 -1325 321 ) ( ( 0.0089285718 0 12.8482036591 ) ( 0 0.0089285718 118.4285583496 ) ) effects_item/respawnring-red 0 0 0
-( 1184 -1327 320 ) ( 1088 -1327 320 ) ( 1184 -1327 160 ) ( ( 0.015625 0 5.5 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 1184 -1327 320 ) ( 1184 -1327 160 ) ( 1184 -1423 320 ) ( ( 0.015625 0 33.484375 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 1088 -1423 320 ) ( 1184 -1423 320 ) ( 1088 -1327 320 ) ( ( 0.015625 0 33.484375 ) ( 0 0.015625 5.5 ) ) common/nodrawnonsolid 0 0 0
-( 1088 -1439 160 ) ( 1088 -1439 320 ) ( 1184 -1439 160 ) ( ( 0.015625 0 250.5 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-( 1072 -1423 160 ) ( 1072 -1327 160 ) ( 1072 -1423 320 ) ( ( 0.015625 0 222.515625 ) ( 0 0.015625 253.5 ) ) common/nodrawnonsolid 0 0 0
-}
-}
-{
-brushDef
-{
 ( -1788 312 960 ) ( -1788 296 960 ) ( -1804 312 960 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0
 ( -1784 388 960 ) ( -1800 388 960 ) ( -1784 388 -64 ) ( ( 0.015625 0 0.0625 ) ( 0 0.015625 0 ) ) common/clip 0 0 0
 ( -1804 296 -64 ) ( -1788 296 -64 ) ( -1804 312 -64 ) ( ( 0.015625 0 -0 ) ( -0 0.015625 0 ) ) common/clip 0 0 0

diff --git a/maps/solarium.map.options b/maps/solarium.map.options
index 7acca23e087d1acaa52a264be62573b47c676b52..1e60fc0d0008c4c0678e8f5556f3cf49219c5227 100644 (file)
--- a/maps/solarium.map.options
+++ b/maps/solarium.map.options
@@ -2,4 +2,4 @@
 -vis +
 -light + -bounce 1 -dirty -dirtscale 1 -bouncescale 1 -areascale 0.10
 -minimap +
-Version: 4.1
\ No newline at end of file
+Version: 5

diff --git a/models/map_lightspeed/vines.ase b/models/map_lightspeed/vines.ase
index 30b8307ac283729159f1cab206da224226e26553..aeaf81439d55141b002649d9116e060ca17884f8 100644 (file)
--- a/models/map_lightspeed/vines.ase
+++ b/models/map_lightspeed/vines.ase
@@ -42,7 +42,7 @@
                }\r
        }\r
        *MATERIAL       2       {\r
-               *MATERIAL_NAME  "models/model_lightspeed/vines_long"\r
+               *MATERIAL_NAME  "models/desertfactory/textures/misc/vines01.tga"\r
                *MATERIAL_CLASS "Standard"\r
                *MATERIAL_DIFFUSE       0.666268        1.000000        0.139158\r
                *MATERIAL_SHADING Phong\r

diff --git a/models/map_lightspeed/vines/vines01.tga b/models/map_lightspeed/vines/vines01.tga
deleted file mode 100644 (file)
index 14903d5..0000000
Binary files a/models/map_lightspeed/vines/vines01.tga and /dev/null differ

diff --git a/scripts/Makefile b/scripts/Makefile
index a4bfcefb07bdabac7b5f7bf8f49f21a1016fd859..ba99e8efd406081d28424c547e1ae5c8de92ea31 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,7 +7,8 @@ all: shaderlist.txt $(GENERATEDFILES)
        ./shader-cpp.sh "$<" > "$@"
 
 clean:
-       $(RM) "$(GENERATEDFILES)"
+       $(RM) $(GENERATEDFILES)
 
+.PHONY: shaderlist.txt
 shaderlist.txt:
        ls -1 *.shader | cut -d . -f 1 > "$@"

diff --git a/scripts/effects_item.shader b/scripts/effects_item.shader
index c5061486d8bdf31782321e34a68548c35452d4be..233dfe74be854cd0b29d1f75ed1802a505a25480 100644 (file)
--- a/scripts/effects_item.shader
+++ b/scripts/effects_item.shader
@@ -4,7 +4,7 @@ textures/effects_item/respawnring-red
        surfaceparm nomarks
        surfaceparm trans
        {
-               map textures/effects_item/respawnring-red.tga
+               map textures/effects_item/respawnring-red.jpg
                blendfunc add
                rgbGen identity
        }
@@ -16,9 +16,92 @@ textures/effects_item/respawnring-blue
        surfaceparm nomarks
        surfaceparm trans
        {
-               map textures/effects_item/respawnring-blue.tga
+               map textures/effects_item/respawnring-blue.jpg
                blendfunc add
                rgbGen identity
        }
 }
 
+textures/effects_item/respawnring-red-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-red-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-blue-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-blue-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-yellow-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-yellow-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-black-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-black-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-green-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-green-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-purple-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-purple-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}
+
+textures/effects_item/respawnring-white-highres
+{
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm trans
+       {
+               map textures/effects_item/respawnring-white-highres.png
+               blendfunc add
+               rgbGen identity
+       }
+}

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 0069b1a0c3abe2432fcc5b7643d85183e63f4d94..5ca03aaccc318aba0c600e5fa9ee75a4981f69ef 100644 (file)
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -53,6 +53,7 @@ textures/ex2x/base-chainlink
 
        surfaceparm trans
        cull none
+       surfaceparm alphashadow
 
        {
                map textures/ex2x/base/base_chainlink.tga

diff --git a/scripts/map_darkzone.shader b/scripts/map_darkzone.shader
index 9f03698e797e34a611cd082087f34f25b298481c..7e05b61af6875d78197c13e33e5b24dbece9439f 100644 (file)
--- a/scripts/map_darkzone.shader
+++ b/scripts/map_darkzone.shader
@@ -1,6 +1,6 @@
 textures/map_darkzone/bluelight
 {
-       qer_editorimage textures/map_darkzone/light/dz_bluelight.tga
+       qer_editorimage textures/ex2x/light/light_beam_blue.tga
        
        q3map_bounceScale  0.75
        dpoffsetmapping - 0.5 match8 99
@@ -9,7 +9,7 @@ textures/map_darkzone/bluelight
 
 
        {
-               map textures/map_darkzone/light/dz_bluelight.tga
+               map textures/ex2x/light/light_beam_blue.tga
                
 
        }
@@ -19,4 +19,4 @@ textures/map_darkzone/bluelight
                tcGen lightmap
                blendfunc filter
        }
-}
\ No newline at end of file
+}

diff --git a/scripts/map_g-23.shader b/scripts/map_g-23.shader
index ff784273f4900b3ab1e6e467e22e32311b493dbf..18c5371e434c5ce96c3d4c31786998a2aebefdb3 100644 (file)
--- a/scripts/map_g-23.shader
+++ b/scripts/map_g-23.shader
@@ -1,6 +1,6 @@
 textures/map_g-23/conveyor_belt
 {
-       qer_editorimage textures/map_g-23/conveyorbelt/conveyorbelt.tga
+       qer_editorimage textures/exx/trim/trim_psimple05.tga
        surfaceparm metalsteps
        surfaceparm nomarks // decals on tcmod = stupid
        q3map_bounceScale  1.5
@@ -9,7 +9,7 @@ textures/map_g-23/conveyor_belt
        dpglossexponentmod  4
        
        {
-               map textures/map_g-23/conveyorbelt/conveyorbelt.tga
+               map textures/exx/trim/trim_psimple05.tga
                tcMod scroll 0 0.25
        }
 }

diff --git a/scripts/map_glowplant.shader b/scripts/map_glowplant.shader
index 088e05dac328b391824e6c8301159cbb921103bb..e455e6a2f2cec6824aa12d6f844f56c53196f6f1 100644 (file)
--- a/scripts/map_glowplant.shader
+++ b/scripts/map_glowplant.shader
@@ -178,13 +178,13 @@ textures/map_glowplant/distort_glass
 
 textures/map_glowplant/gradient_light
 {
-       qer_editorimage textures/map_glowplant/gradient_light.tga
+       qer_editorimage textures/effects_lightning/gradient_white.tga
        surfaceparm noimpact
        surfaceparm nonsolid
        surfaceparm trans
        cull none
        {
-               map textures/map_glowplant/gradient_light.tga
+               map textures/effects_lightning/gradient_white.tga
                blendfunc blend
        }
 }

diff --git a/scripts/map_lightspeed.shader b/scripts/map_lightspeed.shader
index 5688108b6c8af0ed68ae2a36e46e8594b459248f..dfa6dbf08a98ba07d774e626f7b40669549d471f 100644 (file)
--- a/scripts/map_lightspeed.shader
+++ b/scripts/map_lightspeed.shader
@@ -53,7 +53,7 @@ models/map_lightspeed/lcd_map
 
 textures/map_lightspeed/light_nonglow
 {
-       qer_editorimage textures/map_lightspeed/light/light_1.tga
+       qer_editorimage textures/ex2x/light/light_1.tga
        
        q3map_bounceScale  0.75
        dpoffsetmapping - 0.5
@@ -62,7 +62,7 @@ textures/map_lightspeed/light_nonglow
 
 
        {
-               map textures/map_lightspeed/light/light_1.tga
+               map textures/ex2x/light/light_1.tga
                
 
        }
@@ -76,7 +76,7 @@ textures/map_lightspeed/light_nonglow
 
 textures/map_lightspeed/vines
 {
-       qer_editorimage models/map_lightspeed/vines/vines01.tga
+       qer_editorimage models/desertfactory/textures/misc/vines01.tga
        surfaceparm nonsolid
        surfaceparm nodlight
        surfaceparm nolightmap
@@ -88,7 +88,7 @@ textures/map_lightspeed/vines
        
        
        {
-               map models/map_lightspeed/vines/vines01.tga
+               map models/desertfactory/textures/misc/vines01.tga
                blendfunc filter
                alphaFunc GT0
                rgbGen identity

diff --git a/scripts/map_solarium.shader b/scripts/map_solarium.shader
index a498374be72fe188ecaff620efbc21ed6b310d4f..107730c869affc254a7df0bd3bb029104b416f92 100644 (file)
--- a/scripts/map_solarium.shader
+++ b/scripts/map_solarium.shader
@@ -1,12 +1,12 @@
 textures/map_solarium/waterfall
 {
-       qer_editorimage textures/map_solarium/waterfall/water2.tga
+       qer_editorimage textures/liquids_water/water2.tga
        qer_trans 20
        cull disable
        surfaceparm trans
 
        {
-               map textures/map_solarium/waterfall/water2.tga  
+               map textures/liquids_water/water2.tga
                tcMod scroll 0 -1.9
                blendfunc blend
        

diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index 19353c9643aa28de5c91052566e9893ecec514e0..be97c6f396d2665cef0eae018e574d4e137b2633 100644 (file)
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -1,6 +1,6 @@
 textures/map_space-elevator/hangwires
 {
-       surfaceparm nolightmap
+       surfaceparm alphashadow
        surfaceparm nomarks
        surfaceparm trans
        cull disable

diff --git a/scripts/model_lightspeed.shader b/scripts/model_lightspeed.shader
index 8ee73d1abdb893b4cc7f9d177d813249afc8f6ed..b4836053a356b57b5f54df2a5783b5de15ad34ad 100644 (file)
--- a/scripts/model_lightspeed.shader
+++ b/scripts/model_lightspeed.shader
@@ -1,13 +1,13 @@
 models/model_lightspeed/vines_long
 {
-       qer_editorimage models/map_lightspeed/vines/vines01.tga
+       qer_editorimage models/desertfactory/textures/misc/vines01.tga
        surfaceparm nomarks
        surfaceparm trans
        surfaceparm alphashadow
        deformVertexes wave 75 sin 0 2 0.1 0.1
        cull none
        {
-               map models/map_lightspeed/vines/vines01.tga
+               map models/desertfactory/textures/misc/vines01.tga
                alphaFunc GT0
                rgbGen vertex
        
@@ -26,4 +26,4 @@ models/model_lightspeed/vines_leaves
                alphaFunc GT0
                rgbGen vertex
        }
-}
\ No newline at end of file
+}

diff --git a/scripts/phillipk2x.shader b/scripts/phillipk2x.shader
index e54d052fbd8ff5af83fa1abf8c7ce829595a83e0..41591b98a2e91f472272b6ee6036d2456a201c01 100644 (file)
--- a/scripts/phillipk2x.shader
+++ b/scripts/phillipk2x.shader
@@ -678,6 +678,7 @@ textures/phillipk2x/floor-pk02_floor07
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor07
@@ -788,6 +789,7 @@ textures/phillipk2x/floor-pk02_floor10
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       sufraceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor10
@@ -876,6 +878,7 @@ textures/phillipk2x/floor-pk02_floor13a
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor13a
@@ -898,6 +901,7 @@ textures/phillipk2x/floor-pk02_floor13b
        dpglossintensitymod  3
        dpglossexponentmod  4
        q3map_bouncescale 1.25
+       surfaceparm alphashadow
 
        {
                map textures/phillipk2x/floor/pk02_floor13b

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index ce08e64fa30fc21047b8ed20835efe99733f7fe8..fd5f8f51921afbd225fd965842cf301f4b60326b 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -24,6 +24,7 @@ map_glowplant
 map_leave_em_behind
 map_lightspeed
 map_newtonian-nightmare
+map_oilrig
 map_red-planet
 map_silentsiege
 map_solarium

diff --git a/textures/effects_item/respawnring-black-highres.png b/textures/effects_item/respawnring-black-highres.png
new file mode 100644 (file)
index 0000000..2e82ed0
Binary files /dev/null and b/textures/effects_item/respawnring-black-highres.png differ

diff --git a/textures/effects_item/respawnring-blue-highres.png b/textures/effects_item/respawnring-blue-highres.png
new file mode 100644 (file)
index 0000000..44de8f7
Binary files /dev/null and b/textures/effects_item/respawnring-blue-highres.png differ

diff --git a/textures/effects_item/respawnring-green-highres.png b/textures/effects_item/respawnring-green-highres.png
new file mode 100644 (file)
index 0000000..3ada50e
Binary files /dev/null and b/textures/effects_item/respawnring-green-highres.png differ

diff --git a/textures/effects_item/respawnring-purple-highres.png b/textures/effects_item/respawnring-purple-highres.png
new file mode 100644 (file)
index 0000000..b79bb24
Binary files /dev/null and b/textures/effects_item/respawnring-purple-highres.png differ

diff --git a/textures/effects_item/respawnring-red-highres.png b/textures/effects_item/respawnring-red-highres.png
new file mode 100644 (file)
index 0000000..8957583
Binary files /dev/null and b/textures/effects_item/respawnring-red-highres.png differ

diff --git a/textures/effects_item/respawnring-white-highres.png b/textures/effects_item/respawnring-white-highres.png
new file mode 100644 (file)
index 0000000..7590cd5
Binary files /dev/null and b/textures/effects_item/respawnring-white-highres.png differ

diff --git a/textures/effects_item/respawnring-yellow-highres.png b/textures/effects_item/respawnring-yellow-highres.png
new file mode 100644 (file)
index 0000000..6538836
Binary files /dev/null and b/textures/effects_item/respawnring-yellow-highres.png differ

diff --git a/textures/exx/floor/floor_wrn01-red.tga b/textures/exx/floor/floor_wrn01-red.tga
index 09e20826ab9e99ffe9e5724b900704d7e89c601d..4f5da7bc138500a16e97930d8894115198994828 100644 (file)
Binary files a/textures/exx/floor/floor_wrn01-red.tga and b/textures/exx/floor/floor_wrn01-red.tga differ

diff --git a/textures/map_darkzone/light/dz_bluelight.tga b/textures/map_darkzone/light/dz_bluelight.tga
deleted file mode 100644 (file)
index a5fbe6f..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight.tga and /dev/null differ

diff --git a/textures/map_darkzone/light/dz_bluelight_gloss.tga b/textures/map_darkzone/light/dz_bluelight_gloss.tga
deleted file mode 100644 (file)
index b5e08cf..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight_gloss.tga and /dev/null differ

diff --git a/textures/map_darkzone/light/dz_bluelight_norm.tga b/textures/map_darkzone/light/dz_bluelight_norm.tga
deleted file mode 100644 (file)
index f179cb6..0000000
Binary files a/textures/map_darkzone/light/dz_bluelight_norm.tga and /dev/null differ

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

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

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

diff --git a/textures/map_glowplant/gradient_light.tga b/textures/map_glowplant/gradient_light.tga
deleted file mode 100644 (file)
index beda4b6..0000000
Binary files a/textures/map_glowplant/gradient_light.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1.tga b/textures/map_lightspeed/light/light_1.tga
deleted file mode 100644 (file)
index 1960527..0000000
Binary files a/textures/map_lightspeed/light/light_1.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1_gloss.tga b/textures/map_lightspeed/light/light_1_gloss.tga
deleted file mode 100644 (file)
index dc8636c..0000000
Binary files a/textures/map_lightspeed/light/light_1_gloss.tga and /dev/null differ

diff --git a/textures/map_lightspeed/light/light_1_norm.tga b/textures/map_lightspeed/light/light_1_norm.tga
deleted file mode 100644 (file)
index 5083dda..0000000
Binary files a/textures/map_lightspeed/light/light_1_norm.tga and /dev/null differ

diff --git a/textures/map_solarium/waterfall/water2.tga b/textures/map_solarium/waterfall/water2.tga
deleted file mode 100644 (file)
index 233e397..0000000
Binary files a/textures/map_solarium/waterfall/water2.tga and /dev/null differ

diff --git a/textures/map_solarium/waterfall/water2_norm.tga b/textures/map_solarium/waterfall/water2_norm.tga
deleted file mode 100644 (file)
index fb4fb22..0000000
Binary files a/textures/map_solarium/waterfall/water2_norm.tga and /dev/null differ