diff --git a/html/changelogs/Stev-the-third-nuke-silo-weather.yml b/html/changelogs/Stev-the-third-nuke-silo-weather.yml
new file mode 100644
index 00000000000..7a79545b368
--- /dev/null
+++ b/html/changelogs/Stev-the-third-nuke-silo-weather.yml
@@ -0,0 +1,60 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Stev-the-third
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - rscadd: "Adds an invisible object to fix pathing with the ICBM."
+ - rscadd: "Adds weather and lighting to the Nuclear Silo/Arctic Valley map."
+ - rscadd: "Lights and rearranging of floors in the Nuclear Silo."
diff --git a/maps/away/scenarios/nuclear_silo/missile_silo.dm b/maps/away/scenarios/nuclear_silo/missile_silo.dm
index 992fa8a5106..850296ea48b 100644
--- a/maps/away/scenarios/nuclear_silo/missile_silo.dm
+++ b/maps/away/scenarios/nuclear_silo/missile_silo.dm
@@ -11,12 +11,15 @@
desc = "A Zavodskoi-designed hypersonic missile carrying a nuclear payload. With a maximum speed of over 20% the speed of light in vacuum or Mach 25 in atmosphere, interplanetary travel capability, and an accuracy to the meter, this missile forms a cornerstone of arsenals galaxy-wide, able to function as both an anti-orbital weapon and an intercontinental nuclear bomb, delivered anywhere on a planet or in a solar system. The nuclear warhead on this has enough power to level a city."
icon = 'icons/effects/icbm.dmi'
icon_state = "icbm"
- density = 1
+ density = 0
anchored = 1
layer = ABOVE_HUMAN_LAYER
pixel_x = 8
pixel_y = 10
-/obj/structure/ship_weapon_dummy/icbm_dummy
+/obj/structure/icbm_dummy
name = "icbm dummy"
- layer = ABOVE_HUMAN_LAYER+0.1
+ icon = null
+ density = 1
+ anchored = 1
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
index 89d16574b6a..c668e778cf1 100644
--- a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
+++ b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
@@ -175,6 +175,10 @@
/obj/structure/platform/dark{
dir = 1
},
+/obj/structure/railing/mapped{
+ dir = 4
+ },
+/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -246,9 +250,6 @@
/area/nuclear_silo/lower_level/checkpoint)
"aB" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 4
- },
/obj/random/dirt_75,
/obj/random/dirt_75,
/turf/simulated/floor/plating,
@@ -674,6 +675,9 @@
/obj/effect/floor_decal/industrial/outline_corner/red{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 6
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -730,9 +734,6 @@
/area/nuclear_silo/outside/buildings)
"bP" = (
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 8
- },
/obj/random/dirt_75,
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
@@ -1573,9 +1574,6 @@
/turf/simulated/floor/exoplanet/wood,
/area/nuclear_silo/outside/buildings)
"dC" = (
-/obj/structure/railing/mapped{
- dir = 4
- },
/obj/machinery/light/colored/red{
dir = 8
},
@@ -1819,6 +1817,9 @@
dir = 4
},
/obj/random/junk,
+/obj/machinery/light/colored/dying{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/maintenance/north)
"ed" = (
@@ -1840,9 +1841,6 @@
},
/obj/structure/cable/green,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 8
- },
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
"ef" = (
@@ -1987,7 +1985,8 @@
dir = 10
},
/obj/machinery/door/window{
- dir = 8
+ dir = 8;
+ req_access = list(248,247)
},
/turf/simulated/floor/tiled/white,
/area/nuclear_silo/outside/buildings)
@@ -2354,7 +2353,9 @@
/obj/machinery/light/colored/decayed{
dir = 1
},
-/obj/structure/closet/secure_closet/medical2,
+/obj/structure/closet/secure_closet/medical2{
+ req_access = list(248,247)
+ },
/turf/simulated/floor/tiled/white,
/area/nuclear_silo/outside/buildings)
"fm" = (
@@ -2643,6 +2644,9 @@
},
/obj/random/dirt_75,
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 4
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -3837,6 +3841,10 @@
},
/turf/simulated/floor/tiled/white,
/area/nuclear_silo/lower_level/medbay)
+"iB" = (
+/obj/structure/light_pole/decayed,
+/turf/simulated/floor/exoplanet/snow/cold,
+/area/nuclear_silo/outside/buildings/town)
"iC" = (
/obj/structure/bookcase/libraryspawn,
/turf/simulated/floor/carpet/purple,
@@ -3910,9 +3918,6 @@
},
/area/nuclear_silo/lower_level/medbay)
"iK" = (
-/obj/structure/railing/mapped{
- dir = 4
- },
/obj/random/dirt_75,
/obj/machinery/light/colored/red{
dir = 8
@@ -4008,10 +4013,11 @@
/turf/simulated/floor/exoplanet/barren,
/area/nuclear_silo/outside/surface)
"iX" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/structure/closet/secure_closet/personal/cabinet{
+ req_access = list(248,247)
+ },
/obj/random/arcade,
/obj/random/hoodie,
-/obj/outfit/admin/generic/nuclear_silo_crew/upper/villager,
/turf/simulated/floor/exoplanet/carpet/red,
/area/nuclear_silo/outside/buildings)
"iY" = (
@@ -4019,6 +4025,7 @@
dir = 4
},
/obj/random/dirt_75,
+/obj/effect/floor_decal/industrial/outline_segment/red,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -5506,6 +5513,10 @@
},
/obj/random/dirt_75,
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -5812,9 +5823,15 @@
/area/nuclear_silo/outside/buildings/town)
"mS" = (
/obj/random/dirt_75,
-/obj/random/dirt_75,
-/obj/random/dirt_75,
-/turf/simulated/floor/tiled/steel,
+/obj/effect/floor_decal/industrial/outline_corner/red{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/ridged{
+ temperature = 315.15
+ },
/area/nuclear_silo/lower_level/nuke_silo)
"mT" = (
/obj/structure/railing/mapped{
@@ -6332,12 +6349,9 @@
/turf/simulated/floor/carpet/magenta,
/area/nuclear_silo/outside/buildings/town)
"nX" = (
-/obj/random/dirt_75,
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 4
+/turf/simulated/floor/tiled/ridged{
+ temperature = 315.15
},
-/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
"nY" = (
/obj/structure/table/stone/marble,
@@ -6569,9 +6583,10 @@
/turf/simulated/floor/wood/walnut,
/area/nuclear_silo/lower_level/civilian/crew_quarters)
"oA" = (
-/obj/structure/closet/secure_closet/personal/cabinet,
+/obj/structure/closet/secure_closet/personal/cabinet{
+ req_access = list(248,247)
+ },
/obj/random/coin,
-/obj/outfit/admin/generic/nuclear_silo_crew/upper/villager,
/turf/simulated/floor/exoplanet/carpet/red,
/area/nuclear_silo/outside/buildings)
"oB" = (
@@ -6756,7 +6771,7 @@
/obj/random/dirt_75,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/ship_weapon_dummy/icbm_dummy,
+/obj/structure/icbm_dummy,
/turf/simulated/floor/concrete,
/area/nuclear_silo/lower_level/nuke_silo)
"oY" = (
@@ -6976,13 +6991,13 @@
dir = 9
},
/obj/random/dirt_75,
-/obj/structure/platform/dark{
- dir = 1
+/obj/structure/railing/mapped{
+ dir = 1;
+ pixel_y = 11
},
-/obj/structure/platform_deco/dark{
- dir = 6
+/obj/structure/railing/mapped{
+ dir = 4
},
-/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -7128,6 +7143,10 @@
dir = 1
},
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -7700,6 +7719,9 @@
pixel_y = 10
},
/obj/item/reagent_containers/toothbrush/green,
+/obj/machinery/light/colored/decayed{
+ dir = 4
+ },
/turf/simulated/floor/tiled/freezer{
temperature = 268.15
},
@@ -8079,6 +8101,9 @@
/obj/random/desktoy,
/obj/random/dirt_75,
/obj/random/dirt_75,
+/obj/machinery/light/colored/decayed{
+ dir = 8
+ },
/turf/simulated/floor/exoplanet/carpet/red,
/area/nuclear_silo/outside/buildings)
"sd" = (
@@ -8121,6 +8146,9 @@
dir = 8
},
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 4
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -8490,6 +8518,13 @@
/obj/structure/platform_deco/dark{
dir = 5
},
+/obj/structure/railing/mapped{
+ dir = 1;
+ pixel_y = 11
+ },
+/obj/structure/railing/mapped{
+ dir = 8
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -10488,6 +10523,10 @@
dir = 1
},
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 4
+ },
+/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -10732,10 +10771,15 @@
/turf/simulated/floor/tiled,
/area/nuclear_silo/lower_level/civilian/crew_quarters)
"xO" = (
-/obj/structure/railing/mapped{
+/obj/structure/platform/dark{
dir = 4
},
-/turf/simulated/floor/tiled/steel,
+/obj/structure/railing/mapped{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/ridged{
+ temperature = 315.15
+ },
/area/nuclear_silo/lower_level/nuke_silo)
"xP" = (
/obj/structure/morgue,
@@ -11858,11 +11902,17 @@
/obj/random/dirt_75,
/turf/simulated/floor/exoplanet/plating,
/area/nuclear_silo/outside/cave/bunker)
+"Ao" = (
+/obj/structure/mopbucket,
+/obj/item/mop,
+/turf/simulated/floor/exoplanet/concrete/square,
+/area/nuclear_silo/lower_level/maintenance/east/cellar)
"Ap" = (
/obj/structure/table/wood,
/obj/machinery/door/window{
dir = 1;
- pixel_y = -14
+ pixel_y = -14;
+ req_one_access = list(248,247)
},
/turf/simulated/floor/exoplanet/wood,
/area/nuclear_silo/outside/buildings)
@@ -12191,6 +12241,14 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/item/reagent_containers/glass/bucket{
+ pixel_y = 12;
+ pixel_x = 7
+ },
+/obj/random/soap{
+ pixel_y = -5;
+ pixel_x = -5
+ },
/turf/simulated/floor/exoplanet/concrete/square,
/area/nuclear_silo/lower_level/maintenance/east/cellar)
"Ba" = (
@@ -12439,10 +12497,6 @@
/obj/structure/lattice/catwalk,
/obj/structure/track,
/obj/effect/decal/cleanable/floor_damage/random_burned,
-/obj/structure/platform/dark{
- dir = 1
- },
-/obj/structure/railing/mapped,
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
"BB" = (
@@ -12711,6 +12765,9 @@
/area/nuclear_silo/lower_level/civilian/crew_quarters)
"Cg" = (
/obj/effect/floor_decal/industrial/outline_corner/red,
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 5
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -12734,6 +12791,9 @@
/obj/random/dirt_75,
/obj/random/dirt_75,
/obj/random/pottedplant,
+/obj/machinery/light/colored/decayed{
+ dir = 1
+ },
/turf/simulated/floor/wood/maple,
/area/nuclear_silo/outside/buildings)
"Cj" = (
@@ -12812,16 +12872,6 @@
/obj/random/dirt_75,
/turf/simulated/floor/tiled,
/area/nuclear_silo/lower_level/checkpoint)
-"Cu" = (
-/obj/structure/railing/mapped{
- dir = 8
- },
-/obj/random/dirt_75,
-/obj/machinery/light/colored/red{
- dir = 4
- },
-/turf/simulated/floor/tiled/steel,
-/area/nuclear_silo/lower_level/nuke_silo)
"Cv" = (
/obj/machinery/door/airlock/glass_service{
name = "Messhall"
@@ -13041,6 +13091,9 @@
dir = 4
},
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 8
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -13219,9 +13272,6 @@
},
/area/nuclear_silo/outside/buildings)
"Dk" = (
-/obj/structure/railing/mapped{
- dir = 8
- },
/obj/random/dirt_75,
/obj/random/dirt_75,
/obj/machinery/light/colored/red{
@@ -13327,6 +13377,10 @@
/obj/random/dirt_75,
/turf/simulated/floor/exoplanet/lino,
/area/nuclear_silo/outside/buildings)
+"Dw" = (
+/obj/structure/light_pole/decayed/r,
+/turf/simulated/floor/exoplanet/snow/cold,
+/area/nuclear_silo/outside/buildings/town)
"Dx" = (
/obj/machinery/shower{
dir = 4
@@ -13367,11 +13421,7 @@
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/platform/dark{
- dir = 1
- },
-/obj/structure/railing/mapped,
-/obj/structure/ship_weapon_dummy/icbm_dummy,
+/obj/structure/icbm_dummy,
/turf/simulated/floor/concrete,
/area/nuclear_silo/lower_level/nuke_silo)
"DC" = (
@@ -13444,13 +13494,12 @@
/turf/simulated/floor/exoplanet/plating,
/area/nuclear_silo/outside/cave/bunker)
"DJ" = (
-/obj/structure/railing/mapped{
- dir = 8
+/obj/structure/bed/stool/chair/padded/red{
+ dir = 4
},
-/obj/random/dirt_75,
-/obj/random/dirt_75,
-/turf/simulated/floor/tiled/steel,
-/area/nuclear_silo/lower_level/nuke_silo)
+/obj/abstract/weather_marker/nuclear_silo,
+/turf/simulated/floor/exoplanet/wood,
+/area/nuclear_silo/outside/buildings)
"DK" = (
/obj/random/dirt_75,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -13823,10 +13872,9 @@
},
/obj/random/dirt_75,
/obj/random/dirt_75,
-/obj/structure/platform/dark{
- dir = 1
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 10
},
-/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -14004,11 +14052,15 @@
/turf/simulated/floor/exoplanet/barren,
/area/nuclear_silo/outside/surface)
"Fa" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
+/obj/effect/floor_decal/industrial/outline_corner/red{
dir = 8
},
-/turf/simulated/floor/plating,
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/ridged{
+ temperature = 315.15
+ },
/area/nuclear_silo/lower_level/nuke_silo)
"Fb" = (
/obj/machinery/door/airlock/maintenance_hatch{
@@ -14337,12 +14389,15 @@
/turf/simulated/floor/exoplanet/dirt_konyang,
/area/nuclear_silo/outside/mountain)
"FM" = (
-/obj/structure/railing/mapped{
- dir = 8
- },
+/obj/structure/lattice/catwalk/indoor/grate/dark,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/random/dirt_75,
-/turf/simulated/floor/tiled/steel,
-/area/nuclear_silo/lower_level/nuke_silo)
+/obj/machinery/light/colored/dying{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/nuclear_silo/lower_level/maintenance/north)
"FN" = (
/obj/effect/floor_decal/corner/dark_blue{
dir = 6
@@ -14511,7 +14566,7 @@
/obj/structure/track,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/effect/decal/cleanable/floor_damage/random_burned,
-/obj/structure/ship_weapon_dummy/icbm_dummy,
+/obj/structure/icbm_dummy,
/turf/simulated/floor/concrete,
/area/nuclear_silo/lower_level/nuke_silo)
"Gg" = (
@@ -14587,9 +14642,6 @@
/obj/random/dirt_75,
/obj/random/dirt_75,
/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 4
- },
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
"Go" = (
@@ -14973,7 +15025,8 @@
/obj/structure/table/wood,
/obj/structure/window/reinforced{
dir = 1;
- pixel_y = -14
+ pixel_y = -14;
+ req_one_access = list(248,247)
},
/turf/simulated/floor/exoplanet/wood,
/area/nuclear_silo/outside/buildings)
@@ -15380,6 +15433,9 @@
},
/turf/simulated/floor/tiled/dark,
/area/nuclear_silo/lower_level/engineering)
+"If" = (
+/turf/unsimulated/marker,
+/area/nuclear_silo/outside/mountain)
"Ig" = (
/obj/structure/window/reinforced{
dir = 1;
@@ -16317,6 +16373,9 @@
/obj/structure/platform/dark{
dir = 8
},
+/obj/structure/railing/mapped{
+ dir = 4
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -16626,12 +16685,15 @@
/turf/simulated/floor/tiled/dark,
/area/nuclear_silo/lower_level/civilian/hydroponics)
"KP" = (
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/railing/mapped{
- dir = 4
+/obj/random/junk,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/random/dirt_75,
+/obj/machinery/light/colored/dying{
+ dir = 8
},
-/turf/simulated/floor/plating,
-/area/nuclear_silo/lower_level/nuke_silo)
+/turf/simulated/floor/tiled/dark,
+/area/nuclear_silo/lower_level/maintenance/north)
"KQ" = (
/obj/structure/closet/secure_closet{
icon_state = "sec";
@@ -16834,13 +16896,13 @@
/obj/structure/platform_deco/dark{
dir = 5
},
-/obj/structure/platform/dark{
- dir = 1
+/obj/structure/railing/mapped{
+ dir = 1;
+ pixel_y = 11
},
-/obj/structure/platform_deco/dark{
- dir = 10
+/obj/structure/railing/mapped{
+ dir = 8
},
-/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -18027,7 +18089,7 @@
/obj/structure/track,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/ship_weapon_dummy/icbm_dummy,
+/obj/structure/icbm_dummy,
/turf/simulated/floor/concrete,
/area/nuclear_silo/lower_level/nuke_silo)
"Oh" = (
@@ -19320,11 +19382,13 @@
/turf/simulated/floor/tiled/gunmetal,
/area/nuclear_silo/outside/cave/bunker)
"Re" = (
-/obj/structure/railing/mapped{
- dir = 4
+/obj/effect/floor_decal/concrete{
+ dir = 6
},
-/obj/random/dirt_75,
-/turf/simulated/floor/tiled/steel,
+/obj/effect/floor_decal/concrete{
+ dir = 9
+ },
+/turf/simulated/floor/exoplanet/concrete/square,
/area/nuclear_silo/lower_level/nuke_silo)
"Rf" = (
/obj/effect/floor_decal/corner/dark_green{
@@ -20412,6 +20476,9 @@
"Tv" = (
/obj/effect/floor_decal/industrial/outline_corner/red,
/obj/random/dirt_75,
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 8
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -20696,11 +20763,7 @@
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/platform/dark{
- dir = 1
- },
/obj/structure/icbm,
-/obj/structure/railing/mapped,
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/nuke_silo)
"Uc" = (
@@ -21843,7 +21906,7 @@
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/ship_weapon_dummy/icbm_dummy,
+/obj/structure/icbm_dummy,
/turf/simulated/floor/concrete,
/area/nuclear_silo/lower_level/nuke_silo)
"Wy" = (
@@ -22145,10 +22208,9 @@
/obj/random/dirt_75,
/obj/effect/decal/cleanable/floor_damage/random_burned,
/obj/random/dirt_75,
-/obj/structure/platform/dark{
- dir = 1
+/obj/effect/floor_decal/industrial/outline_segment/red{
+ dir = 4
},
-/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -22823,6 +22885,9 @@
"Yx" = (
/obj/structure/table/wood/mahogany,
/obj/random/dirt_75,
+/obj/machinery/light/colored/decayed{
+ dir = 4
+ },
/turf/simulated/floor/exoplanet/carpet/red,
/area/nuclear_silo/outside/buildings)
"Yy" = (
@@ -23142,6 +23207,13 @@
},
/obj/random/dirt_75,
/obj/random/dirt_75,
+/obj/structure/railing/mapped{
+ dir = 1;
+ pixel_y = 11
+ },
+/obj/structure/railing/mapped{
+ dir = 4
+ },
/turf/simulated/floor/tiled/ridged{
temperature = 315.15
},
@@ -23165,6 +23237,9 @@
/obj/structure/railing/mapped,
/obj/structure/closet,
/obj/random/dirt_75,
+/obj/machinery/light/colored/dying{
+ dir = 1
+ },
/turf/simulated/floor/plating,
/area/nuclear_silo/lower_level/maintenance/north)
"Zo" = (
@@ -23394,9 +23469,6 @@
/obj/machinery/alarm/east{
req_one_access = list(248,247)
},
-/obj/structure/railing/mapped{
- dir = 8
- },
/obj/structure/lattice/catwalk/indoor/grate,
/obj/random/dirt_75,
/turf/simulated/floor/plating,
@@ -40837,7 +40909,7 @@ vY
vY
WO
Jy
-nV
+KP
xI
Cw
mg
@@ -41614,7 +41686,7 @@ rL
NM
rL
nV
-rL
+FM
wD
rN
NM
@@ -42114,13 +42186,13 @@ kS
dC
aB
rM
-KP
-Re
-xO
+rM
+jL
+Pc
iK
Gn
LL
-nX
+LL
dU
vY
QO
@@ -42378,7 +42450,7 @@ CR
pQ
zS
Ll
-Pc
+xO
vY
co
rP
@@ -42635,7 +42707,7 @@ er
Lx
hV
Xc
-jL
+nX
fY
gd
RW
@@ -43149,7 +43221,7 @@ VD
oX
Wx
DB
-bC
+Re
fY
co
QG
@@ -43406,7 +43478,7 @@ QD
FD
Gf
BA
-bC
+Fa
fY
aC
Ba
@@ -43663,7 +43735,7 @@ oO
On
bU
EA
-jL
+nX
fY
zM
MZ
@@ -43920,7 +43992,7 @@ Ki
xl
Yp
px
-jL
+Ki
vY
aC
Cy
@@ -44168,12 +44240,12 @@ mW
mW
kS
Dk
-Fa
+rM
rM
bP
-Cu
-DJ
-FM
+oB
+bC
+jL
ZP
qQ
ee
@@ -51405,7 +51477,7 @@ bi
eE
eE
eE
-eE
+Ao
bi
TK
TK
@@ -109974,7 +110046,7 @@ lD
YI
yH
lD
-Vh
+rh
fy
sZ
YN
@@ -112721,7 +112793,7 @@ EG
EG
EG
hz
-mW
+hz
mW
mW
mW
@@ -121068,7 +121140,7 @@ DN
qo
LY
Pw
-Pw
+DJ
kJ
ZW
qo
@@ -123391,7 +123463,7 @@ DE
DE
DE
DN
-DN
+iB
DN
DN
DN
@@ -124683,7 +124755,7 @@ qo
qo
qo
DN
-DN
+Dw
DN
wP
Lq
@@ -126464,7 +126536,7 @@ DN
DN
DE
qo
-DN
+iB
DN
DN
DN
@@ -139485,7 +139557,7 @@ zA
lD
hz
Lq
-mW
+If
mW
mW
mW
@@ -139742,7 +139814,7 @@ fo
lD
hz
Lq
-mW
+If
mW
mW
mW
@@ -139999,7 +140071,7 @@ VB
lD
hz
Lq
-mW
+If
mW
mW
mW
@@ -140255,8 +140327,8 @@ lD
lD
lD
Lq
-mW
-mW
+If
+If
mW
mW
mW
@@ -140504,16 +140576,16 @@ lD
Ow
Ow
lD
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -140755,22 +140827,22 @@ Lq
Lq
Lq
Lq
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -141009,25 +141081,25 @@ hz
hz
Lq
Lq
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -141265,25 +141337,25 @@ EZ
hz
Lq
Lq
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -141522,25 +141594,25 @@ hz
Lq
Lq
Lq
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -141772,32 +141844,32 @@ hz
Lq
Lq
Lq
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -142029,31 +142101,31 @@ Lq
Lq
mW
mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -142287,29 +142359,29 @@ mW
mW
mW
mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -142545,22 +142617,22 @@ mW
mW
mW
mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -142804,17 +142876,17 @@ mW
mW
mW
mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
+If
mW
mW
mW
@@ -143064,10 +143136,10 @@ mW
mW
mW
mW
-mW
-mW
-mW
-mW
+If
+If
+If
+If
mW
mW
mW
diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_.dm b/maps/away/scenarios/nuclear_silo/nuclear_silo_.dm
index 2bcc48b1b79..6199efe4080 100644
--- a/maps/away/scenarios/nuclear_silo/nuclear_silo_.dm
+++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_.dm
@@ -24,12 +24,18 @@
/turf/unsimulated/marker/gray = /datum/exoplanet_theme/snow/nuclear_silo/mountain,
/turf/unsimulated/marker/green = /datum/exoplanet_theme/snow/foothills/nuclear_silo
)
+ exoplanet_atmospheres = list(/datum/gas_mixture/earth_cold)
+ exoplanet_lightlevel = list(4)
+ exoplanet_lightcolor = list("#dafafa", "#e7e9cb")
unit_test_groups = list(1)
/singleton/submap_archetype/nuclear_silo
map = "Arctic Valley"
descriptor = "A small wooden village within a valley in an arctic environment."
+/obj/abstract/weather_marker/nuclear_silo
+ weather_type = /singleton/state/weather/snow/snow_planet
+
// --------------------------------------------------- sector
/obj/effect/overmap/visitable/sector/nuclear_silo
diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_areas.dm b/maps/away/scenarios/nuclear_silo/nuclear_silo_areas.dm
index be40e69771f..27e7ea5dfc3 100644
--- a/maps/away/scenarios/nuclear_silo/nuclear_silo_areas.dm
+++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_areas.dm
@@ -2,8 +2,6 @@
name = "Nuclear Silo"
icon_state = "exterior"
requires_power = TRUE
- dynamic_lighting = TRUE
- no_light_control = FALSE
base_turf = /turf/simulated/floor/snow
area_flags = AREA_FLAG_RAD_SHIELDED | AREA_FLAG_INDESTRUCTIBLE_TURFS | AREA_FLAG_IS_BACKGROUND
holomap_color = "#f0e0e0"