More texture work

diff --git a/maps/atomforge.jpg b/maps/atomforge.jpg
index 344ff0f086845d5d528abd480818fea11908adfe..a4a6d2e12154a8920985ac631b145808f7afedcf 100644 (file)
Binary files a/maps/atomforge.jpg and b/maps/atomforge.jpg differ

diff --git a/maps/atomforge.map b/maps/atomforge.map
index f13f0f427b82bb9405b9bb4855b51fa97818f21d..c6449f7bb2eec59b765cb9a43670040ccaab91e7 100644 (file)
--- a/maps/atomforge.map
+++ b/maps/atomforge.map
@@ -48,7 +48,7 @@ phillipk2x/walls-pk02_wall08b
 ( 256 40 200 ) ( 256 0 200 ) ( -512 40 200 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 256 32 200 ) ( -512 32 200 ) ( 256 32 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 256 40 200 ) ( 256 40 192 ) ( 256 0 200 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( -512 0 192 ) ( 256 0 192 ) ( -512 40 192 ) phillipk2x/pipes-pk02_pipes01 0 0 0 0.25 0.25 0 0 0
+( -512 0 192 ) ( 256 0 192 ) ( -512 40 192 ) phillipk2x/pipes-pk02_pipes01 0 0 90 0.25 0.25 0 0 0
 ( -512 -32 192 ) ( -512 -32 200 ) ( 256 -32 192 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -512 0 192 ) ( -512 40 192 ) ( -512 0 200 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -998,10 +998,10 @@ phillipk2x/walls-pk02_wall08b
 {
 ( 256 -296 360 ) ( 256 -336 360 ) ( -512 -296 360 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( 320 -304 360 ) ( -448 -304 360 ) ( 320 -304 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
-( 320 -296 360 ) ( 320 -296 352 ) ( 320 -336 360 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( -512 -336 352 ) ( 256 -336 352 ) ( -512 -296 352 ) phillipk2x/pipes-pk02_pipes01 0 0 0 0.25 0.25 0 0 0
+( -512 -336 352 ) ( 256 -336 352 ) ( -512 -296 352 ) exomorphx/wall-metal_panel03 0 928 0 0.25 0.25 0 0 0
 ( -448 -368 352 ) ( -448 -368 360 ) ( 320 -368 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( -512 -336 352 ) ( -512 -296 352 ) ( -512 -336 360 ) common/caulk 64 128 0 0.25 0.25 0 0 0
+( -448 -304 -64 ) ( -448 -368 -64 ) ( -448 -304 64 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
 }
 {
 ( 256 -288 360 ) ( 256 -296 360 ) ( -512 -288 360 ) common/caulk 0 192 0 0.25 0.25 0 0 0
@@ -1495,7 +1495,7 @@ phillipk2x/walls-pk02_wall08b
 ( -512 -296 360 ) ( -512 -336 360 ) ( -1280 -296 360 ) common/caulk 0 192 0 0.25 0.25 0 0 0
 ( -512 -304 360 ) ( -1280 -304 360 ) ( -512 -304 352 ) phillipk2x/walls-pk02_wall03a 0 0 0 0.25 0.25 0 0 0
 ( -512 -296 360 ) ( -512 -296 352 ) ( -512 -336 360 ) common/caulk 64 128 0 0.25 0.25 0 0 0
-( -1280 -336 352 ) ( -512 -336 352 ) ( -1280 -296 352 ) phillipk2x/pipes-pk02_pipes01 0 0 0 0.25 0.25 0 0 0
+( -1280 -336 352 ) ( -512 -336 352 ) ( -1280 -296 352 ) exomorphx/wall-metal_panel03 0 928 0 0.25 0.25 0 0 0
 ( -1152 -368 352 ) ( -1152 -368 360 ) ( -384 -368 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( -1152 -336 352 ) ( -1152 -296 352 ) ( -1152 -336 360 ) common/caulk 64 128 0 0.25 0.25 0 0 0
 }
@@ -2036,7 +2036,7 @@ phillipk2x/walls-pk02_wall08b
 ( 768 -1048 328 ) ( 768 -1088 328 ) ( 0 -1048 328 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 512 -1056 328 ) ( -256 -1056 328 ) ( 512 -1056 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 512 -1048 328 ) ( 512 -1048 320 ) ( 512 -1088 328 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 0 -1088 320 ) ( 768 -1088 320 ) ( 0 -1048 320 ) phillipk2x/pipes-pk02_pipes01 0 0 0 0.25 0.25 0 0 0
+( 0 -1088 320 ) ( 768 -1088 320 ) ( 0 -1048 320 ) phillipk2x/pipes-pk02_pipes01 0 0 90 0.25 0.25 0 0 0
 ( -256 -1120 320 ) ( -256 -1120 328 ) ( 512 -1120 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( 0 -1088 320 ) ( 0 -1048 320 ) ( 0 -1088 328 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
@@ -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 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
 ( -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,7 +2715,7 @@ 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 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
 }
@@ -4621,7 +4621,7 @@ phillipk2x/walls-pk02_wall08b
 ( -1432 -1376 24 ) ( -1472 -1376 24 ) ( -1432 -608 24 ) common/caulk 128 0 -90 0.25 0.25 0 0 0
 ( -1440 -1440 24 ) ( -1440 -672 24 ) ( -1440 -1440 16 ) common/caulk 128 64 0 -0.25 0.25 0 0 0
 ( -1432 -1440 24 ) ( -1432 -1440 16 ) ( -1472 -1440 24 ) common/caulk 0 64 0 0.25 0.25 0 0 0
-( -1472 -448 16 ) ( -1472 -1216 16 ) ( -1432 -448 16 ) phillipk2x/pipes-pk02_pipes01 128 128 90 0.25 0.25 0 0 0
+( -1472 -448 16 ) ( -1472 -1216 16 ) ( -1432 -448 16 ) phillipk2x/pipes-pk02_pipes01 128 128 180 0.25 0.25 0 0 0
 ( -1504 -672 16 ) ( -1504 -672 24 ) ( -1504 -1440 16 ) common/caulk 128 64 0 -0.25 0.25 0 0 0
 ( -1472 -448 16 ) ( -1432 -448 16 ) ( -1472 -448 24 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 }
@@ -9428,7 +9428,7 @@ exomorphx/wall-metal_wall05
 ( -1280 -1288 -64 ) ( -1280 -1296 -64 ) ( -1280 -1288 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -712 -576 -64 ) ( -712 -832 -64 ) ( -1152 -576 -64 ) exomorphx/light-metal_light01 384 0 0 0.25 0.25 0 0 0
+( -712 -576 -64 ) ( -712 -832 -64 ) ( -1152 -576 -64 ) exomorphx/floor-metal_panel_floor03 0 0 0 0.25 0.25 0 0 0
 ( -1152 -832 -80 ) ( -712 -832 -80 ) ( -1152 -576 -80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -960 -856 -64 ) ( -960 -888 -64 ) ( -960 -856 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -984 -1216 64 ) ( -1016 -1216 -64 ) ( -984 -1216 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -9468,7 +9468,7 @@ exomorphx/wall-metal_wall05
 ( -1280 -1288 64 ) ( -1280 -1296 -64 ) ( -1280 -1288 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 }
 {
-( -712 -576 -64 ) ( -712 -832 -64 ) ( -1152 -576 -64 ) exomorphx/light-metal_light01 384 0 0 0.25 0.25 0 0 0
+( -712 -576 -64 ) ( -712 -832 -64 ) ( -1152 -576 -64 ) exomorphx/floor-metal_panel_floor03 0 0 0 0.25 0.25 0 0 0
 ( -1152 -832 -80 ) ( -712 -832 -80 ) ( -1152 -576 -80 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -960 -856 -64 ) ( -960 -888 -64 ) ( -960 -856 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -952 -832 -64 ) ( -984 -832 -64 ) ( -952 -832 64 ) common/caulk 128 0 0 0.25 0.25 0 0 0
@@ -12719,7 +12719,7 @@ phillipk2x/walls-pk02_wall08b
 ( 256 968 360 ) ( 256 928 360 ) ( -512 968 360 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( 320 960 360 ) ( -448 960 360 ) ( 320 960 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( 320 968 360 ) ( 320 968 352 ) ( 320 928 360 ) common/caulk 128 128 0 0.25 0.25 0 0 0
-( -512 928 352 ) ( 256 928 352 ) ( -512 968 352 ) phillipk2x/pipes-pk02_pipes01 0 0 0 0.25 0.25 0 0 0
+( -512 928 352 ) ( 256 928 352 ) ( -512 968 352 ) phillipk2x/pipes-pk02_pipes01 0 0 90 0.25 0.25 0 0 0
 ( -448 896 352 ) ( -448 896 360 ) ( 320 896 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
 ( -512 928 352 ) ( -512 968 352 ) ( -512 928 360 ) common/caulk 128 128 0 0.25 0.25 0 0 0
 }
@@ -17015,7 +17015,7 @@ exomorphx/light-metal_light04
 ( 688 -576 -48 ) ( 664 -576 -48 ) ( 688 -576 80 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 ( 448 -432 80 ) ( 448 -456 -48 ) ( 448 -432 -48 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 ( 480 -480 -64 ) ( 480 -488 -64 ) ( 480 -480 64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 480 64 392 ) ( 448 64 400 ) ( 480 -64 392 ) exomorphx/light-metal_light04 0 0 90 0.25 0.25 0 0 0
+( 480 64 392 ) ( 448 64 400 ) ( 480 -64 392 ) phillipk2x/walls-pk02_wall08b 0 0 90 0.25 0.25 0 0 0
 }
 {
 ( 576 1104 400 ) ( 576 1088 400 ) ( 448 1104 400 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -17031,7 +17031,7 @@ exomorphx/light-metal_light04
 ( 688 -576 -48 ) ( 664 -576 -48 ) ( 688 -576 80 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 ( 576 -408 -48 ) ( 576 -432 -48 ) ( 576 -408 80 ) common/caulk 0 64 0 0.25 0.25 0 0 0
 ( 544 -480 64 ) ( 544 -488 -64 ) ( 544 -480 -64 ) common/caulk 0 0 0 0.25 0.25 0 0 0
-( 576 64 400 ) ( 544 64 392 ) ( 576 -64 400 ) exomorphx/light-metal_light04 0 0 90 0.25 0.25 0 0 0
+( 576 64 400 ) ( 544 64 392 ) ( 576 -64 400 ) phillipk2x/walls-pk02_wall08b 0 0 90 0.25 0.25 0 0 0
 }
 {
 ( 704 1088 416 ) ( 704 1072 416 ) ( 320 1088 416 ) common/caulk 0 0 0 0.25 0.25 0 0 0
@@ -18399,18 +18399,18 @@ exomorphx/light-metal_light04
 ( 368 1088 216 ) ( 360 1088 224 ) ( 368 1216 216 ) common/weapclip 0 0 90 0.25 0.25 0 0 0
 }
 {
-( 352 256 240 ) ( 288 256 240 ) ( 352 264 240 ) common/weapclip 160 0 -90 0.25 0.25 0 0 0
-( 368 256 240 ) ( 368 264 240 ) ( 368 256 160 ) common/weapclip 160 128 0 -0.25 0.25 0 0 0
-( 352 232 240 ) ( 352 232 160 ) ( 288 232 240 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
-( 288 264 160 ) ( 288 256 160 ) ( 352 264 160 ) common/weapclip 160 0 -90 0.25 0.25 0 0 0
-( 288 264 160 ) ( 288 264 240 ) ( 288 256 160 ) common/weapclip 160 128 0 -0.25 0.25 0 0 0
-( 288 296 160 ) ( 352 296 160 ) ( 288 296 240 ) common/weapclip 0 128 0 0.25 0.25 0 0 0
-( 288 -216 236 ) ( 292 -216 240 ) ( 288 -344 236 ) common/weapclip 160 0 -90 0.25 0.25 0 0 0
-( 304 232 160 ) ( 300 236 160 ) ( 304 232 288 ) common/weapclip 96 128 0 -0.25 0.25 0 0 0
-( 288 280 160 ) ( 292 284 160 ) ( 288 280 288 ) common/weapclip 32 128 0 0.25 0.25 0 0 0
-( 1472 240 240 ) ( 1472 232 232 ) ( 1344 240 240 ) common/weapclip 160 0 -90 0.25 0.25 0 0 0
-( 1472 296 232 ) ( 1472 292 236 ) ( 1344 296 232 ) common/weapclip 160 0 -90 0.25 0.25 0 0 0
-( 368 1088 216 ) ( 360 1088 224 ) ( 368 1216 216 ) common/weapclip 0 0 90 0.25 0.25 0 0 0
+( 432.7846069336 269.0717926025 240 ) ( 377.3589935303 237.0717926025 240 ) ( 428.7846069336 276 240 ) common/weapclip 226.5226898193 117.3534240723 -60 0.2499999851 0.2499999851 0 0 0
+( 446.6410217285 277.0717926025 240 ) ( 442.6410217285 284 240 ) ( 446.6410217285 277.0717926025 160 ) common/weapclip 153.5520019531 128 0 -0.2788296938 0.25 0 0 0
+( 444.7846221924 248.2871856689 240 ) ( 444.7846221924 248.2871856689 160 ) ( 389.3589935303 216.2871856689 240 ) common/weapclip 81.2861328125 128 0 0.2788296938 0.25 0 0 0
+( 373.3589935303 244 160 ) ( 377.3589935303 237.0717926025 160 ) ( 428.7846069336 276 160 ) common/weapclip 226.5226898193 117.3534240723 -60 0.2499999851 0.2499999851 0 0 0
+( 373.3589935303 244 160 ) ( 373.3589935303 244 240 ) ( 377.3589935303 237.0717926025 160 ) common/weapclip 153.5520019531 128 0 -0.2788296938 0.25 0 0 0
+( 357.3589782715 271.7128143311 160 ) ( 412.7846069336 303.7128143311 160 ) ( 357.3589782715 271.7128143311 240 ) common/weapclip 81.2861328125 128 0 0.2788296938 0.25 0 0 0
+( 613.3589935303 -171.6922149658 236 ) ( 616.8230895996 -169.6922149658 240 ) ( 677.3589935303 -282.54347229 236 ) common/weapclip 226.5226898193 117.3534240723 -60 0.2499999851 0.2499999851 0 0 0
+( 403.2153930664 224.2871856689 160 ) ( 397.7512969971 225.7512817383 160 ) ( 403.2153930664 224.2871856689 288 ) common/weapclip 214.8149414063 128 0 3.9874510765 0.25 0 0 0
+( 365.3589935303 257.8563995361 160 ) ( 366.8230895996 263.3205108643 160 ) ( 365.3589935303 257.8563995361 288 ) common/weapclip 38.4479980469 128 0 0.2788296938 0.25 0 0 0
+( 1410.7331085205 815.2154083252 240 ) ( 1414.7331085205 808.2872009277 232 ) ( 1299.8818511963 751.2154083252 240 ) common/weapclip 226.5226898193 117.3534240723 -60 0.2499999851 0.2499999851 0 0 0
+( 1382.7331085205 863.7128295898 232 ) ( 1384.7331085205 860.2487335205 236 ) ( 1271.8818511963 799.7128295898 232 ) common/weapclip 226.5226898193 117.3534240723 -60 0.2499999851 0.2499999851 0 0 0
+( 30.6410064697 997.60496521 216 ) ( 23.7127990723 993.60496521 224 ) ( -33.3589935303 1108.4562225342 216 ) common/weapclip 189.4773101807 138.6465759277 120 0.2499999851 0.2499999851 0 0 0
 }
 {
 ( 352 160 240 ) ( 288 160 240 ) ( 352 168 240 ) common/weapclip 32 0 -90 0.25 0.25 0 0 0
@@ -18427,18 +18427,18 @@ exomorphx/light-metal_light04
 ( 368 1088 216 ) ( 360 1088 224 ) ( 368 1216 216 ) common/weapclip 0 0 90 0.25 0.25 0 0 0
 }
 {
-( 344 432 240 ) ( 344 496 240 ) ( 352 432 240 ) common/weapclip 0 192 180 0.25 0.25 0 0 0
-( 344 416 240 ) ( 352 416 240 ) ( 344 416 160 ) common/weapclip 0 128 0 -0.25 0.25 0 0 0
-( 320 432 240 ) ( 320 432 160 ) ( 320 496 240 ) common/weapclip 64 128 0 -0.25 0.25 0 0 0
-( 352 496 160 ) ( 344 496 160 ) ( 352 432 160 ) common/weapclip 0 192 180 0.25 0.25 0 0 0
-( 352 496 160 ) ( 352 496 240 ) ( 344 496 160 ) common/weapclip 0 128 0 -0.25 0.25 0 0 0
-( 384 496 160 ) ( 384 432 160 ) ( 384 496 240 ) common/weapclip 64 128 0 -0.25 0.25 0 0 0
-( -128 496 236 ) ( -128 492 240 ) ( -256 496 236 ) common/weapclip 0 192 180 0.25 0.25 0 0 0
-( 320 480 160 ) ( 324 484 160 ) ( 320 480 288 ) common/weapclip 64 128 0 -0.25 0.25 0 0 0
-( 368 496 160 ) ( 372 492 160 ) ( 368 496 288 ) common/weapclip 64 128 0 -0.25 0.25 0 0 0
-( 328 -688 240 ) ( 320 -688 232 ) ( 328 -560 240 ) common/weapclip 0 192 180 0.25 0.25 0 0 0
-( 384 -688 232 ) ( 380 -688 236 ) ( 384 -560 232 ) common/weapclip 0 192 180 0.25 0.25 0 0 0
-( 1096 416 216 ) ( 1096 424 224 ) ( 1224 416 216 ) common/weapclip 224 64 0 0.25 0.25 0 0 0
+( 638.9299621582 437.3287963867 240 ) ( 664.9611053467 495.7957000732 240 ) ( 646.2383270264 434.0749053955 240 ) common/weapclip 247.255645752 50.4160842896 156 0.2499999851 0.2499999851 0 0 0
+( 632.422164917 422.7120666504 240 ) ( 639.7305297852 419.4581756592 240 ) ( 632.422164917 422.7120666504 160 ) common/weapclip 94.9646759033 128 0 -0.2613782883 0.25 0 0 0
+( 617.0048675537 447.0904693604 240 ) ( 617.0048675537 447.0904693604 160 ) ( 643.0360107422 505.5573730469 240 ) common/weapclip 53.8794555664 128 0 -0.2613782883 0.25 0 0 0
+( 672.2694702148 492.541809082 160 ) ( 664.9611053467 495.7957000732 160 ) ( 646.2383270264 434.0749053955 160 ) common/weapclip 247.255645752 50.4160842896 156 0.2499999851 0.2499999851 0 0 0
+( 672.2694702148 492.541809082 160 ) ( 672.2694702148 492.541809082 240 ) ( 664.9611053467 495.7957000732 160 ) common/weapclip 94.9646759033 128 0 -0.2613782883 0.25 0 0 0
+( 701.5029144287 479.5262298584 160 ) ( 675.4717712402 421.0593261719 160 ) ( 701.5029144287 479.5262298584 240 ) common/weapclip 53.8794555664 128 0 -0.2613782883 0.25 0 0 0
+( 233.7676544189 687.775390625 236 ) ( 232.1407165527 684.1212158203 240 ) ( 116.8338470459 739.8376922607 236 ) common/weapclip 247.255645752 50.4160842896 156 0.2499999851 0.2499999851 0 0 0
+( 636.5282287598 490.9406585693 160 ) ( 641.8093566895 492.967880249 160 ) ( 636.5282287598 490.9406585693 288 ) common/weapclip 184.04737854 128 0 -1.3446745872 0.25 0 0 0
+( 686.8861999512 486.0340270996 160 ) ( 688.9134216309 480.7528839111 160 ) ( 686.8861999512 486.0340270996 288 ) common/weapclip 53.8794555664 128 0 -0.2613782883 0.25 0 0 0
+( 168.7681884766 -579.3343200684 240 ) ( 161.4598236084 -576.0804138184 232 ) ( 220.8304748535 -462.4004974365 240 ) common/weapclip 247.255645752 50.4160842896 156 0.2499999851 0.2499999851 0 0 0
+( 219.9267272949 -602.1115570068 232 ) ( 216.2725524902 -600.4846191406 236 ) ( 271.9890289307 -485.1777496338 232 ) common/weapclip 247.255645752 50.4160842896 156 0.2499999851 0.2499999851 0 0 0
+( 1319.4083404541 116.8461151123 216 ) ( 1322.6622314453 124.1544647217 224 ) ( 1436.3421478271 64.7838134766 216 ) common/weapclip 232.7443237305 205.5839385986 -24 0.2499999851 0.2499999851 0 0 0
 }
 {
 ( -656 -888 16 ) ( -592 -888 16 ) ( -656 -896 16 ) common/weapclip 128 192 90 0.25 0.25 0 0 0
@@ -20342,6 +20342,40 @@ phillipk2x/walls-pk02_wall07b
 ( -368 -2240 224 ) ( -368 -2240 216 ) ( -368 -2112 224 ) common/clip 0 0 0 -0.25 0.25 0 0 0
 ( -208 -2112 208 ) ( -208 -2240 200 ) ( -208 -2240 208 ) common/clip 0 0 0 -0.25 0.25 0 0 0
 }
+{
+( 256 -296 360 ) ( 256 -336 360 ) ( -512 -296 360 ) common/caulk 0 192 0 0.25 0.25 0 0 0
+( 320 -304 360 ) ( -448 -304 360 ) ( 320 -304 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( 320 -296 360 ) ( 320 -296 352 ) ( 320 -336 360 ) common/caulk 64 128 0 0.25 0.25 0 0 0
+( -512 -336 352 ) ( 256 -336 352 ) ( -512 -296 352 ) phillipk2x/pipes-pk02_pipes01 0 0 90 0.25 0.25 0 0 0
+( -448 -368 352 ) ( -448 -368 360 ) ( 320 -368 352 ) common/caulk 0 128 0 0.25 0.25 0 0 0
+( -448 -304 64 ) ( -448 -368 -64 ) ( -448 -304 -64 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
+}
+{
+( 390.0377044678 826.5066070557 240 ) ( 348.899307251 777.4797668457 240 ) ( 383.9093475342 831.6488952637 240 ) common/weapclip 65.9278640747 79.4092941284 -40 0.2499999702 0.2499999702 0 0 0
+( 400.3222961426 838.7633056641 240 ) ( 394.1939544678 843.9056091309 240 ) ( 400.3222961426 838.7633056641 160 ) common/weapclip 254.4938659668 128 0 1.5306074619 0.25 0 0 0
+( 408.4227752686 811.0796966553 240 ) ( 408.4227752686 811.0796966553 160 ) ( 367.284362793 762.0528564453 240 ) common/weapclip 103.1634521484 128 0 1.5306074619 0.25 0 0 0
+( 342.7709503174 782.6220550537 160 ) ( 348.899307251 777.4797668457 160 ) ( 383.9093475342 831.6488952637 160 ) common/weapclip 65.9278640747 79.4092941284 -40 0.2499999702 0.2499999702 0 0 0
+( 342.7709503174 782.6220550537 160 ) ( 342.7709503174 782.6220550537 240 ) ( 348.899307251 777.4797668457 160 ) common/weapclip 254.4938659668 128 0 1.5306074619 0.25 0 0 0
+( 318.257522583 803.1912689209 160 ) ( 359.3959350586 852.2181091309 160 ) ( 318.257522583 803.1912689209 240 ) common/weapclip 103.1634521484 128 0 1.5306074619 0.25 0 0 0
+( 710.4722442627 474.0840606689 236 ) ( 713.0433959961 477.148223877 240 ) ( 808.5259246826 391.8072509766 236 ) common/weapclip 65.9278640747 79.4092941284 -40 0.2499999702 0.2499999702 0 0 0
+( 377.5689697266 774.3095703125 160 ) ( 371.9336395264 773.8165435791 160 ) ( 377.5689697266 774.3095703125 288 ) common/weapclip 237.4554443359 128 0 1.5306074619 0.25 0 0 0
+( 330.5142364502 792.9066619873 160 ) ( 330.0212097168 798.5419921875 160 ) ( 330.5142364502 792.9066619873 288 ) common/weapclip 104.5801849365 128 0 0.2698873878 0.25 0 0 0
+( 1122.2164306641 1674.191696167 240 ) ( 1128.3447875977 1669.0493927002 232 ) ( 1039.9396362305 1576.1380157471 240 ) common/weapclip 65.9278640747 79.4092941284 -40 0.2499999702 0.2499999702 0 0 0
+( 1079.3179473877 1710.1878051758 232 ) ( 1082.3821258545 1707.6166534424 236 ) ( 997.0411529541 1612.1341247559 232 ) common/weapclip 65.9278640747 79.4092941284 -40 0.2499999702 0.2499999702 0 0 0
+( -175.743057251 1322.1395263672 216 ) ( -180.8853607178 1316.0111694336 224 ) ( -273.7967376709 1404.4163208008 216 ) common/weapclip 158.0721588135 176.5906829834 140 0.2499999702 0.2499999702 0 0 0
+}
+{
+patchDef2
+{
+decals/scorch01
+( 3 3 0 0 0 )
+(
+( ( 296 212.3374633789 247.4578857422 0 0 ) ( 296 258.4061279297 247.4578857422 0 0.5 ) ( 296 304.4747924805 247.4578857422 0 1 ) )
+( ( 296 212.3374633789 202.3752441406 0.5 0 ) ( 296 258.4061279297 202.3752441406 0.5 0.5 ) ( 296 304.4747924805 202.3752441406 0.5 1 ) )
+( ( 296 212.3374633789 157.2926025391 1 0 ) ( 296 258.4061279297 157.2926025391 1 0.5 ) ( 296 304.4747924805 157.2926025391 1 1 ) )
+)
+}
+}
 }
 {
 "classname" "info_player_deathmatch"
@@ -21466,7 +21500,7 @@ facility114invx/base-baseblack
 }
 {
 "classname" "weapon_grenadelauncher"
-"origin" "-1248.000000 -416.000000 168.000000"
+"origin" "-1264.000000 -384.000000 168.000000"
 }
 {
 "classname" "weapon_uzi"
@@ -21581,12 +21615,12 @@ facility114invx/base-baseblack
 }
 {
 "classname" "item_cells"
-"origin" "360.000000 392.000000 160.000000"
+"origin" "328.000000 456.000000 160.000000"
 "angle" "90.000000"
 }
 {
 "classname" "info_player_deathmatch"
-"origin" "-1184.000000 -440.000000 192.000000"
+"origin" "-1264.000000 -448.000000 192.000000"
 "angle" "89.999992"
 }
 {
@@ -21623,10 +21657,10 @@ facility114invx/base-baseblack
 }
 {
 "classname" "misc_gamemodel"
-"origin" "319.999695 264.000122 160.000000"
+"origin" "401.071442 259.999969 160.000000"
 "model" "models/containers/crate02.md3"
 "modelscale" "0.800000"
-"angle" "-179.999985"
+"angle" "-150.000000"
 }
 {
 "classname" "misc_gamemodel"
@@ -21637,10 +21671,10 @@ facility114invx/base-baseblack
 }
 {
 "classname" "misc_gamemodel"
-"origin" "351.999908 463.999786 160.000000"
+"origin" "659.253662 463.308228 160.000015"
 "model" "models/containers/crate02.md3"
 "modelscale" "0.800000"
-"angle" "90.000015"
+"angle" "66.000015"
 }
 {
 "classname" "misc_gamemodel"
@@ -21889,7 +21923,7 @@ facility114invx/base-baseblack
 }
 {
 "classname" "misc_breakablemodel"
-"origin" "-1280.000000 -464.000000 160.000000"
+"origin" "-1160.000000 -448.000000 160.000000"
 "model" "models/containers/barrel01.md3"
 "count" "1"
 "debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
@@ -22314,3 +22348,33 @@ facility114invx/base-baseblack
 "classname" "info_player_deathmatch"
 "origin" "-1256.000000 -632.000000 -40.000000"
 }
+{
+"classname" "misc_breakablemodel"
+"origin" "328.000000 256.000000 160.000000"
+"model" "models/containers/barrel01.md3"
+"count" "1"
+"debris" "models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3 models/onslaught/gen_gib1.md3 models/onslaught/gen_gib2.md3 models/onslaught/gen_gib3.md3"
+"debrisdamageforcescale" "1"
+"debrisfadetime" "1"
+"debrissolid" "0"
+"debristime" "5"
+"debristimejitter" "2"
+"dmg" "25"
+"dmg_edge" "25"
+"dmg_force" "600"
+"dmg_radius" "190"
+"health" "25"
+"mdl" "TE_TEI_BIGEXPLOSION"
+"message" "was killed by an explosive barrel"
+"noise" "sound/weapons/rocket_impact.ogg"
+"respawntime" "35"
+"respawntimejitter" "10"
+"message2" "was killed with an explosive barrel by"
+}
+{
+"classname" "misc_gamemodel"
+"origin" "363.340271 807.135498 160.000015"
+"model" "models/containers/crate02.md3"
+"modelscale" "0.800000"
+"angle" "-129.999985"
+}

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