Nuclear operatives have a christmas tree during the festive season (#41788)

* Nuclear operatives have a christmas tree during the festive season

🆑 coiax
add: Nuclear operatives have a Christmas tree during the festive season.
/🆑

Minor buff to nuke ops during the Christmas period when trees have presents,
as they'll have access to random items just like the crew.

* Adds a second lightbulb to the bathroom

* Christmas tree SPAWNERS rather than LANDMARKS

_maps/map_files/BoxStation/BoxStation.dmm

@@ -31571,7 +31571,7 @@
 /turf/open/floor/plasteel/white,
 /area/crew_quarters/heads/hor)
 "bxm" = (
-/obj/effect/landmark/xmastree/rdrod,
+/obj/effect/spawner/xmastree/rdrod,
 /obj/effect/turf_decal/stripes/line{
 	dir = 5
 	},
@@ -48009,7 +48009,7 @@
 /area/engine/atmos)
 "clX" = (
 /obj/effect/landmark/event_spawn,
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
@@ -50208,7 +50208,7 @@
 /area/engine/engineering)
 "csT" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/floor/plasteel/dark,
 /area/chapel/main)
 "csU" = (

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -21299,7 +21299,7 @@
 	icon_state = "1-2"
 	},
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/floor/carpet,
 /area/crew_quarters/bar/atrium)
 "aQo" = (
@@ -120438,7 +120438,7 @@
 /obj/machinery/atmospherics/pipe/manifold/supply/hidden{
 	dir = 4
 	},
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/floor/plasteel/grimy,
 /area/chapel/main)
 "dVT" = (

_maps/map_files/MetaStation/MetaStation.dmm

@@ -63565,7 +63565,7 @@
 /obj/machinery/status_display/evac{
 	pixel_y = 32
 	},
-/obj/effect/landmark/xmastree/rdrod,
+/obj/effect/spawner/xmastree/rdrod,
 /obj/effect/turf_decal/stripes/line{
 	dir = 8
 	},
@@ -74907,7 +74907,7 @@
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
 	dir = 8
 	},
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/floor/carpet,
 /area/chapel/main)
 "cOl" = (
@@ -77441,7 +77441,7 @@
 /turf/open/floor/plating,
 /area/science/xenobiology)
 "cTR" = (
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/floor/wood,
 /area/crew_quarters/bar)
 "cTT" = (

_maps/map_files/generic/CentCom.dmm

@@ -7032,14 +7032,6 @@
 /obj/effect/landmark/ai_multicam_room,
 /turf/open/ai_visible,
 /area/ai_multicam_room)
-"pX" = (
-/obj/item/storage/crayons,
-/obj/structure/table,
-/obj/item/storage/crayons,
-/turf/open/floor/plasteel/freezer{
-	dir = 2
-	},
-/area/syndicate_mothership/control)
 "pY" = (
 /obj/machinery/washing_machine,
 /turf/open/floor/plasteel/freezer{
@@ -7445,9 +7437,7 @@
 /obj/structure/urinal{
 	pixel_y = 28
 	},
-/turf/open/floor/plasteel/freezer{
-	dir = 2
-	},
+/turf/open/floor/plasteel/freezer,
 /area/syndicate_mothership/control)
 "qO" = (
 /obj/item/soap/syndie,
@@ -8132,6 +8122,14 @@
 /obj/effect/turf_decal/tile/bar{
 	dir = 1
 	},
+/obj/item/storage/crayons{
+	pixel_x = -2;
+	pixel_y = 5
+	},
+/obj/item/storage/crayons{
+	pixel_x = 2;
+	pixel_y = 5
+	},
 /turf/open/floor/plasteel,
 /area/syndicate_mothership/control)
 "sh" = (
@@ -17319,6 +17317,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/supplypod/loading/two)
+"OA" = (
+/turf/open/floor/plasteel/freezer,
+/area/syndicate_mothership/control)
 "OD" = (
 /obj/machinery/microwave{
 	desc = "Cooks and boils stuff, somehow.";
@@ -17655,6 +17656,14 @@
 /obj/machinery/door/window/westleft,
 /turf/open/floor/carpet/black,
 /area/centcom/holding)
+"RA" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/effect/spawner/xmastree,
+/turf/open/floor/plasteel,
+/area/syndicate_mothership/control)
 "RM" = (
 /obj/structure/window/reinforced{
 	dir = 8
@@ -18087,6 +18096,15 @@
 	},
 /turf/open/floor/plasteel,
 /area/centcom/evac)
+"Wj" = (
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/turf/open/floor/plasteel/freezer{
+	dir = 2
+	},
+/area/syndicate_mothership/control)
 "Wm" = (
 /obj/structure/window/reinforced{
 	dir = 1
@@ -36103,8 +36121,8 @@ hl
 hl
 hl
 kt
-ku
-pX
+nz
+pZ
 pZ
 pZ
 rf
@@ -36361,8 +36379,8 @@ kt
 kt
 kt
 nz
-pY
 pZ
+RA
 rf
 sf
 te
@@ -37901,7 +37919,7 @@ mz
 hl
 mz
 hl
-hl
+kt
 pG
 ku
 ku
@@ -38158,12 +38176,12 @@ hl
 mA
 hl
 hl
-mz
-kt
+pG
+ku
 ku
 qN
 ri
-ri
+Wj
 ku
 ku
 nz
@@ -38415,10 +38433,10 @@ hl
 mz
 hl
 hl
-mz
-ma
+pG
 ku
 qO
+OA
 ri
 sj
 ku
@@ -38672,9 +38690,9 @@ mA
 hl
 hl
 mA
-hl
-pG
+kt
 nz
+pY
 qP
 rj
 ku
@@ -38929,8 +38947,8 @@ hl
 mA
 mz
 hl
-mA
-kt
+ma
+ku
 ku
 ku
 ku
@@ -39186,7 +39204,7 @@ mz
 hl
 hl
 hl
-mz
+pG
 ma
 hh
 aa

_maps/templates/hilbertshotel.dmm

@@ -72,7 +72,7 @@
 /turf/open/indestructible/hotelwood,
 /area/hilbertshotel)
 "n" = (
-/obj/effect/landmark/xmastree,
+/obj/effect/spawner/xmastree,
 /turf/open/indestructible/hotelwood,
 /area/hilbertshotel)
 "o" = (

code/controllers/subsystem/atoms.dm

@@ -10,7 +10,7 @@ SUBSYSTEM_DEF(atoms)
 
 	var/old_initialized
 
-	var/list/late_loaders
+	var/list/late_loaders = list()
 
 	var/list/BadInitializeCalls = list()
 
@@ -27,8 +27,6 @@ SUBSYSTEM_DEF(atoms)
 
 	initialized = INITIALIZATION_INNEW_MAPLOAD
 
-	LAZYINITLIST(late_loaders)
-
 	var/count
 	var/list/mapload_arg = list(TRUE)
 	if(atoms)

code/modules/events/holiday/xmas.dm

@@ -39,21 +39,25 @@
 	flags_inv = 0
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 
-/obj/effect/landmark/xmastree
+/obj/effect/spawner/xmastree
 	name = "christmas tree spawner"
+	icon = 'icons/effects/landmarks_static.dmi'
+	icon_state = "x2"
 	layer = FLY_LAYER
+
 	var/festive_tree = /obj/structure/flora/tree/pine/xmas
 	var/christmas_tree = /obj/structure/flora/tree/pine/xmas/presents
 
-/obj/effect/landmark/xmastree/Initialize(mapload)
+/obj/effect/spawner/xmastree/Initialize()
 	..()
 	if((CHRISTMAS in SSevents.holidays) && christmas_tree)
 		new christmas_tree(get_turf(src))
 	else if((FESTIVE_SEASON in SSevents.holidays) && festive_tree)
 		new festive_tree(get_turf(src))
+
 	return INITIALIZE_HINT_QDEL
 
-/obj/effect/landmark/xmastree/rdrod
+/obj/effect/spawner/xmastree/rdrod
 	name = "festivus pole spawner"
 	festive_tree = /obj/structure/festivus
 	christmas_tree = null