Optimize trickjump, fix wire texture for real now

diff --git a/maps/atomforge.map b/maps/atomforge.map
index 71e2424e8c17bda81a8cbf7441083947ffb24a45..471ad9c6ac3aff41e6e473b5defab9f3fb8ae38d 100644 (file)
--- a/maps/atomforge.map
+++ b/maps/atomforge.map
@@ -2559,7 +2559,7 @@ exomorphx/wall-metal_panel03
 ( -512 -296 584 ) ( -512 -336 584 ) ( -1280 -296 584 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( -512 -304 584 ) ( -1280 -304 584 ) ( -512 -304 576 ) common/caulk 0 224 0 0.25 0.25 0 0 0
 ( -512 -296 584 ) ( -512 -296 576 ) ( -512 -336 584 ) common/caulk 64 0 0 0.25 0.25 0 0 0
-( -1280 -336 576 ) ( -512 -336 576 ) ( -1280 -296 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( -1280 -336 576 ) ( -512 -336 576 ) ( -1280 -296 576 ) exomorphx/wall-metal_panel03 832 928 0 0.25 0.25 0 0 0
 ( -1152 -368 576 ) ( -1152 -368 584 ) ( -384 -368 576 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1152 -336 576 ) ( -1152 -296 576 ) ( -1152 -336 584 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 }
@@ -2715,9 +2715,9 @@ exomorphx/wall-metal_panel03
 ( -512 -376 584 ) ( -512 -336 584 ) ( 256 -376 584 ) common/caulk 0 64 180 0.25 0.25 0 0 0
 ( -512 -368 584 ) ( 256 -368 584 ) ( -512 -368 576 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
 ( -512 -376 584 ) ( -512 -376 576 ) ( -512 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
-( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) exomorphx/wall-metal_panel03 832 928 0 0.25 0.25 0 0 0
 ( 0 -304 576 ) ( 0 -304 584 ) ( -768 -304 576 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
-( 0 -336 576 ) ( 0 -376 576 ) ( 0 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
+( -384 -304 -64 ) ( -384 -368 -64 ) ( -384 -304 64 ) NULL 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( -512 -176 576 ) ( -512 -168 576 ) ( 256 -176 576 ) common/caulk 0 64 180 0.25 0.25 0 0 0
@@ -3211,9 +3211,9 @@ exomorphx/trim-trim_metal_panel01
 {
 ( -360 -512 576 ) ( -360 -544 576 ) ( -368 -512 576 ) common/caulk 32 0 0 0.25 0.25 0 0 0
 ( -360 -512 576 ) ( -368 -512 576 ) ( -360 -512 376 ) common/caulk 32 0 0 0.25 0.25 0 0 0
-( -360 -488 576 ) ( -360 -488 376 ) ( -360 -520 576 ) exomorphx/wall-metal_wall02 0 0 0 0.5 0.375 0 0 0
+( -360 -488 576 ) ( -360 -488 376 ) ( -360 -520 576 ) exomorphx/wall-metal_wall02 1006 0 0 0.5 0.375 0 0 0
 ( -368 -544 384 ) ( -360 -544 384 ) ( -368 -512 384 ) common/caulk 32 0 0 0.25 0.25 0 0 0
-( -368 -640 376 ) ( -368 -640 576 ) ( -360 -640 376 ) exomorphx/light-metal_light06 0 208 90 0.25 0.25 0 0 0
+( -370.5 -576 376 ) ( -370.5 -576 576 ) ( -362.5 -576 376 ) exomorphx/light-metal_light06 0 218 90 0.25 0.25 0 0 0
 ( -384 -544 376 ) ( -384 -512 376 ) ( -384 -544 576 ) exomorphx/wall-metal_wall02 0 64 90 0.25 0.25 0 0 0
 }
 {
@@ -6718,68 +6718,68 @@ exomorphx/wall-metal_panel03
 ( -256 -1232 64 ) ( -256 -1240 -64 ) ( -256 -1232 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -16 -1565.5378112793 315.3340301514 ) ( -16 -1573.0553588867 318.0701904297 ) ( -400 -1565.5378112793 315.3340301514 ) facility114invx/base-baseblack 64 52.1002502441 0 0.25 0.2660444379 134217728 0 0
-( 152 -1565.5378112793 315.3340301514 ) ( -232 -1565.5378112793 315.3340301514 ) ( 152 -1587.4270935059 255.1936950684 ) exomorphx/light-metal_light02 128 165.6000061035 0 0.25 0.2660444379 134217728 0 0
-( -160 -1565.5378112793 315.3340301514 ) ( -160 -1587.4270935059 255.1936950684 ) ( -160 -1573.0553588867 318.0701904297 ) exomorphx/light-metal_light07 188.5135498047 203.8997344971 70 0.2499999851 0.2499999851 134217728 0 0
-( -400 -1594.9446411133 257.9298553467 ) ( -16 -1594.9446411133 257.9298553467 ) ( -400 -1587.4270935059 255.1936950684 ) exomorphx/light-metal_light07 0 16 0 0.25 0.25 134217728 0 0
-( -400 -1594.9446411133 257.9298553467 ) ( -400 -1573.0553588867 318.0701904297 ) ( -16 -1594.9446411133 257.9298553467 ) common/caulk 64 45.5971679688 0 0.25 0.2660444379 134217728 0 0
-( -224 -1549.8394012451 241.5128936768 ) ( -224 -1542.3218536377 238.7767333984 ) ( -224 -1527.9501037598 301.6532287598 ) exomorphx/light-metal_light07 252.5135498047 203.8997344971 70 0.2499999851 0.2499999851 134217728 0 0
+( -16 -1556.5378112793 316.3340301514 ) ( -16 -1564.0553588867 319.0701904297 ) ( -400 -1556.5378112793 316.3340301514 ) facility114invx/base-baseblack 64 85.92918396 0 0.25 0.2660444379 134217728 0 0
+( 152 -1557.5378112793 315.3340301514 ) ( -232 -1557.5378112793 315.3340301514 ) ( 152 -1579.4270935059 255.1936950684 ) exomorphx/light-metal_light02 128 165.6000061035 0 0.25 0.2660444379 134217728 0 0
+( -160 -1557.5378112793 315.3340301514 ) ( -160 -1579.4270935059 255.1936950684 ) ( -160 -1565.0553588867 318.0701904297 ) exomorphx/light-metal_light07 177.5689086914 173.829574585 70 0.2499999851 0.2499999851 134217728 0 0
+( -400 -1586.9446411133 257.9298553467 ) ( -16 -1586.9446411133 257.9298553467 ) ( -400 -1579.4270935059 255.1936950684 ) exomorphx/light-metal_light07 0 48 0 0.25 0.25 134217728 0 0
+( -400 -1586.9446411133 257.9298553467 ) ( -400 -1565.0553588867 318.0701904297 ) ( -16 -1586.9446411133 257.9298553467 ) facility114invx/base-baseblack 64 45.5971679688 0 0.25 0.2660444379 134217728 0 0
+( -224 -1541.8394012451 241.5128936768 ) ( -224 -1534.3218536377 238.7767333984 ) ( -224 -1519.9501037598 301.6532287598 ) exomorphx/light-metal_light07 241.5689086914 173.829574585 70 0.2499999851 0.2499999851 134217728 0 0
 }
 {
-( -160 -1576 304 ) ( -160 -1600 304 ) ( -224 -1576 304 ) facility114invx/base-baseblack 0 0 0 0.25 0.25 134217728 0 0
-( -160 -1576 304 ) ( -224 -1576 304 ) ( -160 -1576 288 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -168 -1576 304 ) ( -168 -1576 288 ) ( -168 -1600 304 ) facility114invx/base-baseblack 0 0 0 0.25 0.25 134217728 0 0
-( -224 -1600 288 ) ( -160 -1600 288 ) ( -224 -1576 288 ) facility114invx/base-baseblack 0 0 0 0.25 0.25 134217728 0 0
+( -160 -1568 304 ) ( -160 -1592 304 ) ( -224 -1568 304 ) facility114invx/base-baseblack 0 32 0 0.25 0.25 134217728 0 0
+( -160 -1568 304 ) ( -224 -1568 304 ) ( -160 -1568 288 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
+( -168 -1568 304 ) ( -168 -1568 288 ) ( -168 -1592 304 ) facility114invx/base-baseblack 480 0 0 0.25 0.25 134217728 0 0
+( -224 -1592 288 ) ( -160 -1592 288 ) ( -224 -1568 288 ) facility114invx/base-baseblack 0 32 0 0.25 0.25 134217728 0 0
 ( -224 -1600 288 ) ( -224 -1600 304 ) ( -160 -1600 288 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
-( -216 -1600 288 ) ( -216 -1576 288 ) ( -216 -1600 304 ) facility114invx/base-baseblack 0 0 0 0.25 0.25 134217728 0 0
+( -216 -1592 288 ) ( -216 -1568 288 ) ( -216 -1592 304 ) facility114invx/base-baseblack 480 0 0 0.25 0.25 134217728 0 0
 }
 {
-( -34.4621887207 -1264 315.3340301514 ) ( -26.9446411133 -1264 318.0701904297 ) ( -34.4621887207 -1648 315.3340301514 ) facility114invx/base-baseblack 448 434.1326904297 90 0.25 0.2660444379 134217728 0 0
-( -34.4621887207 -1096 315.3340301514 ) ( -34.4621887207 -1480 315.3340301514 ) ( -12.5729064941 -1096 255.1936950684 ) exomorphx/light-metal_light02 0 165.6000061035 0 0.25 0.2660444379 134217728 0 0
-( -34.4621887207 -1408 315.3340301514 ) ( -12.5729064941 -1408 255.1936950684 ) ( -26.9446411133 -1408 318.0701904297 ) exomorphx/light-metal_light07 47.5847167969 77.8668823242 110 0.2499999851 -0.2499999851 134217728 0 0
-( -5.0553588867 -1648 257.9298553467 ) ( -5.0553588867 -1264 257.9298553467 ) ( -12.5729064941 -1648 255.1936950684 ) exomorphx/light-metal_light07 0 16 90 0.25 0.25 134217728 0 0
-( -5.0553588867 -1648 257.9298553467 ) ( -26.9446411133 -1648 318.0701904297 ) ( -5.0553588867 -1264 257.9298553467 ) common/caulk 192 45.5971679688 0 0.25 0.2660444379 134217728 0 0
-( -50.1605987549 -1472 241.5128936768 ) ( -57.6781463623 -1472 238.7767333984 ) ( -72.0498962402 -1472 301.6532287598 ) exomorphx/light-metal_light07 111.5845947266 77.8668823242 110 0.2499999851 -0.2499999851 134217728 0 0
+( -43.4621887207 -1264 316.3340301514 ) ( -35.9446411133 -1264 319.0701904297 ) ( -43.4621887207 -1648 316.3340301514 ) facility114invx/base-baseblack 448 467.9616088867 90 0.25 0.2660444379 134217728 0 0
+( -42.4621887207 -1096 315.3340301514 ) ( -42.4621887207 -1480 315.3340301514 ) ( -20.5729064941 -1096 255.1936950684 ) exomorphx/light-metal_light02 0 165.6000061035 0 0.25 0.2660444379 134217728 0 0
+( -42.4621887207 -1408 315.3340301514 ) ( -20.5729064941 -1408 255.1936950684 ) ( -34.9446411133 -1408 318.0701904297 ) exomorphx/light-metal_light07 36.6400718689 47.7967147827 110 0.2499999851 -0.2499999851 134217728 0 0
+( -13.0553588867 -1648 257.9298553467 ) ( -13.0553588867 -1264 257.9298553467 ) ( -20.5729064941 -1648 255.1936950684 ) exomorphx/light-metal_light07 0 48 90 0.25 0.25 134217728 0 0
+( -13.0553588867 -1648 257.9298553467 ) ( -34.9446411133 -1648 318.0701904297 ) ( -13.0553588867 -1264 257.9298553467 ) facility114invx/base-baseblack 192 45.5971679688 0 0.25 0.2660444379 134217728 0 0
+( -58.1605987549 -1472 241.5128936768 ) ( -65.6781463623 -1472 238.7767333984 ) ( -80.0498962402 -1472 301.6532287598 ) exomorphx/light-metal_light07 100.6399383545 47.7967147827 110 0.2499999851 -0.2499999851 134217728 0 0
 }
 {
-( -24 -1408 304 ) ( 0 -1408 304 ) ( -24 -1472 304 ) facility114invx/base-baseblack 384 256 90 0.25 0.25 134217728 0 0
-( -24 -1408 304 ) ( -24 -1472 304 ) ( -24 -1408 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -24 -1416 304 ) ( -24 -1416 288 ) ( 0 -1416 304 ) facility114invx/base-baseblack 256 0 0 -0.25 0.25 134217728 0 0
-( 0 -1472 288 ) ( 0 -1408 288 ) ( -24 -1472 288 ) facility114invx/base-baseblack 384 256 90 0.25 0.25 134217728 0 0
+( -32 -1408 304 ) ( -8 -1408 304 ) ( -32 -1472 304 ) facility114invx/base-baseblack 384 288 90 0.25 0.25 134217728 0 0
+( -32 -1408 304 ) ( -32 -1472 304 ) ( -32 -1408 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -32 -1416 304 ) ( -32 -1416 288 ) ( -8 -1416 304 ) facility114invx/base-baseblack 224 0 0 -0.25 0.25 134217728 0 0
+( -8 -1472 288 ) ( -8 -1408 288 ) ( -32 -1472 288 ) facility114invx/base-baseblack 384 288 90 0.25 0.25 134217728 0 0
 ( 0 -1472 288 ) ( 0 -1472 304 ) ( 0 -1408 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( 0 -1464 288 ) ( -24 -1464 288 ) ( 0 -1464 304 ) facility114invx/base-baseblack 256 0 0 -0.25 0.25 134217728 0 0
+( -8 -1464 288 ) ( -32 -1464 288 ) ( -8 -1464 304 ) facility114invx/base-baseblack 224 0 0 -0.25 0.25 134217728 0 0
 }
 {
-( -368 -610.4621887207 315.3340301514 ) ( -368 -602.9446411133 318.0701904297 ) ( 16 -610.4621887207 315.3340301514 ) facility114invx/base-baseblack 64 39.1845703125 180 0.25 0.2660444379 134217728 0 0
-( -536 -610.4621887207 315.3340301514 ) ( -152 -610.4621887207 315.3340301514 ) ( -536 -588.5729064941 255.1936950684 ) exomorphx/light-metal_light02 640 165.6000061035 0 -0.25 0.2660444379 134217728 0 0
-( -224 -610.4621887207 315.3340301514 ) ( -224 -588.5729064941 255.1936950684 ) ( -224 -602.9446411133 318.0701904297 ) exomorphx/light-metal_light07 283.5700683594 216.8146972656 110 0.2499999851 -0.2499999851 134217728 0 0
-( 16 -581.0553588867 257.9298553467 ) ( -368 -581.0553588867 257.9298553467 ) ( 16 -588.5729064941 255.1936950684 ) exomorphx/light-metal_light07 0 240 0 0.25 0.25 134217728 0 0
-( 16 -581.0553588867 257.9298553467 ) ( 16 -602.9446411133 318.0701904297 ) ( -368 -581.0553588867 257.9298553467 ) common/caulk 64 45.5971679688 0 -0.25 0.2660444379 134217728 0 0
-( -160 -626.1605987549 241.5128936768 ) ( -160 -633.6781463623 238.7767333984 ) ( -160 -648.0498962402 301.6532287598 ) exomorphx/light-metal_light07 347.5700683594 216.8146972656 110 0.2499999851 -0.2499999851 134217728 0 0
+( -368 -619.4621887207 316.3340301514 ) ( -368 -611.9446411133 319.0701904297 ) ( 16 -619.4621887207 316.3340301514 ) facility114invx/base-baseblack 64 73.0135040283 180 0.25 0.2660444379 134217728 0 0
+( -536 -618.4621887207 315.3340301514 ) ( -152 -618.4621887207 315.3340301514 ) ( -536 -596.5729064941 255.1936950684 ) exomorphx/light-metal_light02 640 165.6000061035 0 -0.25 0.2660444379 134217728 0 0
+( -224 -618.4621887207 315.3340301514 ) ( -224 -596.5729064941 255.1936950684 ) ( -224 -610.9446411133 318.0701904297 ) exomorphx/light-metal_light07 272.6254272461 186.7445373535 110 0.2499999851 -0.2499999851 134217728 0 0
+( 16 -589.0553588867 257.9298553467 ) ( -368 -589.0553588867 257.9298553467 ) ( 16 -596.5729064941 255.1936950684 ) exomorphx/light-metal_light07 0 208 0 0.25 0.25 134217728 0 0
+( 16 -589.0553588867 257.9298553467 ) ( 16 -610.9446411133 318.0701904297 ) ( -368 -589.0553588867 257.9298553467 ) facility114invx/base-baseblack 64 45.5971679688 0 -0.25 0.2660444379 134217728 0 0
+( -160 -634.1605987549 241.5128936768 ) ( -160 -641.6781463623 238.7767333984 ) ( -160 -656.0498962402 301.6532287598 ) exomorphx/light-metal_light07 336.6254272461 186.7445373535 110 0.2499999851 -0.2499999851 134217728 0 0
 }
 {
-( -224 -600 304 ) ( -224 -576 304 ) ( -160 -600 304 ) facility114invx/base-baseblack 512 0 180 0.25 0.25 134217728 0 0
-( -224 -600 304 ) ( -160 -600 304 ) ( -224 -600 288 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
-( -216 -600 304 ) ( -216 -600 288 ) ( -216 -576 304 ) facility114invx/base-baseblack 0 0 0 -0.25 0.25 134217728 0 0
-( -160 -576 288 ) ( -224 -576 288 ) ( -160 -600 288 ) facility114invx/base-baseblack 512 0 180 0.25 0.25 134217728 0 0
+( -224 -608 304 ) ( -224 -584 304 ) ( -160 -608 304 ) facility114invx/base-baseblack 0 32 180 0.25 0.25 134217728 0 0
+( -224 -608 304 ) ( -160 -608 304 ) ( -224 -608 288 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
+( -216 -608 304 ) ( -216 -608 288 ) ( -216 -584 304 ) facility114invx/base-baseblack 480 0 0 -0.25 0.25 134217728 0 0
+( -160 -584 288 ) ( -224 -584 288 ) ( -160 -608 288 ) facility114invx/base-baseblack 0 32 180 0.25 0.25 134217728 0 0
 ( -160 -576 288 ) ( -160 -576 304 ) ( -224 -576 288 ) common/caulk 0 0 0 -0.25 0.25 134217728 0 0
-( -168 -576 288 ) ( -168 -600 288 ) ( -168 -576 304 ) facility114invx/base-baseblack 0 0 0 -0.25 0.25 134217728 0 0
+( -168 -584 288 ) ( -168 -608 288 ) ( -168 -584 304 ) facility114invx/base-baseblack 480 0 0 -0.25 0.25 134217728 0 0
 }
 {
-( -34.4621887207 -560 315.3340301514 ) ( -26.9446411133 -560 318.0701904297 ) ( -34.4621887207 -944 315.3340301514 ) facility114invx/base-baseblack 192 434.1328125 90 0.25 0.2660444379 134217728 0 0
-( -34.4621887207 -392 315.3340301514 ) ( -34.4621887207 -776 315.3340301514 ) ( -12.5729064941 -392 255.1936950684 ) exomorphx/light-metal_light02 256 165.6000061035 0 0.25 0.2660444379 134217728 0 0
-( -34.4621887207 -704 315.3340301514 ) ( -12.5729064941 -704 255.1936950684 ) ( -26.9446411133 -704 318.0701904297 ) exomorphx/light-metal_light07 47.5844726563 77.8666381836 110 0.2499999851 -0.2499999851 134217728 0 0
-( -5.0553588867 -944 257.9298553467 ) ( -5.0553588867 -560 257.9298553467 ) ( -12.5729064941 -944 255.1936950684 ) exomorphx/light-metal_light07 0 16 90 0.25 0.25 134217728 0 0
-( -5.0553588867 -944 257.9298553467 ) ( -26.9446411133 -944 318.0701904297 ) ( -5.0553588867 -560 257.9298553467 ) common/caulk 192 45.5971679688 0 0.25 0.2660444379 134217728 0 0
-( -50.1605987549 -768 241.5128936768 ) ( -57.6781463623 -768 238.7767333984 ) ( -72.0498962402 -768 301.6532287598 ) exomorphx/light-metal_light07 111.5844726563 77.8666381836 110 0.2499999851 -0.2499999851 134217728 0 0
+( -43.4621887207 -560 316.3340301514 ) ( -35.9446411133 -560 319.0701904297 ) ( -43.4621887207 -944 316.3340301514 ) facility114invx/base-baseblack 192 467.961730957 90 0.25 0.2660444379 134217728 0 0
+( -42.4621887207 -392 315.3340301514 ) ( -42.4621887207 -776 315.3340301514 ) ( -20.5729064941 -392 255.1936950684 ) exomorphx/light-metal_light02 256 165.6000061035 0 0.25 0.2660444379 134217728 0 0
+( -42.4621887207 -704 315.3340301514 ) ( -20.5729064941 -704 255.1936950684 ) ( -34.9446411133 -704 318.0701904297 ) exomorphx/light-metal_light07 36.6398277283 47.7964706421 110 0.2499999851 -0.2499999851 134217728 0 0
+( -13.0553588867 -944 257.9298553467 ) ( -13.0553588867 -560 257.9298553467 ) ( -20.5729064941 -944 255.1936950684 ) exomorphx/light-metal_light07 0 48 90 0.25 0.25 134217728 0 0
+( -13.0553588867 -944 257.9298553467 ) ( -34.9446411133 -944 318.0701904297 ) ( -13.0553588867 -560 257.9298553467 ) facility114invx/base-baseblack 192 45.5971679688 0 0.25 0.2660444379 134217728 0 0
+( -58.1605987549 -768 241.5128936768 ) ( -65.6781463623 -768 238.7767333984 ) ( -80.0498962402 -768 301.6532287598 ) exomorphx/light-metal_light07 100.6398162842 47.7964706421 110 0.2499999851 -0.2499999851 134217728 0 0
 }
 {
-( -24 -704 304 ) ( 0 -704 304 ) ( -24 -768 304 ) facility114invx/base-baseblack 128 256 90 0.25 0.25 134217728 0 0
-( -24 -704 304 ) ( -24 -768 304 ) ( -24 -704 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( -24 -712 304 ) ( -24 -712 288 ) ( 0 -712 304 ) facility114invx/base-baseblack 256 0 0 -0.25 0.25 134217728 0 0
-( 0 -768 288 ) ( 0 -704 288 ) ( -24 -768 288 ) facility114invx/base-baseblack 128 256 90 0.25 0.25 134217728 0 0
+( -32 -704 304 ) ( -8 -704 304 ) ( -32 -768 304 ) facility114invx/base-baseblack 128 288 90 0.25 0.25 134217728 0 0
+( -32 -704 304 ) ( -32 -768 304 ) ( -32 -704 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
+( -32 -712 304 ) ( -32 -712 288 ) ( -8 -712 304 ) facility114invx/base-baseblack 224 0 0 -0.25 0.25 134217728 0 0
+( -8 -768 288 ) ( -8 -704 288 ) ( -32 -768 288 ) facility114invx/base-baseblack 128 288 90 0.25 0.25 134217728 0 0
 ( 0 -768 288 ) ( 0 -768 304 ) ( 0 -704 288 ) common/caulk 128 0 0 0.25 0.25 134217728 0 0
-( 0 -760 288 ) ( -24 -760 288 ) ( 0 -760 304 ) facility114invx/base-baseblack 256 0 0 -0.25 0.25 134217728 0 0
+( -8 -760 288 ) ( -32 -760 288 ) ( -8 -760 304 ) facility114invx/base-baseblack 224 0 0 -0.25 0.25 134217728 0 0
 }
 {
 ( -608 -1600 -48 ) ( -616 -1600 -48 ) ( -608 -1536 -48 ) phillipk2x/trims-pk02_trim04a 64 0 90 1 1 134217728 0 0
@@ -7852,9 +7852,9 @@ patchDef2
 common/caulk
 ( 3 5 0 0 0 )
 (
-( ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) )
-( ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) )
-( ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) ( -840 -1920 88 -52 120 ) )
+( ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) )
+( ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) )
+( ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) ( -840 -1920 104 -52 120 ) )
 )
 }
 }
@@ -8778,18 +8778,18 @@ exomorphx/wall-metal_wall05
 ( -384 -1056 64 ) ( -384 -1072 -64 ) ( -384 -1056 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -359.866317749 -696.5169525146 464 ) ( -303.8906555176 -665.4891357422 464 ) ( -355.9878387451 -703.5139160156 464 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
-( -366.8632659912 -700.3954315186 464 ) ( -362.9847869873 -707.3923950195 464 ) ( -366.8632659912 -700.3954315186 384 ) common/weapclip 75.7314147949 0 0 0.2858385444 0.25 0 0 0
-( -371.501739502 -675.5260772705 464 ) ( -371.501739502 -675.5260772705 384 ) ( -315.5260772705 -644.498260498 464 ) common/weapclip 163.3627624512 0 0 -0.2858385444 0.25 0 0 0
-( -300.0121765137 -672.4860992432 384 ) ( -303.8906555176 -665.4891357422 384 ) ( -355.9878387451 -703.5139160156 384 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
-( -300.0121765137 -672.4860992432 384 ) ( -300.0121765137 -672.4860992432 464 ) ( -303.8906555176 -665.4891357422 384 ) common/weapclip 75.7314147949 0 0 0.2858385444 0.25 0 0 0
-( -284.498260498 -700.4739227295 384 ) ( -340.4739227295 -731.501739502 384 ) ( -284.498260498 -700.4739227295 464 ) common/weapclip 163.3627624512 0 0 -0.2858385444 0.25 0 0 0
-( -585.1979827881 -281.7572021484 464 ) ( -595.6934204102 -287.5749206543 452 ) ( -647.253616333 -169.8058776855 464 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
-( -532.7207946777 -252.6686248779 460 ) ( -536.2192840576 -254.6078643799 464 ) ( -594.7764282227 -140.717300415 460 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
-( -329.5199890137 -652.2552185059 384 ) ( -324.0822753906 -653.814453125 384 ) ( -329.5199890137 -652.2552185059 512 ) common/weapclip 29.5606555939 0 0 -0.5156663656 0.25 0 0 0
-( -292.2552185059 -686.4800109863 384 ) ( -293.814453125 -691.9177246094 384 ) ( -292.2552185059 -686.4800109863 512 ) common/weapclip 116.2685852051 0 0 -0.2858385444 0.25 0 0 0
-( -1347.1973571777 -1225.5098266602 464 ) ( -1351.0758361816 -1218.512878418 456 ) ( -1235.2460327148 -1163.4541931152 464 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
-( -1320.0480194092 -1274.4885406494 456 ) ( -1321.9872589111 -1270.9900512695 460 ) ( -1208.0966949463 -1212.4329071045 456 ) common/weapclip 106.8831558228 177.6969909668 119 0.25 0.25 0 0 0
+( -359.866317749 -736.5169525146 464 ) ( -303.8906555176 -705.4891357422 464 ) ( -355.9878387451 -743.5139160156 464 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
+( -366.8632659912 -740.3954315186 464 ) ( -362.9847869873 -747.3923950195 464 ) ( -366.8632659912 -740.3954315186 384 ) common/weapclip 215.6705474854 0 0 0.2858385444 0.25 0 0 0
+( -371.501739502 -715.5260772705 464 ) ( -371.501739502 -715.5260772705 384 ) ( -315.5260772705 -684.498260498 464 ) common/weapclip 163.3627624512 0 0 -0.2858385444 0.25 0 0 0
+( -300.0121765137 -712.4860992432 384 ) ( -303.8906555176 -705.4891357422 384 ) ( -355.9878387451 -743.5139160156 384 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
+( -300.0121765137 -712.4860992432 384 ) ( -300.0121765137 -712.4860992432 464 ) ( -303.8906555176 -705.4891357422 384 ) common/weapclip 215.6705474854 0 0 0.2858385444 0.25 0 0 0
+( -284.498260498 -740.4739227295 384 ) ( -340.4739227295 -771.501739502 384 ) ( -284.498260498 -740.4739227295 464 ) common/weapclip 163.3627624512 0 0 -0.2858385444 0.25 0 0 0
+( -585.1979827881 -321.7572021484 464 ) ( -595.6934204102 -327.5749206543 452 ) ( -647.253616333 -209.8058776855 464 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
+( -532.7207946777 -292.6686248779 460 ) ( -536.2192840576 -294.6078643799 464 ) ( -594.7764282227 -180.717300415 460 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
+( -329.5199890137 -692.2552185059 384 ) ( -324.0822753906 -693.814453125 384 ) ( -329.5199890137 -692.2552185059 512 ) common/weapclip 29.5606555939 0 0 -0.5156663656 0.25 0 0 0
+( -292.2552185059 -726.4800109863 384 ) ( -293.814453125 -731.9177246094 384 ) ( -292.2552185059 -726.4800109863 512 ) common/weapclip 232.3294677734 0 0 -0.2858385444 0.25 0 0 0
+( -1347.1973571777 -1265.5098266602 464 ) ( -1351.0758361816 -1258.512878418 456 ) ( -1235.2460327148 -1203.4541931152 464 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
+( -1320.0480194092 -1314.4885406494 456 ) ( -1321.9872589111 -1310.9900512695 460 ) ( -1208.0966949463 -1252.4329071045 456 ) common/weapclip 246.8223266602 255.2665405273 119 0.25 0.25 0 0 0
 }
 {
 ( -608 -504 576 ) ( -616 -504 576 ) ( -608 -504 144 ) common/caulk 128 0 0 0.25 0.25 0 0 0
@@ -20377,27 +20377,44 @@ decals/scorch01
 }
 }
 {
-( -584 -576 240 ) ( -696 -576 240 ) ( -584 -576 112 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
-( -584 -576 240 ) ( -584 -576 112 ) ( -584 -592 240 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
-( -696 -592 144 ) ( -584 -592 144 ) ( -696 -576 144 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
-( -640 -592 112 ) ( -640 -576 112 ) ( -640 -592 240 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
-( 64 -576 200 ) ( -64 -608 144 ) ( -64 -576 200 ) exomorphx/wall-metal_wall05 0 0 0 0.25 0.25 0 0 0
+( -608 -619.4621887207 316.3340301514 ) ( -608 -611.9446411133 319.0701904297 ) ( -224 -619.4621887207 316.3340301514 ) facility114invx/base-baseblack 128 73.0135040283 180 0.25 0.2660444379 134217728 0 0
+( -776 -618.4621887207 315.3340301514 ) ( -392 -618.4621887207 315.3340301514 ) ( -776 -596.5729064941 255.1936950684 ) exomorphx/light-metal_light02 704 165.6000061035 0 -0.25 0.2660444379 134217728 0 0
+( -464 -618.4621887207 315.3340301514 ) ( -464 -596.5729064941 255.1936950684 ) ( -464 -610.9446411133 318.0701904297 ) exomorphx/light-metal_light07 272.6254272461 186.7445373535 110 0.2499999851 -0.2499999851 134217728 0 0
+( -224 -589.0553588867 257.9298553467 ) ( -608 -589.0553588867 257.9298553467 ) ( -224 -596.5729064941 255.1936950684 ) exomorphx/light-metal_light07 960 208 0 0.25 0.25 134217728 0 0
+( -224 -589.0553588867 257.9298553467 ) ( -224 -610.9446411133 318.0701904297 ) ( -608 -589.0553588867 257.9298553467 ) facility114invx/base-baseblack 128 45.5971679688 0 -0.25 0.2660444379 134217728 0 0
+( -400 -634.1605987549 241.5128936768 ) ( -400 -641.6781463623 238.7767333984 ) ( -400 -656.0498962402 301.6532287598 ) exomorphx/light-metal_light07 336.6254272461 186.7445373535 110 0.2499999851 -0.2499999851 134217728 0 0
+}
+{
+( -464 -608 304 ) ( -464 -584 304 ) ( -400 -608 304 ) facility114invx/base-baseblack 64 32 180 0.25 0.25 134217728 0 0
+( -464 -608 304 ) ( -400 -608 304 ) ( -464 -608 288 ) common/caulk 64 0 0 -0.25 0.25 134217728 0 0
+( -456 -608 304 ) ( -456 -608 288 ) ( -456 -584 304 ) facility114invx/base-baseblack 480 0 0 -0.25 0.25 134217728 0 0
+( -400 -584 288 ) ( -464 -584 288 ) ( -400 -608 288 ) facility114invx/base-baseblack 64 32 180 0.25 0.25 134217728 0 0
+( -400 -576 288 ) ( -400 -576 304 ) ( -464 -576 288 ) common/caulk 64 0 0 -0.25 0.25 134217728 0 0
+( -408 -584 288 ) ( -408 -608 288 ) ( -408 -584 304 ) facility114invx/base-baseblack 480 0 0 -0.25 0.25 134217728 0 0
+}
+{
+( -632.6766815186 -582.2171936035 350 ) ( -632.6766662598 -614.2171783447 350 ) ( -632.6766815186 -582.2171936035 126 ) facility114invx/base-baseblack 848 0 90 0.25 0.25 134217728 0 0
+( -628.4340362549 -580.8029937744 350 ) ( -628.4340362549 -580.8029937744 126 ) ( -596.4340362549 -580.8029785156 350 ) common/caulk 113.2215576172 239.9991455078 0 -0.8709128499 0.1250000596 134217728 0 0
+( -596.4340362549 -604.8029785156 190 ) ( -596.4340362549 -572.8029937744 190 ) ( -628.4340362549 -604.8029937744 190 ) exomorphx/wall-metal_wall05 848 0 90 0.25 0.25 134217728 0 0
+( -587.9487609863 -609.9745483398 126 ) ( -587.9487609863 -609.9745483398 350 ) ( -587.9487609863 -577.9745483398 126 ) facility114invx/base-baseblack 848 0 90 0.25 0.25 134217728 0 0
+( 75.5657958984 -580.8029327393 222 ) ( 75.5657958984 -612.8029174805 190 ) ( -52.434173584 -580.802947998 222 ) exomorphx/wall-metal_wall05 848 0 90 0.25 0.25 134217728 0 0
 }
 {
-( -376 -576 320 ) ( -376 -600 320 ) ( -440 -576 320 ) phillipk2x/walls-pk02_wall_big01b 960 256 0 0.25 0.25 0 0 0
-( -376 -576 320 ) ( -440 -576 320 ) ( -376 -576 264 ) phillipk2x/walls-pk02_wall_big01b 960 480 0 0.25 0.25 0 0 0
-( -368 -576 320 ) ( -368 -576 264 ) ( -368 -600 320 ) phillipk2x/walls-pk02_wall_big01b 768 480 0 0.25 0.25 0 0 0
-( -440 -600 312 ) ( -376 -600 312 ) ( -440 -576 312 ) exomorphx/wall-concrete_metal_wallplate02 960 256 0 0.25 0.25 0 0 0
-( -440 -616 264 ) ( -440 -616 320 ) ( -376 -616 264 ) phillipk2x/walls-pk02_wall_big01b 960 480 0 0.25 0.25 0 0 0
-( -440 -600 264 ) ( -440 -576 264 ) ( -440 -600 320 ) phillipk2x/walls-pk02_wall_big01b 768 480 0 0.25 0.25 0 0 0
+( -512 -376 584 ) ( -512 -336 584 ) ( 256 -376 584 ) common/caulk 0 64 180 0.25 0.25 0 0 0
+( -512 -368 584 ) ( 256 -368 584 ) ( -512 -368 576 ) common/caulk 0 224 0 -0.25 0.25 0 0 0
+( 256 -336 576 ) ( -512 -336 576 ) ( 256 -376 576 ) phillipk2x/pipes-pk02_pipes01 0 64 90 0.25 0.25 0 0 0
+( 0 -304 576 ) ( 0 -304 584 ) ( -768 -304 576 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
+( 0 -336 576 ) ( 0 -376 576 ) ( 0 -336 584 ) common/caulk 192 0 0 -0.25 0.25 0 0 0
+( -384 -304 64 ) ( -384 -368 -64 ) ( -384 -304 -64 ) NULL 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -384 -630.0781860352 334.735824585 ) ( -384 -663.4217834473 369.2641296387 ) ( -392 -630.0781860352 334.735824585 ) phillipk2x/base-pk02_generic01b 0 0 0 0.25 0.25 0 0 0
-( -384 -615.0781860352 321.235824585 ) ( -392 -615.0781860352 321.235824585 ) ( -384 -620.832901001 315.6785583496 ) phillipk2x/base-pk02_generic01b 0 485 0 0.25 0.25 0 0 0
-( -384 -638.0781860352 342.735824585 ) ( -384 -643.832901001 337.1785583496 ) ( -384 -671.4217834473 377.2641296387 ) phillipk2x/base-pk02_generic01b 27 0 0 0.25 0.25 0 0 0
-( -392 -667.1764984131 372.7068634033 ) ( -384 -667.1764984131 372.7068634033 ) ( -392 -633.832901001 338.1785583496 ) phillipk2x/base-pk02_generic01b 0 0 0 0.25 0.25 0 0 0
-( -392 -679.4264984131 382.2068634033 ) ( -392 -673.6717834473 387.7641296387 ) ( -384 -679.4264984131 382.2068634033 ) phillipk2x/base-pk02_generic01b 0 485 0 0.25 0.25 0 0 0
-( -384.5 -677.1764984131 371.7068634033 ) ( -384.5 -643.832901001 337.1785583496 ) ( -384.5 -671.4217834473 377.2641296387 ) phillipk2x/base-pk02_generic01b 27 0 0 0.25 0.25 0 0 0
+( -400 -592 318 ) ( -400 -616 318 ) ( -472 -592 318 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -400 -576 328 ) ( -472 -576 328 ) ( -400 -576 256 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -400 -592 328 ) ( -400 -592 256 ) ( -400 -616 328 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -472 -616 288 ) ( -400 -616 288 ) ( -472 -592 288 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( -466 -614 256 ) ( -466 -614 328 ) ( -394 -614 256 ) common/clip 232 0 0 0.25 0.25 0 0 0
+( -464 -616 256 ) ( -464 -592 256 ) ( -464 -616 328 ) common/clip 0 0 0 0.25 0.25 0 0 0
+( 64 -614 303 ) ( -64 -608.5 288 ) ( -64 -614 303 ) common/clip 0 0 0 0.25 0.25 0 0 0
 }
 }
 {
@@ -20905,7 +20922,7 @@ facility114invx/base-baseblack
 }
 {
 "classname" "misc_gamemodel"
-"origin" "-328.000092 -688.000122 384.000000"
+"origin" "-328.000092 -728.000122 384.000000"
 "model" "models/containers/crate02.md3"
 "modelscale" "0.800000"
 "angle" "29.000021"

diff --git a/maps/atomforge.map.options b/maps/atomforge.map.options
index 6db94f0df21aa1cef91bcd5855c9c51b5f7541bd..ebfcb483ce61a788220522a1432bf2f2122faf45 100644 (file)
--- a/maps/atomforge.map.options
+++ b/maps/atomforge.map.options
@@ -3,5 +3,5 @@
 -vis +
 -minimap +
 -sRGB
-Version: 6g
+Version: 7