Change some lights, little fixes, waypoints

diff --git a/maps/atomforge.jpg b/maps/atomforge.jpg
index a4a6d2e12154a8920985ac631b145808f7afedcf..1c6c4be9bb771210a8b6effc4ff0bcd8fd731c19 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 471ad9c6ac3aff41e6e473b5defab9f3fb8ae38d..b8401cf4751ef51808b9b1e41c667674ec6195bd 100644 (file)
--- a/maps/atomforge.map
+++ b/maps/atomforge.map
@@ -2565,7 +2565,7 @@ exomorphx/wall-metal_panel03
 }
 {
 ( -512 -496 576 ) ( -512 -504 576 ) ( -1280 -496 576 ) common/caulk 0 192 0 0.25 0.25 0 0 0
-( -192 -496 408 ) ( -960 -496 408 ) ( -192 -496 320 ) exomorphx/wall-metal_panel04 0 128 0 0.25 0.25 0 0 0
+( -192 -496 408 ) ( -960 -496 408 ) ( -192 -496 320 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
 ( -320 -496 408 ) ( -320 -496 320 ) ( -320 -504 408 ) common/caulk 64 0 0 0.25 0.25 0 0 0
 ( -1280 -500 320 ) ( -1280 -500 408 ) ( -512 -500 320 ) common/caulk 0 0 0 0.25 0.25 0 0 0
 ( -1152 -504 320 ) ( -1152 -496 320 ) ( -1152 -504 408 ) common/caulk 64 0 0 0.25 0.25 0 0 0
@@ -2954,7 +2954,7 @@ exomorphx/wall-metal_panel03
 }
 {
 ( -96 -1088 576 ) ( -88 -1088 576 ) ( -96 -1856 576 ) common/caulk 0 136 0 0.25 0.25 0 0 0
-( -96 -448 408 ) ( -96 -1216 408 ) ( -96 -448 320 ) exomorphx/wall-metal_panel04 0 136 0 0.25 0.25 0 0 0
+( -96 -448 408 ) ( -96 -1216 408 ) ( -96 -448 320 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
 ( -96 -512 408 ) ( -96 -512 320 ) ( -88 -512 408 ) exomorphx/wall-metal_panel04 0 136 0 0.25 0.25 0 0 0
 ( -88 -1280 320 ) ( -88 -1280 408 ) ( -88 -512 320 ) common/caulk 0 136 0 0.25 0.25 0 0 0
 ( -88 -1792 320 ) ( -96 -1792 320 ) ( -88 -1792 408 ) exomorphx/wall-metal_panel04 0 136 0 0.25 0.25 0 0 0
@@ -3246,7 +3246,7 @@ exomorphx/wall-metal_panel03
 }
 {
 ( 768 -632 320 ) ( 776 -632 320 ) ( 768 -1400 320 ) common/caulk 224 128 90 0.25 0.25 0 0 0
-( 768 -512 152 ) ( 768 -1280 152 ) ( 768 -512 64 ) exomorphx/wall-metal_panel04 992 128 0 0.25 0.25 0 0 0
+( 768 -512 152 ) ( 768 -1280 152 ) ( 768 -512 64 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
 ( 768 -640 152 ) ( 768 -640 64 ) ( 776 -640 152 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
 ( 776 -1400 64 ) ( 776 -1400 152 ) ( 776 -632 64 ) common/caulk 224 0 0 0.25 0.25 0 0 0
 ( 776 -1272 64 ) ( 768 -1272 64 ) ( 776 -1272 152 ) common/caulk 128 0 0 -0.25 0.25 0 0 0
@@ -5155,7 +5155,7 @@ exomorphx/wall-metal_panel03
 }
 {
 ( -1536 -1216 576 ) ( -1544 -1216 576 ) ( -1536 -448 576 ) common/caulk 0 128 -90 0.25 0.25 0 0 0
-( -1536 -1856 408 ) ( -1536 -1088 408 ) ( -1536 -1856 320 ) exomorphx/wall-metal_panel04 0 136 0 0.25 0.25 0 0 0
+( -1536 -1856 408 ) ( -1536 -1088 408 ) ( -1536 -1856 320 ) phillipk2x/walls-pk02_wall08b 0 0 0 0.25 0.25 0 0 0
 ( -1536 -1792 408 ) ( -1536 -1792 320 ) ( -1544 -1792 408 ) common/caulk 128 0 0 0.25 0.25 0 0 0
 ( -1544 -1024 320 ) ( -1544 -1024 408 ) ( -1544 -1792 320 ) common/caulk 0 0 0 -0.25 0.25 0 0 0
 ( -1544 -512 320 ) ( -1536 -512 320 ) ( -1544 -512 408 ) common/caulk 128 0 0 0.25 0.25 0 0 0
@@ -20393,11 +20393,11 @@ decals/scorch01
 ( -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
+( -632.6766815186 -577.4671936035 350 ) ( -632.6766662598 -609.4671783447 350 ) ( -632.6766815186 -577.4671936035 126 ) facility114invx/base-baseblack 336 493 90 0.25 0.25 134217728 0 0
+( -628.4340362549 -576.0529937744 350 ) ( -628.4340362549 -576.0529937744 126 ) ( -596.4340362549 -576.0529785156 350 ) common/caulk 113.2215576172 239.9991455078 0 -0.8709128499 0.1250000596 134217728 0 0
+( -596.4340362549 -600.0529785156 190 ) ( -596.4340362549 -568.0529937744 190 ) ( -628.4340362549 -600.0529937744 190 ) exomorphx/wall-metal_wall05 829 0 90 0.25 0.25 134217728 0 0
+( -587.9487609863 -605.2245483398 126 ) ( -587.9487609863 -605.2245483398 350 ) ( -587.9487609863 -573.2245483398 126 ) facility114invx/base-baseblack 336 493 90 0.25 0.25 134217728 0 0
+( 75.5657958984 -576.0529327393 222 ) ( 75.5657958984 -608.0529174805 190 ) ( -52.434173584 -576.052947998 222 ) exomorphx/wall-metal_wall05 829 0 90 0.25 0.25 134217728 0 0
 }
 {
 ( -512 -376 584 ) ( -512 -336 584 ) ( 256 -376 584 ) common/caulk 0 64 180 0.25 0.25 0 0 0
@@ -20773,7 +20773,7 @@ decals/scorch01
 {
 "classname" "light"
 "origin" "-832.000000 -1920.000000 240.000000"
-"light" "50"
+"light" "40"
 }
 {
 "classname" "func_rotating"
@@ -21765,7 +21765,7 @@ facility114invx/base-baseblack
 {
 "classname" "light"
 "origin" "512.000000 1136.000000 312.000000"
-"light" "30"
+"light" "20"
 }
 {
 "classname" "func_rotating"
@@ -22455,6 +22455,6 @@ facility114invx/base-baseblack
 }
 {
 "classname" "item_health_medium"
-"origin" "648.000000 -1176.000000 160.000000"
+"origin" "712.000000 -1200.000000 160.000000"
 "angle" "90.000000"
 }

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