diff --git a/_maps/map_files/Arachne/TGS_Arachne.dmm b/_maps/map_files/Arachne/TGS_Arachne.dmm
index 1bf2b4034dabc..f5b8f1161e6da 100644
--- a/_maps/map_files/Arachne/TGS_Arachne.dmm
+++ b/_maps/map_files/Arachne/TGS_Arachne.dmm
@@ -19,6 +19,13 @@
dir = 4
},
/area/mainship/command/self_destruct)
+"aci" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"ack" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -632,6 +639,27 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
+"aBB" = (
+/obj/machinery/door/airlock/mainship/generic/glass{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/hallways/starboard_hallway)
+"aBD" = (
+/obj/structure/table/reinforced,
+/obj/machinery/door/poddoor/shutters/mainship/open{
+ dir = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 4
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/mainship/shipboard/firing_range)
"aCr" = (
/obj/structure/filingcabinet,
/turf/open/floor/wood,
@@ -917,6 +945,7 @@
/area/mainship/living/commandbunks)
"aOG" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"aOH" = (
@@ -1034,6 +1063,16 @@
dir = 6
},
/area/mainship/hallways/port_ert)
+"aUS" = (
+/obj/machinery/cryopod/right,
+/obj/machinery/camera/autoname/mainship{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"aVR" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -1178,6 +1217,12 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"bdF" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_two)
"bdN" = (
/obj/machinery/telecomms/server/presets/medical,
/turf/open/floor/mainship/tcomms,
@@ -1247,6 +1292,14 @@
dir = 4
},
/area/mainship/hallways/hangar)
+"bgN" = (
+/obj/structure/window/framed/mainship,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"bgX" = (
/obj/structure/closet,
/obj/item/clothing/suit/storage/labcoat/researcher,
@@ -1308,6 +1361,9 @@
/obj/structure/bed/bunkbed,
/obj/machinery/light/mainship,
/obj/effect/landmark/start/job/squadleader,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black/full,
/area/mainship/living/cryo_cells)
"biS" = (
@@ -1546,6 +1602,12 @@
dir = 1
},
/area/mainship/command/airoom)
+"bsG" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/morgue)
"bsH" = (
/obj/machinery/light/mainship/small{
dir = 1
@@ -1566,6 +1628,11 @@
/area/mainship/hallways/port_hallway)
"bug" = (
/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/wood,
/area/mainship/living/pilotbunks)
"buj" = (
@@ -1798,6 +1865,10 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
+"bCC" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/hallways/starboard_hallway)
"bCG" = (
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship/white,
@@ -1981,6 +2052,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"bMK" = (
@@ -2075,6 +2149,9 @@
/area/mainship/living/evacuation)
"bRv" = (
/obj/machinery/marine_selector/clothes/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -2188,6 +2265,19 @@
/obj/structure/window/framed/mainship,
/turf/open/floor/mainship/floor,
/area/mainship/hallways/repair_bay)
+"bXF" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/layer1{
+ dir = 8;
+ on = 1
+ },
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -10
+ },
+/turf/open/floor/mainship/black{
+ dir = 4
+ },
+/area/mainship/hallways/hangar)
"bYa" = (
/obj/structure/cable,
/turf/open/floor/mainship/floor,
@@ -2292,6 +2382,12 @@
/obj/machinery/light/mainship,
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
+"cea" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/cmo_office)
"cec" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -2328,6 +2424,9 @@
/area/mainship/engineering/engine_core)
"ceO" = (
/obj/machinery/marine_selector/clothes/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -2589,6 +2688,9 @@
dir = 8
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/starboard_hallway)
"coX" = (
@@ -2746,6 +2848,9 @@
/obj/machinery/light/mainship{
light_color = "#da2f1b"
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
"cvG" = (
@@ -3632,6 +3737,9 @@
dir = 4
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -3788,6 +3896,13 @@
},
/turf/open/floor/wood,
/area/mainship/living/cafeteria_officer)
+"djy" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"djM" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 10
@@ -4205,6 +4320,15 @@
dir = 8
},
/area/mainship/shipboard/weapon_room)
+"dBF" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"dBH" = (
/obj/machinery/marine_selector/gear/medic,
/turf/open/floor/mainship/black{
@@ -4741,6 +4865,15 @@
dir = 4
},
/area/mainship/hallways/port_ert)
+"eaP" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"eaQ" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/wood,
@@ -5416,6 +5549,9 @@
/area/mainship/medical/lounge)
"eEl" = (
/obj/machinery/vending/cigarette,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"eFb" = (
@@ -5683,6 +5819,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = -5
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -5
+ },
/turf/open/floor/wood,
/area/mainship/shipboard/brig)
"ePQ" = (
@@ -5699,6 +5841,10 @@
},
/area/mainship/hallways/starboard_hallway)
"eQh" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"eQH" = (
@@ -5984,6 +6130,12 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"eXZ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/starboard_hallway)
"eYl" = (
/turf/open/floor/plating/plating_catwalk,
/area/mainship/engineering/starboard_atmos)
@@ -6069,6 +6221,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/mainship/black,
/area/mainship/hallways/starboard_hallway)
+"fcp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black{
+ dir = 10
+ },
+/area/mainship/hallways/starboard_hallway)
"fcv" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/computer/med_data/laptop,
@@ -6094,6 +6254,9 @@
dir = 4
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"feP" = (
@@ -6197,6 +6360,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/hangar)
+"fip" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/starboard_hallway)
"fiz" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 10
@@ -6655,6 +6824,19 @@
dir = 6
},
/area/mainship/squads/req)
+"fAf" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/layer1{
+ dir = 1;
+ on = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/starboard_hallway)
"fAv" = (
/obj/structure/bed/chair/nometal{
dir = 1
@@ -6705,6 +6887,12 @@
/obj/machinery/tank_part_fabricator,
/turf/open/floor/plating,
/area/mainship/hallways/repair_bay)
+"fDr" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/upper_medical)
"fDt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -7070,6 +7258,17 @@
dir = 4
},
/area/mainship/hallways/hangar)
+"fUf" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/turf/open/floor/mainship/purple{
+ dir = 1
+ },
+/area/mainship/medical/upper_medical)
"fUS" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -7118,6 +7317,10 @@
dir = 1
},
/area/mainship/squads/general)
+"fXq" = (
+/obj/structure/prop/holidays/string_lights/cap,
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"fXr" = (
/obj/machinery/vending/uniform_supply,
/obj/machinery/light/mainship,
@@ -8225,6 +8428,14 @@
},
/turf/closed/wall/mainship/outer,
/area/mainship/hull/starboard_hull)
+"gSC" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black{
+ dir = 6
+ },
+/area/mainship/hallways/starboard_hallway)
"gSI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -8238,6 +8449,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/starboard_hallway)
+"gTy" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"gTZ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -8283,6 +8503,9 @@
/area/mainship/hallways/port_ert)
"gVu" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship/outer/reinforced,
/area/mainship/shipboard/firing_range)
"gVz" = (
@@ -8818,6 +9041,10 @@
"hoN" = (
/turf/open/floor/mainship/floor,
/area/mainship/hull/starboard_hull)
+"hpK" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"hpL" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/power/monitor,
@@ -9083,6 +9310,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
+"hzk" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
"hzN" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -9335,6 +9569,9 @@
dir = 8
},
/obj/machinery/door/firedoor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/living/numbertwobunks)
"hJH" = (
@@ -9342,6 +9579,10 @@
dir = 6
},
/area/mainship/living/evacuation)
+"hKm" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"hKF" = (
/turf/open/floor/mainship/purple{
dir = 8
@@ -9536,6 +9777,15 @@
},
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/hangar)
+"hSK" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"hSS" = (
/obj/machinery/door/poddoor/shutters/mainship/open/hangar{
dir = 1
@@ -9665,6 +9915,17 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
+"hXf" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 2
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/req)
"hYl" = (
/obj/machinery/door/poddoor/railing{
dir = 1;
@@ -9847,8 +10108,17 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
+"ieR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"ieU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -10021,6 +10291,9 @@
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/hangar)
"ins" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/living/numbertwobunks)
"inv" = (
@@ -10059,6 +10332,17 @@
/obj/structure/table/wood,
/turf/open/floor/wood,
/area/mainship/medical/lounge)
+"ioo" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -7;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/floor,
+/area/mainship/hallways/hangar)
"iou" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -10140,8 +10424,18 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/squads/req)
+"irf" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"irn" = (
/obj/structure/window/framed/mainship/hull,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/mainship/floor,
/area/mainship/shipboard/firing_range)
"irt" = (
@@ -10777,6 +11071,12 @@
/obj/machinery/portable_atmospherics/canister/air,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/engineering/starboard_atmos)
+"iSd" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"iSG" = (
/obj/item/facepaint/green{
pixel_x = -7;
@@ -10844,6 +11144,15 @@
dir = 6
},
/area/mainship/living/evacuation)
+"iUq" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"iUX" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -11022,6 +11331,15 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"jbx" = (
+/obj/machinery/camera/autoname/mainship{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/starboard_hallway)
"jbB" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -11158,6 +11476,15 @@
/obj/structure/morgue,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/morgue)
+"jiD" = (
+/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/living/cryo_cells)
"jiL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -11301,6 +11628,12 @@
/obj/structure/bed/stool,
/turf/open/floor/wood,
/area/mainship/living/cafeteria_officer)
+"joP" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"joU" = (
/obj/structure/closet/firecloset/full,
/turf/open/floor/mainship/red{
@@ -11387,6 +11720,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"jrH" = (
@@ -11445,6 +11781,18 @@
"jtp" = (
/turf/open/floor/mainship/floor,
/area/mainship/shipboard/brig)
+"jtt" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -5
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/black{
+ dir = 1
+ },
+/area/mainship/hallways/hangar)
"jub" = (
/obj/structure/table/mainship/nometal,
/obj/item/storage/box/beakers{
@@ -11581,6 +11929,7 @@
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar/droppod)
"jAF" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"jAG" = (
@@ -11632,6 +11981,13 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"jDY" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"jEo" = (
/obj/structure/window/framed/mainship/hull,
/turf/open/floor/plating,
@@ -11700,6 +12056,9 @@
/area/mainship/hallways/hangar)
"jHW" = (
/obj/machinery/marine_selector/clothes/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 6
},
@@ -11840,6 +12199,14 @@
/obj/item/stack/sheet/glass/glass/large_stack,
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
+"jLR" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"jLZ" = (
/obj/machinery/marine_selector/gear/engi,
/turf/open/floor/mainship/black{
@@ -11888,6 +12255,9 @@
/area/mainship/medical/upper_medical)
"jNz" = (
/obj/structure/table/mainship/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"jNV" = (
@@ -11950,6 +12320,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/starboard_hallway)
+"jQB" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"jQG" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 6
@@ -12166,6 +12545,9 @@
"kcu" = (
/obj/structure/bed/bunkbed,
/obj/effect/landmark/start/job/squadleader,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black/full,
/area/mainship/living/cryo_cells)
"kcz" = (
@@ -12256,6 +12638,12 @@
"kga" = (
/turf/closed/wall/mainship/outer,
/area/mainship/shipboard/brig_cells)
+"kgs" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/squads/general)
"kgH" = (
/obj/structure/rack,
/obj/item/tool/wet_sign,
@@ -12437,6 +12825,10 @@
dir = 4
},
/area/mainship/hallways/hangar)
+"kpy" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"kpB" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5;
@@ -13437,6 +13829,9 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/black{
dir = 1
},
@@ -13523,6 +13918,9 @@
dir = 4;
name = "Bathroom"
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
"lcF" = (
@@ -13545,7 +13943,20 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"ldK" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/wood,
+/area/mainship/hallways/starboard_hallway)
"ldR" = (
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 11
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_y = -14
+ },
/turf/open/floor/mainship/black{
dir = 9
},
@@ -13651,6 +14062,9 @@
/area/mainship/hallways/port_hallway)
"lhw" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"lhx" = (
@@ -13779,6 +14193,9 @@
/obj/machinery/light/mainship{
dir = 1
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/orange{
dir = 1
},
@@ -13985,6 +14402,11 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical)
+"ltP" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"lud" = (
/obj/effect/spawner/random/misc/plant,
/obj/machinery/power/apc/mainship{
@@ -14036,6 +14458,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"luZ" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"lve" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -14166,6 +14594,9 @@
/obj/machinery/light/mainship{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -14359,6 +14790,19 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
+"lIa" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
+"lJn" = (
+/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"lJs" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -14560,6 +15004,9 @@
/area/mainship/medical)
"lRo" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/general)
"lRr" = (
@@ -14651,6 +15098,10 @@
dir = 8
},
/area/mainship/hallways/starboard_ert)
+"lUh" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
"lUv" = (
/obj/machinery/atmospherics/components/unary/thermomachine{
dir = 8
@@ -15036,6 +15487,9 @@
/area/mainship/hallways/port_hallway)
"miz" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/hallways/starboard_hallway)
"miB" = (
@@ -15464,6 +15918,12 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/starboard_hallway)
+"myY" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"mzq" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -15538,6 +15998,10 @@
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/starboard_hallway)
"mCi" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 3
+ },
/turf/open/floor/mainship/sterile/corner,
/area/mainship/medical)
"mCo" = (
@@ -15563,6 +16027,12 @@
"mCM" = (
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"mCO" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"mCT" = (
/obj/machinery/camera/autoname/mainship{
dir = 8
@@ -15612,6 +16082,26 @@
dir = 1
},
/area/mainship/shipboard/weapon_room)
+"mEP" = (
+/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 4;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -6;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3
+ },
+/turf/open/floor/mainship/sterile/side,
+/area/mainship/medical)
"mFi" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -16099,6 +16589,9 @@
/turf/open/floor/mainship/silver/full,
/area/mainship/living/evacuation)
"ndn" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 6
},
@@ -16378,6 +16871,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/hallways/starboard_hallway)
"nqc" = (
@@ -16775,6 +17271,11 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/shipboard/chief_mp_office)
+"nHG" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
"nHR" = (
/obj/machinery/door/airlock/mainship/maint{
dir = 2
@@ -16827,8 +17328,17 @@
/turf/open/space/basic,
/area/space)
"nIZ" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/plating,
/area/mainship/hallways/port_hallway)
+"nJd" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/starboard_ert)
"nJj" = (
/obj/machinery/door/airlock/mainship/generic/pilot/quarters{
dir = 1
@@ -17107,6 +17617,9 @@
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical)
"nRS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -17200,6 +17713,13 @@
/obj/machinery/light/mainship,
/turf/open/floor/mainship/sterile/purple/side,
/area/mainship/medical/upper_medical)
+"nWr" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"nWx" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -17215,6 +17735,15 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/living/bridgebunks)
+"nXl" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"nXI" = (
/obj/machinery/door/airlock/mainship/security/CMA{
dir = 2
@@ -17286,6 +17815,12 @@
},
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical)
+"nZW" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/hangar)
"nZY" = (
/obj/structure/bed/chair,
/obj/item/ammo_casing/bullet,
@@ -17309,6 +17844,12 @@
dir = 4
},
/area/mainship/squads/req)
+"oae" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/evacuation)
"oaL" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -17316,6 +17857,10 @@
/area/mainship/living/evacuation)
"oaM" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"oaU" = (
@@ -17393,6 +17938,9 @@
id = "requisitions";
name = "Requisitions Shutters"
},
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
/turf/open/floor/plating,
/area/mainship/squads/req)
"ofa" = (
@@ -17435,6 +17983,12 @@
/area/mainship/hull/starboard_hull)
"oii" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"oik" = (
@@ -17548,6 +18102,13 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar/droppod)
+"olt" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"olD" = (
/obj/machinery/camera/autoname/mainship,
/turf/open/floor/mainship/black{
@@ -18081,6 +18642,12 @@
/obj/machinery/holopad,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/chemistry)
+"oGg" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"oGs" = (
/obj/structure/barricade/metal,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -18366,6 +18933,9 @@
/area/mainship/shipboard/brig)
"oTv" = (
/obj/machinery/computer/squad_manager,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"oTD" = (
@@ -18736,6 +19306,12 @@
dir = 1
},
/area/mainship/squads/req)
+"piF" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"piS" = (
/obj/structure/bed/chair/sofa/left,
/turf/open/floor/wood,
@@ -18889,6 +19465,20 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"prU" = (
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/marine_selector/clothes,
+/obj/structure/window/reinforced,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"psm" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -18978,6 +19568,12 @@
dir = 4
},
/area/mainship/hull/starboard_hull)
+"puS" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/telecomms)
"puU" = (
/obj/machinery/camera/autoname/mainship{
dir = 1
@@ -19151,6 +19747,9 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"pBO" = (
@@ -19295,6 +19894,9 @@
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/starboard_hull)
"pJk" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/closed/wall/mainship/outer/reinforced,
/area/mainship/shipboard/firing_range)
"pKd" = (
@@ -19321,6 +19923,9 @@
/obj/structure/bed/bunkbed,
/obj/machinery/light/mainship,
/obj/effect/landmark/start/job/squadmarine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black/full,
/area/mainship/living/cryo_cells)
"pKv" = (
@@ -19408,6 +20013,12 @@
"pNq" = (
/turf/closed/wall/mainship/outer,
/area/mainship/command/airoom)
+"pNL" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/starboard_hallway)
"pNP" = (
/obj/machinery/firealarm,
/turf/open/floor/wood,
@@ -19522,6 +20133,15 @@
"pUH" = (
/turf/closed/wall/mainship/outer,
/area/mainship/shipboard/brig)
+"pVa" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"pVl" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 8
@@ -19764,6 +20384,12 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/command/self_destruct)
+"qdC" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/pilotbunks)
"qdV" = (
/obj/machinery/door/poddoor/mainship/droppod{
dir = 2
@@ -19856,6 +20482,9 @@
/area/mainship/shipboard/brig)
"qgj" = (
/obj/machinery/marine_selector/clothes/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 6
},
@@ -19986,6 +20615,11 @@
dir = 8
},
/area/mainship/command/cic)
+"qnl" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/wood,
+/area/mainship/living/pilotbunks)
"qno" = (
/obj/structure/table/mainship/nometal,
/obj/item/spacecash/c10{
@@ -20235,6 +20869,14 @@
dir = 4
},
/area/mainship/hallways/starboard_hallway)
+"qwP" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black{
+ dir = 6
+ },
+/area/mainship/squads/general)
"qwU" = (
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship,
@@ -20313,6 +20955,9 @@
/area/mainship/living/evacuation)
"qCd" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship,
/area/mainship/shipboard/firing_range)
"qCF" = (
@@ -21460,6 +22105,13 @@
/obj/item/bedsheet/medical,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
+"rva" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/grunt_rnr)
"rvn" = (
/obj/structure/bed/chair{
dir = 4
@@ -21681,6 +22333,9 @@
/obj/machinery/light/mainship{
dir = 1
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/black{
dir = 1
},
@@ -21770,6 +22425,12 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical)
+"rJo" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
"rJs" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/recharger,
@@ -21917,6 +22578,12 @@
dir = 4
},
/area/mainship/command/airoom)
+"rOC" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/chief_mp_office)
"rOS" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 9
@@ -22034,6 +22701,17 @@
dir = 1
},
/area/mainship/squads/general)
+"rTg" = (
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -10
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/hangar)
"rTn" = (
/obj/structure/disposalpipe/segment{
dir = 1
@@ -22109,6 +22787,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"rVo" = (
@@ -22805,6 +23486,10 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
+"syX" = (
+/obj/structure/prop/holidays/string_lights/cap,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"szE" = (
/turf/closed/wall/mainship,
/area/mainship/hull/port_hull)
@@ -22953,6 +23638,15 @@
/obj/effect/decal/cleanable/blood/oil/armorblood,
/turf/open/floor/plating,
/area/mainship/engineering/engineering_workshop)
+"sIu" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"sID" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -22994,6 +23688,9 @@
/obj/machinery/cryopod/right{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black/full,
/area/mainship/living/cryo_cells)
"sJS" = (
@@ -23197,6 +23894,19 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/port_hallway)
+"sTI" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/outer/reinforced,
+/area/mainship/shipboard/firing_range)
+"sTJ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"sTR" = (
/obj/structure/bed/chair/comfy,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -23365,6 +24075,9 @@
/area/mainship/command/self_destruct)
"tcQ" = (
/obj/effect/spawner/random/misc/structure/flavorvending/cigaretteweighted,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/hallways/starboard_hallway)
"tdp" = (
@@ -23674,6 +24387,10 @@
/obj/structure/disposalpipe/segment{
dir = 1
},
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 6;
+ pixel_y = 7
+ },
/turf/open/floor/mainship/black,
/area/mainship/hallways/repair_bay)
"tuT" = (
@@ -23761,6 +24478,15 @@
/obj/structure/table/wood/gambling,
/turf/open/floor/wood,
/area/mainship/living/evacuation)
+"tzD" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"tzM" = (
/obj/machinery/photocopier,
/turf/open/floor/wood,
@@ -23840,6 +24566,13 @@
dir = 4
},
/area/mainship/squads/req)
+"tAM" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/black{
+ dir = 1
+ },
+/area/mainship/squads/general)
"tBa" = (
/obj/structure/closet/secure_closet/medical3,
/obj/item/storage/surgical_tray,
@@ -24117,6 +24850,7 @@
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/structure/flora/tree/pine/xmas/presents,
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar)
"tNP" = (
@@ -24172,6 +24906,15 @@
"tPr" = (
/turf/closed/wall/mainship/white,
/area/mainship/medical)
+"tPK" = (
+/obj/machinery/cryopod/right{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"tPL" = (
/obj/structure/cable,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -24252,6 +24995,9 @@
/obj/structure/bed/bunkbed,
/obj/machinery/light/mainship,
/obj/effect/landmark/start/job/squadengineer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black/full,
/area/mainship/living/cryo_cells)
"tUV" = (
@@ -24512,6 +25258,22 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"uja" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -9;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 9;
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/black{
+ dir = 1
+ },
+/area/mainship/hallways/port_hallway)
"ujr" = (
/obj/structure/window/framed/mainship/white,
/obj/machinery/door/poddoor/shutters/mainship/open/medical{
@@ -25055,6 +25817,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"uEn" = (
@@ -25250,6 +26015,15 @@
/obj/machinery/vending/boozeomat,
/turf/open/floor/prison/kitchen,
/area/mainship/living/grunt_rnr)
+"uLg" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"uLq" = (
/obj/structure/dropship_equipment/shuttle/sentry_holder,
/turf/open/floor/mainship/orange{
@@ -25428,6 +26202,15 @@
/obj/effect/spawner/random/misc/soap/deluxeweighted,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/living/bridgebunks)
+"uUt" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"uUx" = (
/obj/machinery/camera/autoname/mainship{
dir = 4
@@ -25638,6 +26421,14 @@
/area/mainship/medical)
"vdS" = (
/obj/machinery/chem_master,
+/obj/item/prop/mainship/candle{
+ pixel_x = 4;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -5;
+ pixel_y = -4
+ },
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/chemistry)
"vec" = (
@@ -25891,6 +26682,11 @@
dir = 8;
on = 1
},
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -6;
+ pixel_y = 2
+ },
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar)
"vmG" = (
@@ -26166,6 +26962,14 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/hangar)
+"vwP" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadengineer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"vxW" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -26173,6 +26977,15 @@
/obj/structure/benchpress,
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
+"vyc" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"vyD" = (
/obj/structure/table/wood,
/obj/item/storage/fancy/cigar,
@@ -26461,6 +27274,9 @@
/obj/structure/toilet{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
"vJu" = (
@@ -26656,6 +27472,9 @@
dir = 1
},
/obj/structure/cable,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/green{
dir = 1
},
@@ -26803,6 +27622,23 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/hangar)
+"vXg" = (
+/obj/machinery/door/firedoor/mainship{
+ dir = 8
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = 4;
+ pixel_y = 11
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -7
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 4;
+ pixel_y = -3
+ },
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/hallways/hangar)
"vXn" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -27106,6 +27942,7 @@
"wkm" = (
/obj/structure/table/mainship/nometal,
/obj/item/stack/sheet/glass/glass/large_stack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/orange{
dir = 8
},
@@ -27160,6 +27997,16 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/shipboard/chief_mp_office)
+"wlF" = (
+/obj/machinery/door/airlock/mainship/generic/glass{
+ dir = 8
+ },
+/obj/machinery/door/firedoor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/hallways/starboard_ert)
"wmb" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
@@ -27282,6 +28129,12 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical)
+"wqm" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/wood,
+/area/mainship/shipboard/brig)
"wqy" = (
/obj/machinery/power/apc/mainship{
dir = 4
@@ -27349,6 +28202,14 @@
dir = 1
},
/area/mainship/medical/morgue)
+"wus" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadcorpsman,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black/full,
+/area/mainship/living/cryo_cells)
"wux" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -27844,6 +28705,15 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/starboard_hallway)
+"wOb" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"wOl" = (
/obj/machinery/door/airlock/mainship/maint{
dir = 8
@@ -27929,6 +28799,9 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/living/numbertwobunks)
"wQY" = (
@@ -28094,6 +28967,9 @@
/area/mainship/squads/general)
"xbH" = (
/obj/machinery/marine_selector/clothes/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -28184,6 +29060,9 @@
/area/mainship/hallways/starboard_ert)
"xfX" = (
/obj/machinery/marine_selector/clothes/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 6
},
@@ -28214,6 +29093,12 @@
/area/mainship/squads/general)
"xgK" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship,
/area/mainship/living/numbertwobunks)
"xha" = (
@@ -28265,6 +29150,12 @@
dir = 4
},
/area/mainship/hallways/port_hallway)
+"xiU" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/hangar)
"xja" = (
/turf/open/floor/mainship/black/corner{
dir = 8
@@ -28370,6 +29261,15 @@
/obj/structure/prop/mainship/name_stencil,
/turf/open/floor/mainship_hull,
/area/space)
+"xpr" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"xpP" = (
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship,
@@ -28395,6 +29295,12 @@
dir = 4
},
/area/mainship/medical)
+"xqp" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/repair_bay)
"xqr" = (
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor/plating,
@@ -28780,6 +29686,25 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lounge)
+"xGY" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 9;
+ pixel_y = 3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -7;
+ pixel_y = -13
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/mainship/hallways/hangar)
"xHp" = (
/obj/machinery/door_control/mainship/req{
dir = 1;
@@ -28986,6 +29911,13 @@
},
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/hangar)
+"xPV" = (
+/obj/structure/closet/emcloset,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/hallways/starboard_hallway)
"xQh" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5
@@ -29070,6 +30002,10 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/disposalpipe/segment,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -5
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
"xSV" = (
@@ -29206,6 +30142,9 @@
dir = 4
},
/obj/structure/closet/firecloset/full,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 6
},
@@ -29333,6 +30272,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/green{
dir = 2
},
@@ -29416,6 +30358,16 @@
dir = 10
},
/area/mainship/squads/general)
+"ygW" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 9
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -9
+ },
+/obj/structure/prop/holidays/stocking,
+/turf/closed/wall/mainship,
+/area/mainship/living/pilotbunks)
"yhj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -32108,7 +33060,7 @@ sgF
jjn
jjn
jjn
-jjn
+fDr
ubJ
mKD
ack
@@ -32313,7 +33265,7 @@ jjn
vhC
pQC
kUD
-xQs
+fUf
mKD
yhj
kwU
@@ -33848,7 +34800,7 @@ chq
jiq
sRS
ksc
-nLW
+bsG
nxX
ouL
rpR
@@ -33988,7 +34940,7 @@ hNU
hNU
hNU
fDM
-fDM
+puS
fyL
wmf
itb
@@ -34351,7 +35303,7 @@ qOt
duG
eFb
vtz
-fRR
+rTg
bAr
ocv
tan
@@ -34397,7 +35349,7 @@ eRp
nSM
eRp
oPX
-fyL
+uja
wmf
puU
dGV
@@ -34764,7 +35716,7 @@ bAr
bAr
bAr
bAr
-bAr
+bdF
hqL
qSo
nzR
@@ -34910,7 +35862,7 @@ sYo
aYD
tzT
aYD
-dGV
+oae
guS
cTo
bRt
@@ -34961,7 +35913,7 @@ qOt
qOt
hIO
hIO
-cVV
+vXg
vSE
cVV
lra
@@ -35274,7 +36226,7 @@ lra
sub
sub
sub
-lra
+mCO
amv
qWR
qWR
@@ -35318,7 +36270,7 @@ kse
aYD
tzT
aYD
-dGV
+oae
dNN
cTo
bRt
@@ -35484,7 +36436,7 @@ nfv
nzR
nzR
uoD
-lQU
+mEP
lQU
kJg
txc
@@ -35807,7 +36759,7 @@ mgi
vQH
riR
rTw
-oZQ
+cea
vIt
iRp
tyX
@@ -36420,7 +37372,7 @@ wkY
mVg
eJg
oeO
-eJg
+hXf
kkD
fyL
fVl
@@ -36494,7 +37446,7 @@ tuT
cSI
mPK
mFV
-oUe
+jtt
gxt
qeb
mFV
@@ -36583,7 +37535,7 @@ vkb
vkb
vlB
wGG
-hIO
+nZW
uKE
fHx
bwD
@@ -36640,7 +37592,7 @@ jAG
wLJ
lGo
wLJ
-fVh
+luZ
tYv
hRx
jCa
@@ -36713,7 +37665,7 @@ oUe
vtz
fRR
tys
-oUO
+bXF
xHp
qns
qns
@@ -37057,7 +38009,7 @@ gPQ
lYI
vBU
gZM
-fVh
+piF
xdI
wGQ
yih
@@ -37807,7 +38759,7 @@ vkb
vkb
vlB
wGG
-hIO
+xiU
fiz
tSl
jcb
@@ -37832,7 +38784,7 @@ wkH
fun
qtB
oUe
-vtz
+xGY
fRR
reF
mFV
@@ -37864,7 +38816,7 @@ jAG
dwf
bnh
dwf
-fVh
+luZ
umC
hRx
oZL
@@ -38119,7 +39071,7 @@ mAq
mFV
bOo
mMV
-mFV
+ioo
vlZ
mAq
ibO
@@ -38260,15 +39212,15 @@ uOU
uOU
uBH
udU
-pnh
-hDs
+eXZ
+pNL
wKU
irz
nfb
bmT
bmT
-bmT
-hDs
+ldK
+pNL
nnu
evZ
uwN
@@ -38362,15 +39314,15 @@ gTc
ydT
gTc
lfk
-fSA
-hDs
+xPV
+bCC
qbA
psm
ybS
hwo
fVv
tcQ
-hDs
+bCC
qhi
lSo
ulv
@@ -38466,17 +39418,17 @@ plQ
plQ
xZL
qCd
-rvR
+iSd
twG
rgI
-rvR
-rvR
-pJk
-pJk
+iSd
+iSd
pJk
-pJk
-pJk
-gVu
+sTI
+rJo
+rJo
+rJo
+hzk
dNX
kDg
pnh
@@ -38547,26 +39499,26 @@ mpp
uCq
pce
aiK
-eiz
+xqp
tJr
aRH
coK
eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
+xpr
+xpr
+xpr
+xpr
+xpr
+xpr
+tzD
+joP
cxb
lqg
xYV
iyq
lqg
xYV
-cxb
+bgN
rvR
joU
uWN
@@ -38578,7 +39530,7 @@ wQi
wQi
wQi
sgv
-pJk
+lUh
dNX
kDg
pnh
@@ -38652,8 +39604,8 @@ aDg
oJx
nnu
kDg
-pnh
-eQh
+fip
+hpK
jLZ
xRs
gyR
@@ -38661,7 +39613,7 @@ bYm
kIg
fgW
bRv
-eQh
+hpK
kMc
eRH
fft
@@ -38680,7 +39632,7 @@ kUd
kUd
ulZ
vsN
-pJk
+lUh
nnu
kDg
olT
@@ -38776,13 +39728,13 @@ vAA
evD
hZN
kMo
-rRl
+aBD
kIk
kUd
ulZ
kUd
vsN
-pJk
+lUh
ryj
kDg
pnh
@@ -38856,7 +39808,7 @@ doQ
eOG
dNX
kDg
-dxQ
+jbx
aOG
lqO
lqg
@@ -38884,7 +39836,7 @@ kUd
kUd
ulZ
vsN
-pJk
+lUh
dNX
vGM
pnh
@@ -38986,7 +39938,7 @@ kUd
ulZ
kUd
vsN
-pJk
+lUh
qhi
qwC
tjR
@@ -39061,7 +40013,7 @@ mrs
nnu
kDg
miz
-eQh
+hpK
aXQ
slK
oaU
@@ -39069,7 +40021,7 @@ dHS
nlJ
gng
xfX
-eQh
+hpK
bzO
kTQ
dOi
@@ -39088,7 +40040,7 @@ ovW
uDV
uDV
vCc
-pJk
+lUh
uFw
wDh
uFw
@@ -39162,16 +40114,16 @@ xzR
cGx
dNX
kDg
-pnh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
+fip
+djy
+xpr
+xpr
+xpr
+xpr
+xpr
+xpr
+pVa
+hpK
yjz
kTQ
sqT
@@ -39179,18 +40131,18 @@ nOd
lbd
ivy
feu
-qCd
-rvR
+olt
+myY
cqq
otc
-rvR
-rvR
+myY
+myY
gVu
irn
irn
irn
-pJk
-gVu
+lIa
+nHG
bmT
kOu
bmT
@@ -39264,8 +40216,8 @@ frU
kpC
qSb
gMB
-pnh
-eQh
+fip
+hpK
xgs
xRs
cKD
@@ -39273,7 +40225,7 @@ bYm
dBH
fgW
ceO
-eQh
+hpK
fWX
kTQ
qKH
@@ -39292,7 +40244,7 @@ nQl
kOa
cVh
lAt
-eQh
+hpK
cZm
wcC
bmT
@@ -39394,7 +40346,7 @@ ivy
ivy
lqg
eEl
-eQh
+hpK
aJt
lmK
ofa
@@ -39495,8 +40447,8 @@ xTJ
urw
xJg
xTJ
-urw
-eQh
+prU
+hpK
bmT
gqu
bmT
@@ -39590,15 +40542,15 @@ lbd
xJg
xTJ
ejm
-hzX
+tAM
lbd
xJg
xTJ
urw
xJg
xTJ
-urw
-eQh
+prU
+hpK
bmT
lEN
bmT
@@ -39672,8 +40624,8 @@ jve
xMD
dNX
pUk
-pnh
-eQh
+fip
+hpK
gnS
slK
bWl
@@ -39681,7 +40633,7 @@ dHS
pLC
gng
jHW
-eQh
+hpK
bzO
kTQ
fXr
@@ -39771,19 +40723,19 @@ cUd
mQQ
pxu
pcd
-xMD
+qdC
cmX
rZY
npQ
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
+aci
+xpr
+xpr
+xpr
+xpr
+xpr
+xpr
+pVa
+hpK
nAq
kTQ
sqT
@@ -39801,8 +40753,8 @@ xTJ
urw
xJg
xTJ
-urw
-eQh
+prU
+hpK
uVk
xgp
xsK
@@ -39867,7 +40819,7 @@ hMW
fRR
nuy
tvG
-bug
+qnl
wjh
sPQ
mQQ
@@ -39876,8 +40828,8 @@ eUp
xMD
dNX
pUk
-pnh
-eQh
+fip
+hpK
ksm
xRs
bAk
@@ -39885,7 +40837,7 @@ bYm
hZW
fgW
xbH
-eQh
+hpK
fWX
kTQ
pXC
@@ -39903,8 +40855,8 @@ xTJ
urw
xJg
xTJ
-urw
-eQh
+prU
+hpK
nnu
uoF
pnh
@@ -40095,7 +41047,7 @@ oUI
wMO
lAG
kst
-lqg
+hKm
lqg
lqg
lqg
@@ -40210,7 +41162,7 @@ nkm
vza
vza
mRE
-eQh
+hpK
nnu
udU
pnh
@@ -40284,8 +41236,8 @@ aiC
xMD
dNX
pUk
-pnh
-eQh
+fip
+hpK
cGi
slK
yjh
@@ -40293,25 +41245,25 @@ dHS
rKQ
gng
qgj
-eQh
+hpK
bzO
oUI
-lbd
+kgs
oaM
oii
crb
iZO
-jAF
-jAF
+uLg
+irf
oii
awO
iZO
-jAF
+uLg
oaM
oii
crb
iZO
-jAF
+nXl
jAF
wIF
udU
@@ -40383,19 +41335,19 @@ xMD
bxb
vYN
fGx
-xMD
+ygW
dNX
pUk
-dxQ
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
-eQh
+jbx
+djy
+xpr
+xpr
+xpr
+xpr
+xpr
+xpr
+eaP
+hpK
fWX
oUI
lhw
@@ -40403,7 +41355,7 @@ jAF
eBz
shl
sAo
-reO
+jLR
jAF
tdp
uUI
@@ -40413,7 +41365,7 @@ jAF
reO
shl
sAo
-reO
+jLR
jAF
dNX
udU
@@ -40488,8 +41440,8 @@ mPm
xMD
dNX
pUk
-pnh
-eQh
+fip
+hpK
hdl
xRs
eab
@@ -40500,7 +41452,7 @@ xyG
nKA
aen
psr
-lbd
+kgs
jAF
eMj
shl
@@ -40516,7 +41468,7 @@ aiv
shl
sAo
pKs
-oaM
+ltP
wCW
qrh
efV
@@ -40599,7 +41551,7 @@ fww
fiW
vRx
jNz
-eQh
+hpK
qoI
oUI
idZ
@@ -40607,17 +41559,17 @@ jAF
ssi
shl
sAo
-eBz
+vwP
jAF
ssi
uUI
sAo
-tdp
+wus
jAF
ssi
shl
sAo
-reO
+jLR
jAF
nnu
udU
@@ -40704,22 +41656,22 @@ jry
aOG
eAi
oUI
-lbd
+kgs
jAF
xDc
shl
sAo
-reO
+jLR
jAF
tdp
uUI
sAo
-reO
+jLR
jAF
reO
shl
sAo
-reO
+jLR
jAF
dNX
udU
@@ -40803,10 +41755,10 @@ lqg
sqT
qtC
oTv
-eQh
+hpK
sqT
oUI
-lbd
+kgs
jAF
aIE
shl
@@ -40896,8 +41848,8 @@ boV
boV
qhi
wYN
-tjR
-eQh
+gSC
+hpK
vTY
slK
dPt
@@ -40908,22 +41860,22 @@ eXi
paV
hIy
bAX
-eXi
+qwP
jAF
reO
shl
sAo
-reO
+jLR
jAF
reO
uUI
sAo
-reO
+jLR
jAF
reO
shl
sAo
-reO
+jLR
jAF
dUA
fQc
@@ -40998,34 +41950,34 @@ nWx
boV
uFw
wsB
-uFw
-tgV
-tgV
-tgV
-tgV
-tgV
-tgV
-tgV
-tgV
-tgV
+aBB
+jDY
+wOb
+gTy
+sTJ
+wOb
+wOb
+wOb
+vyc
+ieR
sgq
wcP
hJf
-jAF
-jAF
+nWr
+fXq
crb
-iYx
-jAF
-jAF
-jAF
+jiD
+dBF
+uUt
+fXq
awO
-iYx
-jAF
-jAF
-jAF
+jiD
+iUq
+hSK
+fXq
crb
-iYx
-jAF
+jiD
+jQB
jAF
cih
cqw
@@ -41100,11 +42052,11 @@ fmj
boV
uVk
tEC
-xsK
-tgV
+fcp
+kpy
jOq
vIX
-tgV
+kpy
jqK
cQE
vGD
@@ -41127,7 +42079,7 @@ eqE
ock
shl
wgS
-wJC
+aUS
jAF
hqb
fzi
@@ -41202,11 +42154,11 @@ iKE
fkS
ePS
gtJ
-pnh
-tgV
+fip
+kpy
cKw
cuQ
-tgV
+kpy
vTV
htk
pDW
@@ -41229,7 +42181,7 @@ snb
snb
lHe
wgS
-ock
+lJn
jAF
ujG
wJw
@@ -41304,11 +42256,11 @@ coZ
aLN
uow
dow
-haX
+fAf
xgK
-tgV
+syX
lcp
-tgV
+ieR
haG
jkK
xEA
@@ -41433,7 +42385,7 @@ mdJ
aJv
shl
wgS
-aJv
+tPK
jAF
vLX
mkb
@@ -41521,22 +42473,22 @@ bIu
xuI
scL
ndn
-jAF
-jAF
+nWr
+sIu
crb
iYx
-jAF
-jAF
-jAF
+sIu
+sIu
+sIu
awO
iYx
-jAF
-jAF
-jAF
+sIu
+sIu
+sIu
crb
iYx
-jAF
-jAF
+iUq
+oGg
cvV
pkH
wJw
@@ -41622,8 +42574,8 @@ xjI
tgV
uSz
deN
-uSz
-uRm
+wlF
+rva
jvR
pWi
heP
@@ -42015,7 +42967,7 @@ vIA
dJR
nuA
jFv
-dJR
+rOC
uud
fZl
aRi
@@ -42407,7 +43359,7 @@ msf
hoN
hqo
edg
-aXd
+wqm
hZy
xSV
aXd
@@ -42627,7 +43579,7 @@ vcm
iOX
bsH
oSV
-mOR
+nJd
pxs
fZl
aRi
diff --git a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
index a6d4f014c49b4..6f27e24a2292c 100644
--- a/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
+++ b/_maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
@@ -6,6 +6,9 @@
"aat" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/bread,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 3
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"abX" = (
@@ -89,6 +92,21 @@
},
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"afL" = (
+/obj/structure/cable,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/black{
+ dir = 1
+ },
+/area/mainship/squads/general)
+"agk" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"agP" = (
/obj/machinery/door_control/mainship/ammo{
dir = 8
@@ -303,6 +321,17 @@
"avK" = (
/obj/structure/table/mainship,
/obj/item/ashtray/bronze,
+/obj/item/prop/mainship/candle{
+ pixel_y = 7
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 9;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 8;
+ pixel_y = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"aws" = (
@@ -379,6 +408,13 @@
},
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"aCb" = (
+/obj/structure/table/wood,
+/obj/item/toy/deck/kotahi,
+/obj/item/reagent_containers/food/drinks/bottle/eggnog,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/wood,
+/area/mainship/living/grunt_rnr)
"aCd" = (
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship,
@@ -480,6 +516,10 @@
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"aHa" = (
+/obj/structure/prop/holidays/string_lights/cap,
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"aHp" = (
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/hallways/hangar)
@@ -561,6 +601,9 @@
"aKD" = (
/obj/structure/table/mainship,
/obj/item/reagent_containers/food/drinks/golden_cup,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"aKX" = (
@@ -718,6 +761,7 @@
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/operating_room_one)
"aSJ" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"aSV" = (
@@ -743,6 +787,7 @@
/obj/item/tool/pen/red,
/obj/item/tool/pen/blue,
/obj/effect/spawner/random/misc/paperbin,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/carpet,
/area/mainship/living/commandbunks)
"aTl" = (
@@ -934,6 +979,13 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/port_hallway)
+"bet" = (
+/obj/effect/landmark/start/latejoin,
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/living/cryo_cells)
"beB" = (
/obj/structure/closet/firecloset,
/turf/open/floor/mainship/mono,
@@ -1016,6 +1068,12 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/shipboard/brig)
+"bki" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/misc/earmuffs,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/shipboard/firing_range)
"bld" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/mainship/mono,
@@ -1049,6 +1107,9 @@
dir = 1
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
@@ -1075,9 +1136,18 @@
"bpc" = (
/turf/closed/wall/mainship,
/area/mainship/living/commandbunks)
+"bph" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/stern_hallway)
"bpz" = (
/obj/machinery/light/mainship,
/obj/effect/ai_node,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/cargo/arrow{
dir = 1
},
@@ -1232,6 +1302,9 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo/arrow{
dir = 8
},
@@ -1240,6 +1313,12 @@
/obj/structure/bed/chair/comfy/black,
/turf/open/floor/mainship/purple/full,
/area/mainship/living/briefing)
+"bBi" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"bBk" = (
/obj/structure/barricade/metal{
dir = 4
@@ -1450,6 +1529,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"bMB" = (
@@ -1889,6 +1971,14 @@
/obj/item/reagent_containers/glass/beaker/cryomix{
name = "cryo beaker"
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/sterile/corner,
/area/mainship/medical/lower_medical)
"cpi" = (
@@ -1917,6 +2007,9 @@
},
/obj/structure/table/mainship,
/obj/machinery/photocopier,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"csW" = (
@@ -1943,6 +2036,9 @@
/obj/item/target,
/obj/item/target,
/obj/item/target,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"cvV" = (
@@ -1975,6 +2071,14 @@
/obj/machinery/cryopod/right,
/turf/open/floor/mainship,
/area/mainship/living/cryo_cells)
+"cxu" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/misc/earmuffs,
+/obj/item/prop/mainship/candle{
+ pixel_y = 7
+ },
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/shipboard/firing_range)
"cxv" = (
/obj/structure/largecrate/supply/supplies/flares,
/turf/open/floor/mainship/orange{
@@ -2056,6 +2160,13 @@
/obj/item/trash/cigbutt,
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
+"cCu" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"cCy" = (
/turf/closed/wall/mainship/outer,
/area/crew_quarters/toilet)
@@ -2596,6 +2707,12 @@
},
/turf/open/floor/plating,
/area/mainship/living/chapel)
+"dkw" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"dkD" = (
/obj/machinery/door/airlock/mainship/medical/glass/chemistry{
dir = 1
@@ -2637,6 +2754,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/lower_hull)
+"dlp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/black,
+/area/mainship/squads/general)
"dlz" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/floor/mainship/sterile,
@@ -2644,6 +2767,10 @@
"dlQ" = (
/obj/machinery/status_display,
/obj/structure/sign/prop4,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"dmj" = (
@@ -2767,6 +2894,14 @@
dir = 1
},
/area/mainship/engineering/engineering_workshop)
+"dsu" = (
+/obj/machinery/door/firedoor/mainship,
+/obj/machinery/door/airlock/mainship/marine/general/sl,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"dtC" = (
/obj/machinery/door/airlock/mainship/maint{
dir = 2
@@ -2832,6 +2967,12 @@
/area/mainship/medical/lower_medical)
"dvX" = (
/obj/structure/sign/safety/cryogenic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"dvZ" = (
@@ -2882,6 +3023,7 @@
"dBm" = (
/obj/structure/table/wood,
/obj/item/toy/deck/kotahi,
+/obj/item/reagent_containers/food/drinks/bottle/eggnog,
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
"dBu" = (
@@ -3135,6 +3277,14 @@
dir = 4
},
/area/mainship/living/pilotbunks)
+"dTF" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black{
+ dir = 8
+ },
+/area/mainship/squads/general)
"dTH" = (
/obj/effect/turf_decal/warning_stripes/thin,
/obj/effect/turf_decal/warning_stripes/thin{
@@ -3224,11 +3374,19 @@
dir = 1
},
/area/mainship/shipboard/firing_range)
+"dZk" = (
+/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/living/cryo_cells)
"dZY" = (
/obj/structure/window/framed/mainship,
/obj/machinery/door/poddoor/shutters/mainship/fc_office{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/mainship/living/numbertwobunks)
"eaH" = (
@@ -3335,6 +3493,15 @@
dir = 8
},
/area/mainship/command/self_destruct)
+"eeP" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"eeX" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -3380,6 +3547,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/mainship/mono,
/area/mainship/living/bridgebunks)
+"ehd" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"ehf" = (
/obj/docking_port/stationary/marine_dropship/hangar/one,
/obj/docking_port/stationary/marine_dropship/crash_target,
@@ -3462,6 +3635,7 @@
/area/mainship/hallways/starboard_hallway)
"ekL" = (
/obj/structure/noticeboard,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"ekM" = (
@@ -3487,6 +3661,9 @@
/area/mainship/engineering/port_atmos)
"elQ" = (
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"emg" = (
@@ -3496,6 +3673,9 @@
/area/mainship/medical/medical_science)
"emh" = (
/obj/machinery/vending/armor_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
"emm" = (
@@ -3514,6 +3694,12 @@
/obj/structure/cable,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/lower_hull)
+"enk" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/yellow_cargo,
+/area/mainship/squads/general)
"enM" = (
/obj/machinery/vending/security,
/turf/open/floor/mainship/red/full,
@@ -3681,9 +3867,13 @@
/area/mainship/hallways/stern_hallway)
"eCd" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"eCk" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/carpet/side,
/area/mainship/living/numbertwobunks)
"eCr" = (
@@ -3941,6 +4131,9 @@
/turf/open/floor/mainship/mono,
/area/mainship/living/briefing)
"eTN" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"eTR" = (
@@ -4271,11 +4464,20 @@
/obj/item/clothing/under/rank/prisoner,
/turf/open/floor/plating/mainship,
/area/mainship/shipboard/brig)
+"fnZ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"foj" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 1
},
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"fol" = (
@@ -4327,6 +4529,10 @@
/area/mainship/living/tankerbunks)
"fpB" = (
/obj/structure/sign/prop4,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"fqs" = (
@@ -4383,6 +4589,7 @@
/area/mainship/medical/chemistry)
"ftY" = (
/obj/structure/table/wood,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/wood,
/area/mainship/medical/lower_medical)
"fuf" = (
@@ -4596,6 +4803,15 @@
dir = 8
},
/area/mainship/command/self_destruct)
+"fEm" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"fEq" = (
/obj/machinery/light/mainship{
dir = 8
@@ -4731,6 +4947,9 @@
/area/mainship/living/grunt_rnr)
"fKK" = (
/obj/machinery/vending/armor_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/general)
"fLM" = (
@@ -4831,6 +5050,10 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/starboard_hallway)
+"fWs" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"fXg" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 9
@@ -4895,6 +5118,13 @@
dir = 4
},
/area/mainship/medical/operating_room_two)
+"fZc" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"fZH" = (
/obj/structure/window/reinforced{
dir = 4
@@ -4967,6 +5197,7 @@
pixel_y = 10
},
/obj/item/toy/plush/rouny,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/orange/full,
/area/mainship/command/cic)
"gaD" = (
@@ -5212,6 +5443,13 @@
/obj/machinery/iv_drip,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
+"gnR" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"goh" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -5252,6 +5490,10 @@
/obj/machinery/light/mainship,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/stern_hallway)
+"gpq" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"gpx" = (
/obj/machinery/light/floor{
dir = 4
@@ -5451,6 +5693,20 @@
"gGg" = (
/turf/open/floor/mainship/mono,
/area/mainship/living/briefing)
+"gHQ" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/packagedbar,
+/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
+"gHS" = (
+/obj/effect/ai_node,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"gHU" = (
/obj/structure/bed/chair/nometal,
/turf/open/floor/mainship/mono,
@@ -5519,6 +5775,10 @@
/obj/item/radio{
pixel_x = 6
},
+/obj/item/reagent_containers/food/drinks/bottle/eggnog,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1
+ },
/turf/open/floor/mainship/orange{
dir = 8
},
@@ -5624,6 +5884,9 @@
/area/mainship/squads/req)
"gUo" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"gUp" = (
@@ -5658,6 +5921,14 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"gWa" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/red{
+ dir = 8
+ },
+/area/mainship/shipboard/firing_range)
"gWI" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 8
@@ -5684,6 +5955,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/lower_hull)
+"gXi" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"gXs" = (
/obj/structure/target_stake,
/obj/item/target,
@@ -5847,6 +6124,12 @@
dir = 4;
pixel_x = 17
},
+/obj/item/prop/mainship/candle{
+ pixel_y = 5
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -9
+ },
/turf/open/floor/mainship/emerald{
dir = 5
},
@@ -5879,6 +6162,11 @@
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/packagedbar,
/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"hlS" = (
@@ -5894,11 +6182,15 @@
/area/mainship/hallways/port_umbilical)
"hme" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"hmH" = (
/obj/machinery/light/mainship,
/obj/structure/sign/prop1,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"hmO" = (
@@ -6014,6 +6306,15 @@
dir = 1
},
/area/mainship/squads/general)
+"htx" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/cryo_cells)
"htZ" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1{
dir = 4
@@ -6099,6 +6400,13 @@
dir = 4
},
/area/mainship/medical/medical_science)
+"hDj" = (
+/obj/machinery/marine_selector/clothes/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"hDs" = (
/obj/machinery/camera/autoname/mainship{
dir = 1
@@ -6127,6 +6435,9 @@
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
"hGq" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/carpet/side{
dir = 10
},
@@ -6134,6 +6445,9 @@
"hGE" = (
/obj/machinery/marine_selector/clothes/engi,
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"hGO" = (
@@ -6179,6 +6493,9 @@
/obj/structure/bed/bunkbed,
/obj/effect/landmark/start/job/squadsmartgunner,
/obj/effect/landmark/start/job/squadsmartgunner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/cryo_cells)
"hJw" = (
@@ -6292,6 +6609,9 @@
"hPQ" = (
/obj/effect/ai_node,
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/black{
dir = 4
},
@@ -6310,6 +6630,12 @@
/obj/vehicle/unmanned/droid,
/turf/open/floor/mech_bay_recharge_floor,
/area/mainship/command/airoom)
+"hQV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"hRh" = (
/turf/open/floor/mainship_hull/dir{
dir = 1
@@ -6337,6 +6663,9 @@
/obj/structure/toilet{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
"hSb" = (
@@ -6465,6 +6794,15 @@
dir = 8
},
/area/mainship/medical/chemistry)
+"hYn" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"hZe" = (
/turf/open/floor/plating/mainship/striped{
dir = 8
@@ -6481,12 +6819,21 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 10
},
/area/mainship/squads/general)
"iaf" = (
/obj/machinery/door_control/mainship/fc_shutters,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship,
/area/mainship/living/numbertwobunks)
"iaH" = (
@@ -6577,6 +6924,7 @@
/area/mainship/medical/lower_medical)
"igO" = (
/obj/item/trash/cigbutt,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/black{
dir = 8
},
@@ -6585,6 +6933,13 @@
/obj/machinery/telecomms/processor/preset_three,
/turf/open/floor/mainship/tcomms,
/area/mainship/command/telecomms)
+"ihE" = (
+/obj/machinery/marine_selector/gear/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"ihU" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/mainship/mono,
@@ -6639,6 +6994,13 @@
},
/turf/open/floor/mainship/cargo/arrow,
/area/mainship/hallways/hangar)
+"ilk" = (
+/obj/machinery/marine_selector/gear/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"ilH" = (
/obj/structure/table/mainship/nometal,
/obj/item/clipboard{
@@ -6742,6 +7104,7 @@
/area/mainship/squads/general)
"isK" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/black{
dir = 8
},
@@ -7155,6 +7518,12 @@
/obj/structure/largecrate/supply/ammo,
/turf/open/floor/mainship/mono,
/area/mainship/command/self_destruct)
+"iWw" = (
+/obj/item/reagent_containers/food/drinks/bottle/eggnog,
+/turf/open/floor/mainship/sterile/side{
+ dir = 1
+ },
+/area/mainship/medical/lower_medical)
"iWQ" = (
/obj/structure/bed/chair/sofa{
dir = 8
@@ -7201,6 +7570,11 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = -4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/green{
dir = 10
},
@@ -7331,6 +7705,18 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/port_hallway)
+"jgF" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadengineer,
+/obj/effect/landmark/start/job/squadengineer,
+/obj/machinery/light/mainship{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/cryo_cells)
"jhK" = (
/obj/machinery/vending/coffee,
/turf/open/floor/mainship/floor,
@@ -7447,6 +7833,9 @@
/obj/machinery/light/mainship{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 10
},
@@ -7459,6 +7848,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
"jsE" = (
@@ -7674,6 +8066,12 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/hexagon,
/area/mainship/living/mechpilotquarters)
+"jLU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"jMH" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -7932,6 +8330,9 @@
dir = 4
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo/arrow{
dir = 8
},
@@ -8715,6 +9116,15 @@
/obj/item/blueprints,
/turf/open/floor/mainship/mono,
/area/mainship/engineering/ce_room)
+"kYx" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"kYM" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -8884,6 +9294,14 @@
/obj/item/storage/donut_box,
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
+"liv" = (
+/obj/structure/table/wood,
+/obj/item/storage/fancy/cigar,
+/obj/item/prop/mainship/candle{
+ pixel_y = 7
+ },
+/turf/open/floor/wood,
+/area/mainship/living/grunt_rnr)
"liX" = (
/mob/living/simple_animal/corgi/walten,
/turf/open/floor/mainship/sterile,
@@ -8978,6 +9396,9 @@
/area/mainship/hallways/hangar)
"llW" = (
/obj/structure/flora/pottedplant,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"llX" = (
@@ -8990,6 +9411,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
+"lmn" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/hexagon,
+/area/mainship/living/evacuation)
"lmy" = (
/obj/machinery/door/airlock/mainship/maint,
/obj/structure/cable,
@@ -9045,6 +9472,12 @@
"lpn" = (
/obj/structure/sign/electricshock,
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"lpt" = (
@@ -9117,6 +9550,9 @@
dir = 4
},
/obj/item/ammo_magazine/shotgun/blank,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"lue" = (
@@ -9183,6 +9619,15 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/starboard_hallway)
+"lwM" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"lwW" = (
/turf/open/floor/mainship/tcomms,
/area/mainship/command/telecomms)
@@ -9240,6 +9685,12 @@
dir = 1
},
/area/mainship/medical/lower_medical)
+"lAJ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hull/lower_hull)
"lAT" = (
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
@@ -9303,6 +9754,9 @@
/obj/structure/bed/bunkbed,
/obj/effect/landmark/start/job/squadmarine,
/obj/effect/landmark/start/job/squadcorpsman,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/cryo_cells)
"lEz" = (
@@ -9312,6 +9766,9 @@
/obj/machinery/light/mainship{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/cryo_cells)
"lES" = (
@@ -9339,6 +9796,9 @@
/turf/open/floor/mainship/mono,
/area/mainship/engineering/upper_engineering)
"lFo" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue,
/area/mainship/living/numbertwobunks)
"lGg" = (
@@ -9363,6 +9823,10 @@
/obj/item/clothing/head/warning_cone,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"lGH" = (
+/obj/structure/prop/holidays/string_lights/cap,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"lGU" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -9424,6 +9888,21 @@
},
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/starboard_hallway)
+"lHY" = (
+/obj/effect/ai_node,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 10;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -10;
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/sterile/dark,
+/area/mainship/medical/upper_medical)
"lIB" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -9531,6 +10010,10 @@
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/packagedbar,
/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"lOk" = (
@@ -9780,6 +10263,15 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
+"maX" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"mbM" = (
/obj/structure/table/mainship/nometal,
/obj/item/fuel_cell/full,
@@ -9807,6 +10299,10 @@
/obj/structure/cable,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/stern_hallway)
+"mcB" = (
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/plating,
+/area/mainship/living/chapel)
"mcF" = (
/obj/machinery/camera/autoname/mainship,
/turf/open/floor/mainship/tcomms,
@@ -9904,6 +10400,10 @@
dir = 9
},
/area/mainship/command/self_destruct)
+"mkJ" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"mle" = (
/turf/closed/wall/mainship/research/containment/wall/east,
/area/mainship/medical/medical_science)
@@ -10114,6 +10614,12 @@
/obj/structure/cable,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/starboard_hallway)
+"myO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"mzh" = (
/obj/structure/disposalpipe/segment/corner{
dir = 1
@@ -10136,6 +10642,7 @@
/area/mainship/medical/upper_medical)
"mBc" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship,
/area/mainship/squads/general)
"mBi" = (
@@ -10154,6 +10661,17 @@
"mBZ" = (
/turf/open/space,
/area/space)
+"mCB" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/misc/earmuffs,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = -4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2
+ },
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/shipboard/firing_range)
"mDY" = (
/obj/structure/cable,
/obj/machinery/light/mainship/small{
@@ -10230,6 +10748,18 @@
"mHk" = (
/turf/open/floor/mech_bay_recharge_floor,
/area/mainship/living/mechpilotquarters)
+"mHo" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/machinery/firealarm{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/cryo_cells)
"mHW" = (
/turf/open/floor/mainship/sterile/side{
dir = 4
@@ -10342,6 +10872,13 @@
dir = 1
},
/area/mainship/living/commandbunks)
+"mOI" = (
+/obj/machinery/marine_selector/clothes/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"mOX" = (
/obj/machinery/atmospherics/pipe/simple/general/visible{
dir = 4
@@ -10385,6 +10922,9 @@
/area/mainship/command/cic)
"mQq" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red{
dir = 4
},
@@ -10483,6 +11023,9 @@
/area/mainship/hallways/hangar)
"mVP" = (
/obj/structure/sign/prop4,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship,
/area/mainship/living/commandbunks)
"mWu" = (
@@ -10854,6 +11397,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
+"nsQ" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/effect/landmark/start/job/squadmarine,
+/obj/machinery/camera/autoname/mainship,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/wood,
+/area/mainship/living/cryo_cells)
"ntb" = (
/obj/machinery/door/airlock/mainship/medical/morgue,
/obj/structure/cable,
@@ -10937,6 +11488,9 @@
/obj/machinery/light/mainship{
dir = 1
},
+/obj/item/prop/mainship/candle{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/orange{
dir = 9
},
@@ -11343,6 +11897,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/stern_hallway)
+"nZE" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar/droppod)
"nZI" = (
/turf/open/floor/plating/mainship/striped{
dir = 4
@@ -11388,6 +11948,13 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/mono,
/area/mainship/hull/lower_hull)
+"oaw" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 4;
+ pixel_y = -4
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"obt" = (
/obj/structure/table/wood/fancy,
/obj/item/ashtray/glass,
@@ -11486,6 +12053,10 @@
/obj/machinery/hydroponics,
/turf/open/floor/mainship/mono,
/area/mainship/hull/lower_hull)
+"ohM" = (
+/obj/structure/prop/holidays/string_lights/cap,
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"oiy" = (
/turf/open/floor/mainship/terragov/north{
dir = 9
@@ -11526,6 +12097,7 @@
/area/mainship/hallways/port_hallway)
"omz" = (
/obj/machinery/holopad,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/grass,
/area/mainship/living/starboard_garden)
"onk" = (
@@ -11563,6 +12135,15 @@
"oop" = (
/turf/open/floor/plating,
/area/mainship/shipboard/firing_range)
+"ooB" = (
+/obj/machinery/loadout_vendor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/black{
+ dir = 8
+ },
+/area/mainship/squads/general)
"ooM" = (
/obj/item/folder/black_random,
/obj/item/tool/hand_labeler,
@@ -11586,6 +12167,15 @@
/obj/structure/sign/safety/cryogenic,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
+"oqf" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"oqS" = (
/obj/machinery/marine_selector/gear/engi,
/obj/machinery/camera/autoname/mainship,
@@ -11645,6 +12235,14 @@
"osT" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/donut,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 3;
+ pixel_y = 3
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"otn" = (
@@ -11654,6 +12252,12 @@
},
/turf/open/floor/mainship/cargo/arrow,
/area/mainship/squads/req)
+"ouo" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"ouq" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment/corner{
@@ -11756,6 +12360,7 @@
/obj/item/tool/hand_labeler,
/obj/item/tool/hand_labeler,
/obj/structure/table/reinforced,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/black,
/area/mainship/squads/general)
"oDl" = (
@@ -11785,6 +12390,11 @@
/obj/structure/flora/pottedplant/twentytwo,
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
+"oFV" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"oGN" = (
/obj/effect/turf_decal/warning_stripes/thin,
/obj/machinery/landinglight/tadpole{
@@ -11894,6 +12504,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/wood,
/area/mainship/command/corporateliaison)
+"oMx" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"oNh" = (
/obj/effect/ai_node,
/turf/open/floor/mainship/sterile/side{
@@ -12049,6 +12665,12 @@
/obj/structure/cable,
/turf/open/floor/mainship/mono,
/area/mainship/living/chapel)
+"oWZ" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"oXs" = (
/obj/machinery/door/airlock/mainship/marine/general/engi,
/obj/structure/disposalpipe/segment{
@@ -12343,6 +12965,7 @@
/area/mainship/living/tankerbunks)
"pko" = (
/obj/structure/window/framed/mainship,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/mainship/shipboard/firing_range)
"pks" = (
@@ -12573,6 +13196,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/starboard_hallway)
+"pwa" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/grunt_rnr)
"pwb" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/structure/cable,
@@ -12666,6 +13295,13 @@
/obj/machinery/firealarm,
/turf/open/floor/mainship/cargo,
/area/mainship/engineering/engineering_workshop)
+"pCe" = (
+/obj/machinery/marine_selector/gear/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
"pDg" = (
/obj/machinery/bodyscanner{
dir = 8
@@ -12684,6 +13320,7 @@
dir = 8
},
/obj/item/stack/sandbags_empty/half,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
"pEN" = (
@@ -12743,6 +13380,9 @@
/obj/effect/landmark/start/job/squadmarine,
/obj/effect/landmark/start/job/squadmarine,
/obj/item/trash/barcaridine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/cryo_cells)
"pHV" = (
@@ -12869,6 +13509,9 @@
"pNT" = (
/obj/structure/table/mainship,
/obj/machinery/faxmachine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"pOn" = (
@@ -12954,6 +13597,12 @@
/area/mainship/living/numbertwobunks)
"pSf" = (
/obj/structure/window/framed/mainship,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"pSt" = (
@@ -12985,6 +13634,13 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/floor,
/area/mainship/hallways/boxingring)
+"pTL" = (
+/obj/machinery/holopad,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/cic)
"pTP" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/iron/kitchen,
@@ -13314,6 +13970,10 @@
dir = 1
},
/area/mainship/medical/lower_medical)
+"qrm" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"qsh" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 1
@@ -13518,6 +14178,9 @@
/obj/item/ammo_magazine/rifle/standard_carbine,
/obj/item/ammo_magazine/rifle/standard_carbine,
/obj/item/weapon/gun/rifle/standard_carbine,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"qFh" = (
@@ -13530,6 +14193,9 @@
dir = 1
},
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"qFQ" = (
@@ -13606,6 +14272,10 @@
/obj/machinery/door_display/research_cell/cell,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
+"qIz" = (
+/obj/docking_port/stationary/marine_dropship/minidropship,
+/turf/open/floor/plating,
+/area/mainship/hallways/hangar)
"qIE" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
dir = 1
@@ -13859,6 +14529,12 @@
/obj/item/toy/plush/farwa,
/turf/open/floor/wood,
/area/mainship/command/corporateliaison)
+"qVm" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"qVo" = (
/turf/open/space/basic,
/area/space)
@@ -13868,8 +14544,23 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/upper_medical)
+"qVQ" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
+ dir = 4
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/corporateliaison)
"qVS" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
"qWc" = (
@@ -13948,6 +14639,15 @@
},
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"raM" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"rbd" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -13970,6 +14670,10 @@
/obj/structure/sign/evac,
/turf/closed/wall/mainship,
/area/mainship/living/chapel)
+"rbS" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"rcm" = (
/obj/structure/flora/ausbushes/fullgrass,
/obj/effect/ai_node,
@@ -13995,6 +14699,9 @@
/area/mainship/hull/lower_hull)
"rer" = (
/obj/structure/noticeboard,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship,
/area/mainship/living/commandbunks)
"reJ" = (
@@ -14071,6 +14778,10 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/port_hallway)
+"rlb" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/shipboard/firing_range)
"rly" = (
/obj/machinery/light/mainship{
dir = 4
@@ -14169,6 +14880,9 @@
"rrt" = (
/obj/structure/table/wood,
/obj/item/toy/plush/lizard,
+/obj/item/reagent_containers/food/drinks/bottle/eggnog{
+ pixel_y = 4
+ },
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
"rrw" = (
@@ -14224,12 +14938,18 @@
/obj/item/newspaper,
/obj/item/reagent_containers/food/drinks/britcup,
/obj/item/reagent_containers/food/drinks/milk,
+/obj/item/prop/mainship/candle{
+ pixel_y = 9
+ },
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
"ruM" = (
/obj/machinery/air_alarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"rwK" = (
@@ -14383,6 +15103,9 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"rEX" = (
@@ -14443,6 +15166,16 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/general)
+"rJT" = (
+/obj/machinery/vending/uniform_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/general)
"rKk" = (
@@ -14530,6 +15263,7 @@
/area/mainship/medical/chemistry)
"rRa" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/cap,
/turf/closed/wall/mainship,
/area/mainship/living/cryo_cells)
"rSg" = (
@@ -14614,6 +15348,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar/droppod)
+"rWE" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/hangar)
"rWK" = (
/obj/structure/cable,
/obj/structure/disposalpipe/junction{
@@ -14649,6 +15389,13 @@
},
/turf/open/floor/mainship/hexagon,
/area/mainship/living/tankerbunks)
+"rXR" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"rYr" = (
/obj/structure/cable,
/obj/machinery/camera/autoname/mainship,
@@ -14686,6 +15433,9 @@
/area/mainship/command/corporateliaison)
"rZM" = (
/obj/machinery/vending/uniform_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/numbertwobunks)
"rZR" = (
@@ -14839,6 +15589,21 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"skV" = (
+/obj/structure/droppod,
+/obj/structure/drop_pod_launcher,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/yellow_cargo,
+/area/mainship/hallways/hangar/droppod)
+"sle" = (
+/obj/machinery/status_display,
+/obj/structure/sign/prop4,
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"smb" = (
/obj/structure/closet/fireaxecabinet,
/turf/closed/wall/mainship,
@@ -14914,6 +15679,16 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/lower_hull)
+"ssP" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"ste" = (
/obj/machinery/door/airlock/mainship/medical/glass/free_access{
dir = 1;
@@ -15271,6 +16046,9 @@
/obj/machinery/air_alarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"sSN" = (
@@ -15342,6 +16120,11 @@
"sXf" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/burger,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
"sXo" = (
@@ -15367,6 +16150,7 @@
pixel_x = -8;
pixel_y = 3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"sYd" = (
@@ -15432,6 +16216,15 @@
/obj/structure/window/framed/mainship/hull,
/turf/open/floor/mainship/floor,
/area/mainship/hallways/starboard_hallway)
+"tes" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"tet" = (
/obj/machinery/camera/autoname/mainship{
dir = 4
@@ -15522,6 +16315,13 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/lower_hull)
+"tio" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"tis" = (
/obj/effect/ai_node,
/turf/open/floor/mainship,
@@ -15671,6 +16471,15 @@
},
/turf/open/floor/iron/kitchen,
/area/mainship/living/grunt_rnr)
+"ttR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"ttT" = (
/obj/structure/bed/roller,
/obj/structure/cable,
@@ -15830,6 +16639,14 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/mono,
/area/mainship/command/telecomms)
+"tCu" = (
+/obj/item/trash/cigbutt{
+ pixel_x = 5;
+ pixel_y = -8
+ },
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/yellow_cargo,
+/area/mainship/squads/general)
"tCJ" = (
/obj/structure/rack,
/obj/item/storage/belt/utility/full,
@@ -15860,6 +16677,18 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar/droppod)
+"tDg" = (
+/obj/structure/bed/bunkbed,
+/obj/effect/landmark/start/job/squadcorpsman,
+/obj/effect/landmark/start/job/squadcorpsman,
+/obj/machinery/light/mainship{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/cryo_cells)
"tDC" = (
/obj/structure/table/reinforced,
/obj/effect/spawner/random/misc/earmuffs,
@@ -15953,6 +16782,12 @@
"tIn" = (
/turf/open/floor/plating,
/area/mainship/engineering/port_atmos)
+"tIv" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"tIy" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment/corner{
@@ -15978,6 +16813,9 @@
/obj/machinery/light/mainship{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 6
},
@@ -15985,6 +16823,13 @@
"tJA" = (
/turf/open/floor/mainship/ntlogo/nt2,
/area/mainship/squads/general)
+"tJG" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -8;
+ pixel_y = -5
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"tKd" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/chem_dispenser/beer,
@@ -16096,6 +16941,10 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"tRd" = (
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"tRh" = (
/obj/structure/cable,
/obj/machinery/camera/autoname/mainship{
@@ -16147,8 +16996,15 @@
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/hangar)
"tTR" = (
-/obj/docking_port/stationary/marine_dropship/minidropship,
-/turf/open/floor/plating,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 4;
+ pixel_y = 7
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -7;
+ pixel_y = -10
+ },
+/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
"tTW" = (
/obj/structure/cable,
@@ -16318,6 +17174,13 @@
},
/turf/open/floor/wood,
/area/mainship/living/cryo_cells)
+"ucT" = (
+/obj/machinery/marine_selector/clothes/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"udd" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/light/mainship{
@@ -16441,6 +17304,9 @@
light_color = "#da2f1b"
},
/obj/effect/ai_node,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
"ukb" = (
@@ -16453,6 +17319,9 @@
"ukJ" = (
/obj/machinery/marine_selector/clothes/medic,
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/general)
"umj" = (
@@ -16649,11 +17518,15 @@
/area/mainship/hallways/hangar)
"uxI" = (
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo/arrow{
dir = 8
},
/area/mainship/squads/general)
"uyy" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/living/numbertwobunks)
"uza" = (
@@ -16777,6 +17650,16 @@
dir = 8
},
/area/mainship/medical/operating_room_one)
+"uEe" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"uEg" = (
/obj/machinery/door/poddoor/shutters/opened/medbay{
dir = 2
@@ -17082,8 +17965,15 @@
/obj/structure/disposalpipe/segment/corner{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"uYp" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/yellow_cargo,
+/area/mainship/squads/general)
"uZn" = (
/obj/machinery/light/mainship{
dir = 8
@@ -17122,6 +18012,10 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/mainship,
/area/mainship/squads/general)
+"vad" = (
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"vaj" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -17217,6 +18111,11 @@
/obj/effect/spawner/random/misc/table_lighting,
/turf/open/floor/wood,
/area/mainship/living/mechpilotquarters)
+"vgi" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"vgo" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -17257,6 +18156,12 @@
"viq" = (
/turf/closed/wall/mainship,
/area/mainship/engineering/port_atmos)
+"vjn" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"vjs" = (
/obj/machinery/computer/navigation,
/turf/open/floor/mainship/mono,
@@ -17293,6 +18198,9 @@
/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{
dir = 1
},
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
/turf/open/floor/mainship/cargo/arrow{
dir = 8
},
@@ -17331,6 +18239,7 @@
pixel_y = 5
},
/obj/item/tool/pen,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/floor,
/area/mainship/living/numbertwobunks)
"vpD" = (
@@ -17339,6 +18248,16 @@
},
/turf/open/floor/mainship,
/area/mainship/squads/general)
+"vpR" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/bread,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/turf/open/floor/mainship,
+/area/mainship/squads/general)
"vqQ" = (
/obj/machinery/light/mainship{
dir = 8
@@ -17392,6 +18311,9 @@
dir = 4
},
/obj/structure/showcase/coinpress,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"vuM" = (
@@ -17533,6 +18455,7 @@
"vCB" = (
/obj/structure/table/mainship,
/obj/item/whistle,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"vCR" = (
@@ -17679,6 +18602,12 @@
/obj/machinery/telecomms/hub/preset,
/turf/open/floor/mainship/tcomms,
/area/mainship/command/telecomms)
+"vSg" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"vSo" = (
/obj/machinery/camera/autoname/mainship{
dir = 4
@@ -17743,6 +18672,9 @@
dir = 1
},
/obj/item/clothing/head/tgmcberet/red,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"vWL" = (
@@ -17782,6 +18714,12 @@
/obj/machinery/light/mainship,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar/droppod)
+"vYK" = (
+/obj/structure/table/reinforced,
+/obj/effect/spawner/random/misc/earmuffs,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/shipboard/firing_range)
"vZa" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -17889,6 +18827,10 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
+"wgL" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"wgS" = (
/obj/structure/cable,
/obj/machinery/door/airlock/mainship/secure{
@@ -17931,6 +18873,9 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship,
/area/mainship/squads/general)
"wiO" = (
@@ -17968,6 +18913,10 @@
},
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
+"wlS" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/commandbunks)
"wml" = (
/turf/open/floor/mainship/mono,
/area/mainship/engineering/port_atmos)
@@ -17975,6 +18924,11 @@
/obj/effect/turf_decal/warning_stripes/thick/corner,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"wmC" = (
+/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"wmH" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -17995,6 +18949,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/wood,
/area/mainship/command/corporateliaison)
"wnF" = (
@@ -18032,6 +18989,9 @@
/obj/machinery/door/airlock/multi_tile/mainship/blackgeneric/glass{
dir = 1
},
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
/turf/open/floor/mainship/cargo/arrow{
dir = 8
},
@@ -18039,6 +18999,9 @@
"wql" = (
/obj/machinery/door/airlock/mainship/generic/bathroom,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
"wqq" = (
@@ -18194,6 +19157,7 @@
/obj/item/clothing/head/chefhat,
/obj/item/clothing/under/rank/chef,
/obj/item/clothing/suit/storage/chef/classic,
+/obj/item/reagent_containers/food/drinks/bottle/eggnog,
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
"wwQ" = (
@@ -18239,6 +19203,9 @@
/obj/item/weapon/gun/shotgun/pump,
/obj/item/ammo_magazine/handful/buckshot,
/obj/item/ammo_magazine/handful/buckshot,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"wBa" = (
@@ -18246,6 +19213,16 @@
/obj/effect/landmark/start/job/chiefshipengineer,
/turf/open/floor/mainship/hexagon,
/area/mainship/engineering/engine_core)
+"wBk" = (
+/obj/structure/sign/prop4,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"wBC" = (
/obj/structure/table/wood/fancy,
/obj/machinery/computer/security/marinemainship_network,
@@ -18336,6 +19313,12 @@
/obj/item/storage/firstaid/rad,
/turf/open/floor/mainship/blue/full,
/area/mainship/command/cic)
+"wGU" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/general)
"wHk" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -18437,6 +19420,13 @@
/obj/machinery/chem_dispenser,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/chemistry)
+"wNs" = (
+/obj/structure/filingcabinet,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/commandbunks)
"wNF" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -18784,6 +19774,12 @@
/obj/structure/cable,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hallways/port_hallway)
+"xiI" = (
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 4
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar/droppod)
"xiT" = (
/obj/machinery/camera/autoname/mainship{
dir = 4
@@ -18879,6 +19875,13 @@
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship/white,
/area/mainship/medical/medical_science)
+"xlK" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 7;
+ pixel_y = 3
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"xmu" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5
@@ -18907,6 +19910,14 @@
/obj/vehicle/ridden/powerloader,
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/req)
+"xoD" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/yellow_cargo/arrow{
+ dir = 8
+ },
+/area/mainship/squads/general)
"xpe" = (
/obj/structure/cable,
/obj/effect/spawner/random/engineering/wood,
@@ -18936,6 +19947,9 @@
"xpw" = (
/obj/machinery/cryopod/right,
/obj/structure/sign/safety/cryogenic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/living/cryo_cells)
"xqb" = (
@@ -18969,6 +19983,9 @@
/obj/effect/turf_decal/warning_stripes/thin{
dir = 8
},
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
/turf/closed/wall/mainship,
/area/mainship/hallways/hangar)
"xtm" = (
@@ -19100,6 +20117,9 @@
/area/mainship/command/corporateliaison)
"xAr" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/black{
dir = 4
},
@@ -19317,6 +20337,7 @@
/area/mainship/hull/lower_hull)
"xJn" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship,
/area/mainship/living/numbertwobunks)
"xKE" = (
@@ -19495,6 +20516,7 @@
},
/obj/item/tool/pen/blue,
/obj/item/toy/inflatable_duck,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"xUi" = (
@@ -19585,6 +20607,9 @@
dir = 1
},
/obj/structure/sign/prop1,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/yellow_cargo,
/area/mainship/squads/general)
"xXW" = (
@@ -19735,6 +20760,12 @@
dir = 9
},
/area/mainship/living/numbertwobunks)
+"ycQ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/living/numbertwobunks)
"ydE" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -19831,6 +20862,9 @@
/area/mainship/medical/lower_medical)
"ykn" = (
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/mainship/shipboard/firing_range)
"ykt" = (
@@ -44189,7 +45223,7 @@ bPG
fAo
aME
rKn
-xSw
+lmn
xSw
xSw
mLd
@@ -44967,7 +46001,7 @@ lES
wHI
ttp
ttp
-ttp
+mcB
ttp
viq
wUx
@@ -45972,13 +47006,13 @@ dIH
xzR
rrZ
bpc
-bpc
+wlS
lzr
-bpc
+vSg
mVP
-bpc
-bpc
-bpc
+vSg
+vSg
+vSg
hzc
bpc
bpc
@@ -46205,7 +47239,7 @@ mvs
lGi
yjx
wcT
-fPi
+lHY
sbr
sbr
fPi
@@ -46228,8 +47262,8 @@ wsb
tCd
oKO
xVj
-bpc
-bpc
+wlS
+jLU
cfO
xzK
ijM
@@ -46237,7 +47271,7 @@ kxP
uQb
bTo
ruM
-bpc
+gXi
bpc
iYD
hvL
@@ -46459,7 +47493,7 @@ ryp
igh
qZR
mvs
-lGi
+iWw
yjx
wcT
dIf
@@ -46485,7 +47519,7 @@ rcC
alY
oNS
jQS
-bpc
+gpq
ess
vLD
egb
@@ -46731,18 +47765,18 @@ bLz
bLz
glL
lhZ
-dBm
+aCb
nHm
mBi
leu
sFt
rrI
leu
-wEo
+qVQ
tBh
pfH
qUT
-bpc
+gpq
aGO
iUK
vlB
@@ -46999,7 +48033,7 @@ tAc
leu
leu
leu
-bpc
+gpq
xBM
iUK
mOC
@@ -47193,7 +48227,7 @@ uQQ
tLf
ufq
bDH
-tyN
+rWE
xSn
dpY
nWV
@@ -47256,7 +48290,7 @@ wEo
dSL
iII
srq
-bpc
+gpq
xgv
iUK
nHf
@@ -47495,7 +48529,7 @@ vhl
qVu
tpo
wcT
-qvJ
+pwa
qvJ
qvJ
qvJ
@@ -47513,7 +48547,7 @@ mvU
vdV
bWz
wne
-bpc
+gpq
lOA
iUK
lvj
@@ -47757,7 +48791,7 @@ jxi
hUf
qvJ
upL
-tjp
+liv
cVd
cVd
bLz
@@ -47770,7 +48804,7 @@ qQR
rsj
mia
eNL
-bpc
+gpq
avK
afG
gLR
@@ -48027,7 +49061,7 @@ glN
pqA
bjy
lLR
-bpc
+gpq
vCB
bdF
aBY
@@ -48036,7 +49070,7 @@ lGW
gbJ
aBY
bLA
-bLA
+wNs
bpc
jfQ
hnX
@@ -48285,15 +49319,15 @@ cfM
lnQ
fpb
rer
-bpc
-bpc
-bpc
-bpc
+oMx
+oMx
+oMx
+oMx
xpr
-bpc
-bpc
-bpc
-bpc
+oMx
+oMx
+oMx
+oWZ
hSQ
hUf
aJb
@@ -50098,7 +51132,7 @@ fXS
vfH
bxQ
vfH
-dNg
+pTL
heZ
wWQ
wWQ
@@ -50533,7 +51567,7 @@ gGg
bEi
bEi
bEi
-dpY
+mkJ
dpY
rpB
iXU
@@ -50790,8 +51824,8 @@ qxp
snV
bEi
bEi
-dpY
-dpY
+oaw
+tTR
hOe
dpY
dpY
@@ -51048,7 +52082,7 @@ sEl
obQ
wEI
dpY
-dpY
+vad
hOe
dpY
dpY
@@ -51304,8 +52338,8 @@ rzG
sKa
jIc
jIc
-dpY
-dpY
+tJG
+xlK
hOe
dpY
dpY
@@ -51561,7 +52595,7 @@ gGg
jIc
jIc
jIc
-dpY
+tRd
dpY
qIE
gek
@@ -51905,7 +52939,7 @@ jmu
cLu
enM
vfH
-cWu
+bph
nYD
cWu
gto
@@ -52871,8 +53905,8 @@ pwj
cfw
kDx
kDx
-tTR
kDx
+qIz
kDx
kDx
cxw
@@ -53190,7 +54224,7 @@ vfH
pQG
frR
vfH
-cWu
+bph
nYD
cWu
dcY
@@ -54190,21 +55224,21 @@ vmD
uqV
tVF
mBc
-rUF
+agk
vab
bMm
rUK
-rUF
-rUF
-rUF
+wGU
+qrm
+agk
hwU
-rUF
+agk
oXs
-rUF
-rUF
-rUF
+wGU
+qrm
+agk
orf
-rUF
+wGU
rUF
vmD
uqV
@@ -54446,19 +55480,19 @@ vmD
vmD
uqV
jDL
-rUF
+rbS
swY
wsR
fEq
mNM
-swY
-rUF
+pCe
+rbS
gFW
mNM
jeQ
pyS
-gFW
-rUF
+ilk
+rbS
eIM
jXW
fKK
@@ -54703,19 +55737,19 @@ mxT
mxT
qGG
tVF
-rUF
+rbS
dtI
kUU
rOr
tVr
xXT
-rUF
+rbS
tKs
krM
rHh
fYB
xXT
-rUF
+rbS
nMA
syD
rJe
@@ -54965,22 +55999,22 @@ qhf
tkW
lJV
pGb
-qhf
+hDj
hme
gxL
mNM
pyG
pyS
-gxL
+ucT
hme
ikM
jXW
-yhG
+rJT
mBc
wPw
-rUF
-rUF
-rUF
+agk
+agk
+agk
iHm
mqK
xZL
@@ -55196,49 +56230,49 @@ kVD
cTx
xvv
xjD
-xvv
+nZE
xvv
xvv
xJn
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
+ouo
+tIv
+wgL
+ouo
+ouo
+ouo
+ouo
+tIv
xJn
-rUF
+agk
nDF
stm
-rUF
-rUF
-rUF
-rUF
-rUF
-mBc
+agk
+agk
+agk
+agk
+wGU
+wmC
lRs
tkW
wkZ
pGb
-swY
-rUF
+pCe
+rbS
oqS
pGb
rrh
syR
-gFW
-rUF
+ilk
+rbS
cjl
bOF
-cjl
-rUF
+ihE
+rbS
wnI
pyG
vpD
rrh
-nLu
+kYx
mqK
hPb
wuQ
@@ -55451,7 +56485,7 @@ plO
fAJ
rWD
cTx
-xvv
+xiI
kWM
kWM
kWM
@@ -55473,24 +56507,24 @@ oZY
koS
koS
bDg
-ffo
-rUF
+ooB
+rbS
aLA
rbd
tgi
hPG
foj
-rUF
+rbS
tED
krM
cPg
fYB
elQ
-rUF
+rbS
wld
pak
hmH
-rUF
+rbS
dJU
rHh
cPg
@@ -55730,24 +56764,24 @@ aDz
eMz
eMz
eMz
-eMz
-rUF
+enk
+rbS
oNs
wsR
yhG
mNM
ukJ
-rUF
+rbS
pqm
mNM
wkZ
pyS
hGE
-rUF
+rbS
iFI
bOF
-iFI
-rUF
+mOI
+rbS
cPg
wkZ
cPg
@@ -55970,8 +57004,8 @@ bbw
uzy
tbT
xvv
-uyy
-uyy
+rXR
+lGH
wql
uyy
oKm
@@ -55988,22 +57022,22 @@ lkH
lkH
lkH
hPQ
-mBc
-rUF
+uEe
+lwM
der
-rUF
+lwM
rUK
-rUF
+tes
lpn
-rUF
+lwM
hwU
-rUF
+lwM
oXs
-rUF
+hYn
ekL
cjl
jXW
-cjl
+ihE
ekL
mNM
xWS
@@ -56257,11 +57291,11 @@ bTe
cey
jqy
iae
-rUF
+rbS
pGn
ycH
qFl
-rUF
+rbS
iVT
eMz
cPg
@@ -56487,12 +57521,12 @@ pdj
uyy
iJy
eCk
-uyy
-uyy
-uyy
+oqf
+fEm
+fEm
iaf
xiV
-uyy
+eeP
uyy
htr
cPg
@@ -56514,11 +57548,11 @@ sqc
cPg
cPg
llW
-rUF
+rbS
iFI
jXW
-iFI
-mBc
+mOI
+wmC
qEt
uGh
cPg
@@ -56763,7 +57797,7 @@ eMz
kbg
bNh
xLV
-xYh
+tCu
jlV
kbg
buS
@@ -56771,11 +57805,11 @@ xLV
eMz
jlV
wiL
-mBc
-rUF
+uEe
+lwM
orf
pSf
-rUF
+rbS
vHq
kpn
kpn
@@ -57008,11 +58042,11 @@ keK
hPR
rZM
uyy
-cdz
+afL
cPg
lOp
eYx
-cPg
+fWs
tJA
xLV
eMz
@@ -57032,12 +58066,12 @@ cPg
cPg
ocY
bnq
-rUF
+rbS
dBi
aKr
rBJ
pfV
-mNM
+xoD
mqK
uKH
mka
@@ -57288,13 +58322,13 @@ pWo
cPg
cPg
nLu
-lOp
-mBc
+dlp
+uEe
gYL
-rUF
-rUF
-rUF
-wPw
+lwM
+lwM
+lwM
+dsu
mqK
lRc
dDg
@@ -57520,7 +58554,7 @@ jmC
ivw
bIl
lrc
-tzF
+ycQ
uyy
pVb
lkH
@@ -57769,16 +58803,16 @@ xGl
xGl
xGl
xGl
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-uyy
-xJn
+cCu
+maX
+maX
+maX
+maX
+maX
+maX
+maX
+eeP
+vgi
pSX
sbB
aUp
@@ -57808,7 +58842,7 @@ fee
fee
fee
fee
-fee
+dTF
mqK
uKH
lAn
@@ -58026,7 +59060,7 @@ xGl
xGl
xGl
rrj
-nJG
+rlb
eJL
hvM
ibO
@@ -58035,7 +59069,7 @@ vuc
lIB
xRb
cvj
-nJG
+fZc
eDg
mng
xmJ
@@ -58065,7 +59099,7 @@ mxo
mxo
mxo
cPg
-cPg
+bBi
mqK
uKH
eOT
@@ -58283,7 +59317,7 @@ ygV
ygV
ygV
oOX
-nJG
+rlb
rPd
hZe
mmh
@@ -58301,7 +59335,7 @@ edj
tJA
fLM
eMz
-eMz
+uYp
qRu
gMl
fLM
@@ -58317,8 +59351,8 @@ cPg
rHh
hlO
osT
-hlO
-aat
+gHQ
+vpR
kuk
sYd
rHh
@@ -58537,15 +59571,15 @@ oAz
pgq
mSh
xGl
+skV
xGl
xGl
-xGl
-nJG
+rlb
bDv
cEe
bDv
bDv
-tDC
+vYK
fmP
oHj
ylc
@@ -58573,13 +59607,13 @@ lgL
cPg
cPg
aat
-hlO
+gHQ
lNe
-hlO
+gHQ
hDh
-sYd
-cPg
+oFV
cPg
+bBi
mqK
hVb
fEf
@@ -58797,12 +59831,12 @@ rKn
rKn
rKn
rKn
-nJG
+rlb
bDv
bDv
cEe
bDv
-tDC
+mCB
fmP
nhn
nbh
@@ -58836,7 +59870,7 @@ pnf
pnf
pnf
cPg
-cPg
+bBi
hRA
iXQ
iXQ
@@ -59054,12 +60088,12 @@ hUz
hUz
hUz
pQt
-nJG
+rlb
gXs
bDv
bDv
bDv
-tDC
+cxu
fmP
jCY
ykn
@@ -59079,7 +60113,7 @@ cPg
xYD
hgP
cPg
-cPg
+fWs
cPg
voa
jbe
@@ -59093,7 +60127,7 @@ tis
cPg
cPg
cPg
-tis
+gHS
rKn
sYv
sBr
@@ -59311,16 +60345,16 @@ esN
esN
esN
unX
-nJG
+rlb
pgv
bDv
eGs
bDv
-tDC
+bki
fmP
jCY
vWG
-nJG
+fZc
nwt
hfu
eHh
@@ -59568,7 +60602,7 @@ nWT
nWT
esN
unX
-nJG
+rlb
nZI
lHN
nZI
@@ -59577,34 +60611,34 @@ wtq
fmP
jCY
eTN
-nJG
-rKn
-rKn
-rKn
-rKn
-rKn
+dkw
+lAJ
+lAJ
+lAJ
+lAJ
+lAJ
fpB
rRa
heh
wpT
-aSJ
+ttR
dlQ
-aSJ
+aHa
heh
wpT
-rRa
-dlQ
-aSJ
+ssP
+sle
+aHa
heh
vmB
-fpB
-aSJ
+wBk
+hQV
cwD
wJh
-wJh
+bet
dvX
-aSJ
-aSJ
+tio
+aHa
wJh
wJh
xpw
@@ -59825,15 +60859,15 @@ nWT
nWT
esN
unX
-nJG
-nJG
-nJG
-nJG
+gnR
+raM
+raM
+raM
wJe
-nJG
+ohM
qxw
jiE
-ylc
+gWa
nJG
fRw
vAb
@@ -59844,12 +60878,12 @@ aSJ
qGH
kFl
xBS
-qzp
+tDg
aSJ
qzp
mog
gfi
-cRJ
+jgF
aSJ
cRJ
rqX
@@ -59859,12 +60893,12 @@ aSJ
cwD
wJh
wJh
-cwD
+dZk
aSJ
cwD
wJh
wJh
-cwD
+dZk
rKn
ouE
uSe
@@ -60082,7 +61116,7 @@ nWT
nWT
esN
unX
-nJG
+rlb
bDv
aFl
mjo
@@ -60106,7 +61140,7 @@ aSJ
dnw
nMY
ucj
-ktb
+htx
aSJ
qjf
rqX
@@ -60116,12 +61150,12 @@ aSJ
cwD
wJh
wJh
-cwD
+dZk
aSJ
cwD
wJh
wJh
-cwD
+dZk
rKn
ouE
iDP
@@ -60339,7 +61373,7 @@ nWT
nWT
esN
unX
-nJG
+rlb
pgv
dRR
uLb
@@ -60363,22 +61397,22 @@ eCd
lsh
qqP
kQS
-ktb
+htx
eCd
-lsh
+nsQ
rqX
atN
-ktb
+htx
eCd
rzd
wJh
wJh
-cwD
+dZk
eCd
rzd
wJh
wJh
-cwD
+dZk
rKn
ouE
uSe
@@ -60596,7 +61630,7 @@ nWT
nWT
esN
unX
-nJG
+rlb
nnF
qAJ
kbW
@@ -60615,27 +61649,27 @@ aSJ
bNl
rqX
qqP
-ktb
+htx
aSJ
ktb
mog
eWM
-ved
+mHo
aSJ
ved
rqX
rqX
-ktb
+htx
aSJ
cwD
umU
lWc
-cwD
+dZk
aSJ
cwD
lWc
lWc
-cwD
+dZk
rKn
fgk
jaF
@@ -60853,46 +61887,46 @@ nWT
nWT
esN
unX
-nJG
-nJG
-nJG
-nJG
+dkw
+myO
+myO
+myO
oop
dnf
-nJG
-nJG
-nJG
+myO
+myO
+qVm
nJG
rKn
vSJ
rKn
rKn
rKn
-aSJ
-aSJ
+vjn
+fnZ
kir
hcb
-aSJ
-aSJ
-aSJ
+ehd
+vjn
+fnZ
kir
hcb
-aSJ
-aSJ
-aSJ
+ehd
+vjn
+fnZ
kir
hcb
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
-aSJ
+ehd
+vjn
+fnZ
+fnZ
+fnZ
+ehd
+vjn
+fnZ
+fnZ
+fnZ
+ehd
rKn
uzA
aOM
diff --git a/_maps/map_files/Sulaco/TGS_Sulaco.dmm b/_maps/map_files/Sulaco/TGS_Sulaco.dmm
index 64ddb6ae09975..e1dc0bf751e5f 100644
--- a/_maps/map_files/Sulaco/TGS_Sulaco.dmm
+++ b/_maps/map_files/Sulaco/TGS_Sulaco.dmm
@@ -168,6 +168,7 @@
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
"aaJ" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/white,
/area/sulaco/medbay)
"aaM" = (
@@ -177,6 +178,12 @@
/obj/machinery/door/window/secure/medical{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay/chemistry)
"aaN" = (
@@ -241,6 +248,12 @@
id = "medsci"
},
/obj/machinery/camera/autoname,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -286,11 +299,17 @@
/obj/item/radio/intercom/general{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/chemistry)
"abl" = (
/obj/machinery/chem_dispenser,
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -298,6 +317,9 @@
"abm" = (
/obj/machinery/chem_master,
/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/chemistry)
"abo" = (
@@ -322,6 +344,7 @@
/area/sulaco/cryosleep)
"abs" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/gray,
/area/sulaco/briefing)
"abt" = (
@@ -352,6 +375,12 @@
dir = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -359,6 +388,12 @@
"abD" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -372,6 +407,9 @@
pixel_x = -5;
pixel_y = 10
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -406,6 +444,9 @@
pixel_x = -5;
pixel_y = 10
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -439,6 +480,9 @@
/area/sulaco/medbay/west)
"aca" = (
/obj/machinery/vending/MarineMed/Blood,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -482,6 +526,9 @@
},
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -605,6 +652,9 @@
/area/sulaco/cafeteria)
"acG" = (
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -619,6 +669,7 @@
dir = 2
},
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -633,18 +684,27 @@
dir = 2
},
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
/area/sulaco/medbay/surgery_two)
"acJ" = (
/obj/machinery/autodoc,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
/area/sulaco/medbay)
"acK" = (
/obj/machinery/computer/autodoc_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -665,6 +725,9 @@
dir = 2
},
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -679,6 +742,7 @@
dir = 2
},
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -1009,6 +1073,9 @@
/obj/structure/table/mainship/nometal,
/obj/item/reagent_containers/glass/beaker/cryomix,
/obj/item/reagent_containers/glass/beaker/cryomix,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -1029,6 +1096,7 @@
/area/sulaco/cafeteria)
"aeg" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/gray/outer,
/area/sulaco/cafeteria)
"aeh" = (
@@ -1061,12 +1129,18 @@
"ael" = (
/obj/machinery/light/mainship,
/obj/machinery/vending/MarineMed/Blood,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
/area/sulaco/medbay)
"aem" = (
/obj/machinery/sleeper,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -1244,6 +1318,9 @@
/obj/structure/window/framed/mainship/white,
/obj/machinery/door/firedoor/mainship,
/obj/machinery/door/poddoor/shutters/opened/medbay,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay/cmo)
"aeL" = (
@@ -1324,6 +1401,9 @@
/obj/structure/bed/chair/nometal{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay)
"afd" = (
@@ -1358,6 +1438,9 @@
/obj/structure/bed/chair/nometal{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -1675,6 +1758,9 @@
dir = 4
},
/obj/machinery/vending/MarineMed,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -2335,6 +2421,17 @@
/obj/item/tool/screwdriver,
/obj/item/tool/screwdriver,
/obj/item/tool/wrench,
+/obj/item/prop/mainship/candle{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 1;
+ pixel_y = -3
+ },
/turf/open/floor/prison,
/area/sulaco/cargo/prep)
"anK" = (
@@ -2373,6 +2470,7 @@
/area/sulaco/maintenance/upperdeck_north_maint)
"aob" = (
/obj/machinery/status_display/ai,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/gray,
/area/sulaco/briefing)
"aof" = (
@@ -2489,6 +2587,9 @@
/area/sulaco/bridge)
"aoG" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aoL" = (
@@ -2529,6 +2630,10 @@
/obj/item/radio/intercom/general{
dir = 4
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 3;
+ pixel_y = -7
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"apb" = (
@@ -2691,6 +2796,7 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 10
},
+/obj/structure/flora/tree/pine/xmas/presents,
/turf/open/floor/prison,
/area/sulaco/briefing)
"apO" = (
@@ -3373,6 +3479,9 @@
dir = 4
},
/obj/machinery/door/poddoor/opened/port,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/prison,
/area/sulaco/hallway/central_hall3)
"atj" = (
@@ -3465,6 +3574,9 @@
/area/sulaco/bridge)
"atx" = (
/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -3866,6 +3978,9 @@
/area/sulaco/bridge)
"avb" = (
/obj/machinery/cic_maptable/drawable/big,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/terragov{
dir = 8
},
@@ -4175,6 +4290,9 @@
name = "Engine Room Blast Doors";
pixel_y = -3
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/darkyellow/full,
/area/sulaco/engineering/engine_monitoring)
"awl" = (
@@ -4494,6 +4612,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"aym" = (
@@ -4628,6 +4749,7 @@
/area/sulaco/briefing)
"ayP" = (
/obj/structure/bed/chair/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/prison/red{
dir = 10
},
@@ -4771,6 +4893,9 @@
/obj/structure/table/reinforced,
/obj/item/storage/box/ids,
/obj/item/storage/box/ids,
+/obj/item/prop/mainship/candle{
+ pixel_y = 6
+ },
/turf/open/floor/carpet,
/area/sulaco/cap_office)
"azI" = (
@@ -4833,10 +4958,16 @@
/obj/item/clothing/mask/cigarette/pipe{
pixel_y = 5
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/wood,
/area/sulaco/cap_office)
"aAb" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aAj" = (
@@ -5106,15 +5237,27 @@
},
/turf/open/floor/prison,
/area/sulaco/briefing)
+"aBy" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"aBz" = (
/obj/structure/bed/chair/nometal{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aBD" = (
/obj/structure/table/mainship/nometal,
/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aBF" = (
@@ -5175,6 +5318,9 @@
dir = 8
},
/obj/effect/ai_node,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aBV" = (
@@ -5393,12 +5539,18 @@
/area/sulaco/maintenance/upperdeck_AIcore_maint)
"aCJ" = (
/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
"aCK" = (
/obj/machinery/door/window/secure{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"aCL" = (
@@ -5657,6 +5809,7 @@
},
/area/sulaco/research)
"aEh" = (
+/obj/effect/spawner/random_set/christmas_costume,
/turf/open/floor/mainship/research/containment/floor1,
/area/sulaco/research)
"aEi" = (
@@ -6549,6 +6702,9 @@
"aJS" = (
/obj/machinery/door/airlock/mainship/maint,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint3)
"aJT" = (
@@ -7285,6 +7441,10 @@
/obj/structure/cable,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/medbay/hangar)
+"aNM" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay)
"aNX" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 1
@@ -7512,6 +7672,19 @@
"aQl" = (
/obj/structure/table/mainship/nometal,
/obj/item/storage/box/beakers,
+/obj/item/prop/mainship/candle{
+ pixel_y = 4
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 20
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 11;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -11
+ },
/turf/open/floor/prison/whitegreen/full,
/area/sulaco/research)
"aQm" = (
@@ -7654,6 +7827,9 @@
dir = 1
},
/obj/item/tank/anesthetic,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/medbay/hangar)
"aRc" = (
@@ -8267,6 +8443,9 @@
/obj/structure/table/mainship/nometal,
/obj/item/storage/box/bodybags,
/obj/item/storage/box/bodybags,
+/obj/item/prop/mainship/candle{
+ pixel_y = 5
+ },
/turf/open/floor/cult,
/area/sulaco/morgue)
"aVp" = (
@@ -8648,6 +8827,13 @@
dir = 4
},
/obj/effect/spawner/random/misc/gnome,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint2)
"aYM" = (
@@ -8774,6 +8960,9 @@
/turf/open/floor/mainship/tcomms,
/area/sulaco/telecomms)
"aZQ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"aZU" = (
@@ -8991,6 +9180,9 @@
/obj/item/storage/box/nt_mre,
/obj/item/ashtray/bronze,
/obj/structure/table/wood/fancy,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/wood,
/area/sulaco/liaison)
"bcs" = (
@@ -9302,6 +9494,12 @@
/obj/machinery/vending/nanomed,
/turf/open/floor/prison/bright_clean,
/area/sulaco/hydro)
+"bjN" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint3)
"bjV" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -9339,6 +9537,10 @@
dir = 8
},
/area/sulaco/mechpilotquarters)
+"blw" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay)
"blH" = (
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship/gray/outer,
@@ -9432,6 +9634,12 @@
},
/turf/open/floor/prison,
/area/sulaco/cargo/office)
+"buS" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 5
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/firingrange)
"bvu" = (
/obj/machinery/computer/droppod_control,
/obj/structure/table/mainship/nometal,
@@ -9484,6 +9692,10 @@
},
/turf/open/floor/plating,
/area/sulaco/engineering/engine_monitoring)
+"bzk" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/prison/sterilewhite,
+/area/sulaco/cafeteria)
"bzl" = (
/obj/machinery/light/mainship,
/obj/structure/table/wood,
@@ -9516,6 +9728,24 @@
/obj/effect/soundplayer/deltaplayer,
/turf/open/space/basic,
/area/space)
+"bDq" = (
+/obj/structure/cable,
+/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
+ dir = 4
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 1
+ },
+/area/sulaco/medbay)
"bEF" = (
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/prison/plate,
@@ -9576,6 +9806,9 @@
dir = 1
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/grass,
/area/mainship/living/starboard_garden)
"bHC" = (
@@ -9819,6 +10052,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -9846,6 +10082,10 @@
"bWL" = (
/turf/open/floor/prison,
/area/sulaco/engineering)
+"bWY" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"bXC" = (
/obj/structure/disposalpipe/segment,
/turf/closed/wall/mainship/gray,
@@ -9971,6 +10211,20 @@
/obj/structure/window/reinforced/extratoughened,
/turf/open/floor/mainship/tcomms,
/area/sulaco/command/ai)
+"chh" = (
+/obj/structure/bed/chair/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -5;
+ pixel_y = -20
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -5;
+ pixel_y = -8
+ },
+/turf/open/floor/prison/darkpurple{
+ dir = 4
+ },
+/area/sulaco/briefing)
"cjc" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/turf/open/floor/mainship/tcomms,
@@ -9988,6 +10242,15 @@
},
/turf/open/floor/wood,
/area/sulaco/liaison)
+"cli" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"clj" = (
/obj/effect/decal/cleanable/cobweb,
/obj/effect/spawner/random/misc/structure/supplycrate,
@@ -10033,6 +10296,15 @@
/obj/machinery/firealarm,
/turf/open/floor/prison,
/area/sulaco/briefing)
+"cnl" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"cnu" = (
/obj/structure/cable,
/obj/effect/turf_decal/warning_stripes/thin{
@@ -10137,6 +10409,9 @@
/area/sulaco/marine/chapel/chapel_office)
"cvw" = (
/obj/structure/cable,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -10168,6 +10443,10 @@
dir = 1
},
/area/mainship/shipboard/weapon_room)
+"cxw" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"cxB" = (
/obj/effect/ai_node,
/turf/open/floor/cult,
@@ -10176,6 +10455,9 @@
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/prison,
/area/sulaco/hallway/lower_main_hall)
"cyv" = (
@@ -10184,6 +10466,9 @@
"cyR" = (
/obj/effect/spawner/random/misc/table_lighting,
/obj/structure/table/wood/fancy,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/wood,
/area/sulaco/liaison/quarters)
"cyU" = (
@@ -10260,6 +10545,12 @@
/obj/machinery/light/mainship,
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/cigarettes,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"cDi" = (
@@ -10305,8 +10596,17 @@
},
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
+"cGN" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/maintenance/lower_maint3)
"cHd" = (
/obj/machinery/vending/medical/shipside,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -10391,6 +10691,9 @@
"cKq" = (
/obj/machinery/light/mainship,
/obj/machinery/vending/armor_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"cKA" = (
@@ -10472,6 +10775,9 @@
/area/sulaco/telecomms)
"cOs" = (
/obj/structure/closet/basketball,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/tile/darkgreen/darkgreen2,
/area/mainship/living/basketball)
"cOP" = (
@@ -10479,6 +10785,9 @@
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 6
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/hallway/evac)
"cOV" = (
@@ -10522,6 +10831,9 @@
/obj/machinery/door/airlock/mainship/medical/glass{
dir = 2
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -10608,6 +10920,13 @@
dir = 8
},
/area/sulaco/briefing)
+"cVC" = (
+/obj/machinery/vending/medical/shipside,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"cWf" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 1
@@ -10695,6 +11014,9 @@
/area/sulaco/cafeteria/kitchen)
"cXw" = (
/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"cYh" = (
@@ -10732,6 +11054,16 @@
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar/droppod)
+"ddz" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = -10
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 12
+ },
+/obj/item/prop/mainship/candle/short,
+/turf/open/floor/prison,
+/area/sulaco/hallway/lower_main_hall)
"ddK" = (
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/prison/bright_clean,
@@ -10811,6 +11143,9 @@
/obj/machinery/light/mainship{
dir = 1
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/prison,
/area/sulaco/cargo/office)
"djX" = (
@@ -10841,6 +11176,9 @@
dir = 4
},
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"dlV" = (
@@ -11047,6 +11385,13 @@
dir = 1
},
/area/sulaco/engineering/atmos)
+"dxQ" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/prison,
+/area/sulaco/bar)
"dyO" = (
/obj/machinery/camera/autoname{
dir = 1
@@ -11107,6 +11452,9 @@
"dDU" = (
/obj/structure/window/framed/mainship/gray/toughened,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating/platebotc,
/area/mainship/shipboard/weapon_room)
"dEd" = (
@@ -11123,6 +11471,13 @@
/obj/effect/ai_node,
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"dEI" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -13;
+ pixel_y = 26
+ },
+/turf/open/floor/prison/red,
+/area/sulaco/hallway/central_hall3)
"dFM" = (
/obj/machinery/light/mainship/small{
dir = 1
@@ -11131,6 +11486,12 @@
/obj/effect/ai_node,
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_north_maint)
+"dGg" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"dGX" = (
/obj/effect/ai_node,
/turf/open/floor/plating,
@@ -11229,6 +11590,9 @@
name = "Lower Foreship Lockdown Shutters"
},
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating/platebotc,
/area/mainship/living/basketball)
"dOi" = (
@@ -11341,6 +11705,9 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"dTS" = (
@@ -11374,6 +11741,12 @@
},
/turf/open/floor/prison,
/area/sulaco/hallway/central_hall3)
+"dXx" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"dYK" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 1
@@ -11430,6 +11803,12 @@
/obj/machinery/vending/tool,
/turf/open/floor/mainship/hexagon,
/area/mainship/living/tankerbunks)
+"ebC" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cargo/office)
"ebF" = (
/obj/structure/mirror{
dir = 8
@@ -11493,6 +11872,13 @@
},
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"eeh" = (
+/obj/machinery/marine_selector/clothes/leader,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"efq" = (
/obj/machinery/light/mainship,
/obj/structure/table/reinforced,
@@ -11503,6 +11889,9 @@
/obj/structure/platform{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"efT" = (
@@ -11514,6 +11903,9 @@
/obj/item/radio/intercom/general{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"egL" = (
@@ -11665,6 +12057,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay)
"eqn" = (
@@ -11831,6 +12224,13 @@
/obj/structure/cable,
/turf/open/floor/plating/plating_catwalk/prison,
/area/sulaco/hallway/evac)
+"ezQ" = (
+/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"eAL" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/turf/open/floor/prison,
@@ -11838,6 +12238,9 @@
"eAP" = (
/obj/structure/table/mainship/nometal,
/obj/item/explosive/grenade/flare/civilian,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
"eBa" = (
@@ -11979,8 +12382,17 @@
/obj/item/pizzabox/meat,
/obj/effect/spawner/random/misc/soap/deluxeweighted,
/obj/effect/spawner/random/misc/soap/deluxeweighted,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
+"eIT" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay)
"eJO" = (
/obj/machinery/camera/autoname{
dir = 1
@@ -12189,6 +12601,10 @@
},
/turf/open/floor/mainship/tcomms,
/area/mainship/command/self_destruct)
+"eUY" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/prison/sterilewhite,
+/area/sulaco/cryosleep)
"eVy" = (
/obj/machinery/door/airlock/mainship/engineering/CSEoffice{
dir = 2
@@ -12214,6 +12630,12 @@
},
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"eWb" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"eWf" = (
/obj/machinery/light/mainship{
dir = 1
@@ -12222,6 +12644,9 @@
/area/sulaco/hallway/lower_main_hall)
"eWu" = (
/obj/structure/table/wood,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 5
+ },
/turf/open/floor/tile/chapel{
dir = 8
},
@@ -12299,12 +12724,29 @@
dir = 4
},
/area/sulaco/medbay)
+"faS" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/chemistry)
"fba" = (
/obj/machinery/door/airlock/mainship/generic{
dir = 1
},
/turf/open/floor/mainship/floor,
/area/mainship/living/tankerbunks)
+"fbJ" = (
+/obj/structure/window/framed/mainship/gray/toughened,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"fbS" = (
/obj/machinery/firealarm{
dir = 4
@@ -12352,6 +12794,9 @@
/obj/structure/sink{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -12380,6 +12825,15 @@
/obj/effect/ai_node,
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint2)
+"fhf" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"fhg" = (
/obj/item/reagent_containers/food/snacks/grown/poppy,
/turf/open/floor/grass,
@@ -12394,6 +12848,9 @@
/area/sulaco/liaison)
"fjF" = (
/obj/machinery/vending/medical/shipside,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"fkY" = (
@@ -12434,12 +12891,18 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
/area/sulaco/medbay)
"fmX" = (
/obj/effect/spawner/random/misc/structure/flavorvending/coffeeweighted,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay)
"fna" = (
@@ -12606,6 +13069,9 @@
/area/sulaco/hallway/lower_foreship)
"fxq" = (
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay)
"fxB" = (
@@ -12652,6 +13118,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay)
"fzI" = (
@@ -12673,6 +13140,15 @@
},
/turf/open/floor/mainship_hull/gray,
/area/sulaco/hangar/storage)
+"fAY" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"fBA" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1,
@@ -12748,6 +13224,9 @@
name = "Sandwich Joe's Grilled Cheese";
volume = 65
},
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 6
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
"fEL" = (
@@ -12829,6 +13308,9 @@
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"fKu" = (
@@ -12837,6 +13319,9 @@
dir = 4
},
/obj/structure/table/mainship/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/wood,
/area/sulaco/medbay/west)
"fKw" = (
@@ -12857,8 +13342,18 @@
/obj/machinery/camera/autoname{
dir = 8
},
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 6
+ },
/turf/open/floor/prison/kitchen,
/area/sulaco/cafeteria)
+"fMp" = (
+/obj/machinery/marine_selector/gear/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"fNG" = (
/obj/machinery/light/mainship/small,
/turf/open/floor/prison/red,
@@ -12901,6 +13396,12 @@
dir = 1
},
/area/sulaco/bridge)
+"fRR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint3)
"fSz" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/turf/open/floor/tile/dark2,
@@ -12915,6 +13416,12 @@
/obj/machinery/vending/armor_supply,
/turf/open/floor/prison,
/area/sulaco/marine)
+"fUd" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"fUZ" = (
/obj/machinery/power/monitor,
/obj/structure/cable,
@@ -12948,6 +13455,7 @@
/area/sulaco/maintenance/lower_maint)
"fXb" = (
/obj/machinery/status_display/ai,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/gray,
/area/sulaco/cafeteria)
"fXi" = (
@@ -13077,6 +13585,10 @@
},
/turf/open/floor/prison,
/area/sulaco/cargo/office)
+"gfw" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"gfH" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
@@ -13163,6 +13675,12 @@
/obj/structure/flora/pottedplant,
/turf/open/floor/tile/hydro,
/area/sulaco/hydro)
+"giU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/mainship/living/basketball)
"gje" = (
/turf/open/floor/prison/plate,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
@@ -13288,6 +13806,9 @@
/obj/machinery/power/apc/mainship{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/surgery_one)
"gsz" = (
@@ -13343,6 +13864,9 @@
/area/sulaco/telecomms/office)
"gxf" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/closed/wall/mainship/gray,
/area/sulaco/marine)
"gyj" = (
@@ -13404,6 +13928,10 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating/plating_catwalk/prison,
/area/sulaco/hallway/lower_foreship)
+"gCS" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/gray,
+/area/mainship/living/basketball)
"gCU" = (
/obj/effect/ai_node,
/turf/open/floor/tile/dark2,
@@ -13451,6 +13979,9 @@
/obj/structure/sink{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -13586,6 +14117,12 @@
/obj/machinery/light/mainship,
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"gRH" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/open/floor/prison/bright_clean,
+/area/sulaco/hangar)
"gRI" = (
/obj/machinery/atmospherics/pipe/manifold/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -13671,12 +14208,24 @@
},
/turf/open/floor/mainship/ai,
/area/sulaco/command/ai)
+"gTH" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"gUn" = (
/obj/machinery/light/mainship{
dir = 1
},
/obj/structure/table/mainship/nometal,
/obj/item/book/manual/medical_diagnostics_manual,
+/obj/item/prop/mainship/candle{
+ pixel_y = 7
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/cmo)
"gUR" = (
@@ -13705,6 +14254,9 @@
/obj/effect/spawner/random/engineering/tech_supply,
/obj/effect/spawner/random/engineering/tech_supply,
/obj/item/clothing/gloves/insulated,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/bridge/office)
"gWF" = (
@@ -14063,10 +14615,37 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/item/prop/mainship/candle{
+ pixel_x = 1;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 1;
+ pixel_y = -6
+ },
/turf/open/floor/tile/darkgreen/darkgreen2{
dir = 1
},
/area/mainship/living/basketball)
+"hqc" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/cmo)
+"hqp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -10;
+ pixel_y = 9
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"hqE" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -14156,6 +14735,14 @@
/obj/structure/dropship_equipment/electronics/spotlights,
/turf/open/floor/prison,
/area/sulaco/hangar/storage)
+"hyi" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 8
+ },
+/area/sulaco/medbay/west)
"hzl" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -14174,6 +14761,9 @@
/obj/machinery/power/apc/mainship{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -14218,6 +14808,23 @@
/obj/item/roller,
/obj/item/roller,
/obj/item/roller,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -8
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1;
+ pixel_y = 3
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -14225,6 +14832,9 @@
"hCn" = (
/obj/structure/rack,
/obj/item/toy/beach_ball/basketball,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/tile/darkgreen/darkgreen2,
/area/mainship/living/basketball)
"hCu" = (
@@ -14330,6 +14940,15 @@
},
/turf/open/floor/wood,
/area/mainship/living/tankerbunks)
+"hGC" = (
+/obj/structure/window/framed/mainship/white,
+/obj/machinery/door/firedoor/mainship,
+/obj/machinery/door/poddoor/shutters/opened/medbay,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/open/floor/plating/platebotc,
+/area/sulaco/medbay/cmo)
"hGE" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/ai_node,
@@ -14364,6 +14983,29 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
/area/sulaco/hallway/dropshipprep)
+"hJm" = (
+/obj/machinery/door/poddoor/shutters/mainship{
+ dir = 1;
+ id = "or2privacyshutter";
+ name = "\improper Privacy Shutters"
+ },
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 4
+ },
+/area/sulaco/medbay/surgery_two)
+"hJM" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"hKz" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
@@ -14412,6 +15054,11 @@
/obj/effect/ai_node,
/turf/open/floor/prison,
/area/sulaco/engineering/engine_monitoring)
+"hLI" = (
+/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"hMt" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 4
@@ -14430,6 +15077,12 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk/prison,
/area/sulaco/hallway/lower_foreship)
+"hMP" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/firingrange)
"hNu" = (
/obj/machinery/door/poddoor/railing{
dir = 1;
@@ -14483,6 +15136,13 @@
},
/turf/open/floor/mainship/ai,
/area/sulaco/command/ai)
+"hRj" = (
+/obj/effect/turf_decal/warning_stripes/thin,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/mainship/ai,
+/area/sulaco/command/ai)
"hSC" = (
/obj/structure/closet/crate/hydroponics,
/obj/machinery/camera/autoname{
@@ -14649,6 +15309,11 @@
dir = 4
},
/area/sulaco/medbay/west)
+"iax" = (
+/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"iaI" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
@@ -14675,6 +15340,12 @@
dir = 4
},
/area/mainship/living/basketball)
+"icc" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 1
+ },
+/area/sulaco/medbay/west)
"icj" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
@@ -14750,6 +15421,15 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer1{
dir = 4
},
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 2;
+ pixel_y = 12
+ },
+/obj/effect/spawner/random/misc/present,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -9;
+ pixel_y = 5
+ },
/turf/open/floor/prison/darkyellow{
dir = 8
},
@@ -14765,6 +15445,12 @@
/obj/machinery/reagentgrinder,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria/kitchen)
+"ijp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/chemistry)
"ikx" = (
/obj/machinery/computer/mech_builder{
dir = 2
@@ -14791,6 +15477,9 @@
/area/sulaco/hallway/central_hall3)
"ilC" = (
/obj/effect/ai_node,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -14800,6 +15489,12 @@
/obj/structure/ship_ammo/cas/minirocket/illumination,
/turf/open/floor/prison,
/area/sulaco/hangar/cas)
+"ilR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/wood,
+/area/sulaco/medbay/west)
"imd" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
@@ -14812,6 +15507,29 @@
},
/turf/open/floor/prison/whitegreen,
/area/sulaco/research)
+"img" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = -9;
+ pixel_y = 9
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 4;
+ pixel_y = -9
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -8;
+ pixel_y = -4
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 15;
+ pixel_y = 9
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"imB" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -14937,6 +15655,9 @@
/obj/effect/turf_decal/warning_stripes/thin{
dir = 9
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/prison,
/area/sulaco/hallway/lower_main_hall)
"irC" = (
@@ -15015,6 +15736,9 @@
/obj/effect/spawner/random/misc/paperbin,
/obj/item/clipboard,
/obj/item/tool/pen,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -15107,6 +15831,17 @@
dir = 1
},
/area/mainship/shipboard/weapon_room)
+"iDf" = (
+/obj/machinery/door/poddoor/opened/east{
+ dir = 2;
+ id = "gardenblast"
+ },
+/obj/structure/window/framed/mainship/white/toughened/hull,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating/platebotc,
+/area/mainship/living/starboard_garden)
"iDq" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -15202,6 +15937,10 @@
},
/turf/open/floor/plating/warning,
/area/sulaco/command/eva)
+"iIz" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint2)
"iIB" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -15285,6 +16024,9 @@
/obj/machinery/camera/autoname{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay)
"iLs" = (
@@ -15347,6 +16089,12 @@
/obj/effect/landmark/start/job/squadmarine,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
+"iOe" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/mainship/living/basketball)
"iOf" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 10
@@ -15366,6 +16114,9 @@
/area/sulaco/medbay)
"iOD" = (
/obj/machinery/computer/squad_selector,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"iPn" = (
@@ -15377,6 +16128,13 @@
},
/turf/open/floor/wood,
/area/mainship/living/basketball)
+"iPo" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 4
+ },
+/turf/open/floor/prison/bright_clean,
+/area/sulaco/bridge)
"iQM" = (
/obj/machinery/light/mainship{
dir = 1
@@ -15448,6 +16206,7 @@
/obj/effect/landmark/start/job/staffofficer,
/obj/structure/cable,
/obj/machinery/power/apc/mainship,
+/obj/effect/spawner/random_set/christmas_costume,
/turf/open/floor/wood,
/area/sulaco/bridge/quarters)
"iTR" = (
@@ -15487,6 +16246,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating/platebotc,
/area/mainship/living/basketball)
"iWb" = (
@@ -15507,6 +16267,9 @@
"iWJ" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/plushie/nospawnninetyfive,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"iWV" = (
@@ -15557,6 +16320,9 @@
/area/sulaco/hangar/storage)
"iZY" = (
/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/tile/darkgreen/darkgreen2{
dir = 5
},
@@ -15565,10 +16331,19 @@
/obj/structure/disposalpipe/segment/corner{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
/area/sulaco/medbay/west)
+"jax" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"jaQ" = (
/obj/machinery/light/mainship/small{
dir = 1
@@ -15654,6 +16429,12 @@
/obj/structure/disposalpipe/junction,
/turf/open/floor/prison,
/area/sulaco/marine)
+"jfB" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/grass,
+/area/mainship/living/starboard_garden)
"jfN" = (
/obj/machinery/firealarm{
dir = 8
@@ -15919,6 +16700,10 @@
},
/turf/open/floor/prison,
/area/sulaco/cargo)
+"jxA" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/chemistry)
"jxF" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -15965,6 +16750,20 @@
/obj/machinery/light/mainship{
dir = 8
},
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -5;
+ pixel_y = 8
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -5
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 9;
+ pixel_y = 8
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 9
+ },
/turf/open/floor/prison,
/area/sulaco/cargo/office)
"jCy" = (
@@ -16013,6 +16812,15 @@
/obj/structure/closet/firecloset,
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
+"jFK" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/chemistry)
"jFN" = (
/obj/machinery/telecomms/receiver/preset_right,
/turf/open/floor/mainship/tcomms,
@@ -16063,6 +16871,9 @@
"jGG" = (
/obj/machinery/marine_selector/gear/smartgun,
/obj/structure/sign/prop1,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"jHb" = (
@@ -16072,6 +16883,13 @@
},
/turf/open/floor/mainship/tcomms,
/area/sulaco/command/ai)
+"jHD" = (
+/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/prison/whitegreen/corner,
+/area/sulaco/medbay/west)
"jHI" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/manifold/yellow/hidden{
@@ -16082,6 +16900,12 @@
},
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
+"jHP" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/marine)
"jIo" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 1
@@ -16106,6 +16930,7 @@
holo_range = 9;
name = "Basketball Court holopad"
},
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/wood,
/area/mainship/living/basketball)
"jJa" = (
@@ -16160,6 +16985,34 @@
"jMa" = (
/turf/open/floor/prison/darkpurple,
/area/sulaco/briefing)
+"jMo" = (
+/obj/machinery/light/mainship{
+ dir = 8
+ },
+/obj/structure/bed/chair/nometal{
+ dir = 4
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -8;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 9
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 3
+ },
+/turf/open/floor/tile/darkgreen/darkgreen2{
+ dir = 8
+ },
+/area/mainship/living/basketball)
+"jNK" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"jOa" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 10
@@ -16270,6 +17123,15 @@
/obj/machinery/vending/hydroseeds,
/turf/open/floor/tile/hydro,
/area/sulaco/hydro)
+"jUb" = (
+/obj/structure/bed/chair/nometal{
+ dir = 4
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/prison,
+/area/sulaco/hallway/evac)
"jUJ" = (
/obj/machinery/marine_selector/clothes/leader,
/turf/open/floor/prison,
@@ -16280,6 +17142,7 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/prison/blue,
/area/sulaco/briefing)
"jVb" = (
@@ -16343,6 +17206,15 @@
},
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
+"jXd" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"jXo" = (
/turf/closed/wall/mainship/gray/outer,
/area/sulaco/briefing)
@@ -16407,6 +17279,9 @@
"jZP" = (
/obj/structure/table/wood,
/obj/effect/spawner/random/misc/table_lighting,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/tile/chapel{
dir = 8
},
@@ -16649,6 +17524,9 @@
/area/sulaco/hangar)
"kqp" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
/turf/closed/wall/mainship/gray,
/area/sulaco/marine)
"kqQ" = (
@@ -16663,6 +17541,9 @@
dir = 8
},
/obj/effect/spawner/random/engineering/structure/handheld_lighting,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
"krk" = (
@@ -16864,6 +17745,12 @@
},
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint)
+"kFj" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/morgue)
"kGN" = (
/obj/structure/window/reinforced{
dir = 1
@@ -16944,6 +17831,12 @@
/obj/machinery/camera/autoname,
/turf/open/floor/prison,
/area/sulaco/hallway/central_hall)
+"kLH" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"kMg" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -16983,6 +17876,15 @@
/obj/machinery/atmospherics/pipe/manifold/yellow/hidden,
/turf/open/floor/prison,
/area/sulaco/firingrange)
+"kMS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"kNc" = (
/obj/machinery/light/mainship{
dir = 1
@@ -17033,6 +17935,10 @@
/obj/machinery/vending/armor_supply,
/turf/open/floor/prison,
/area/sulaco/marine)
+"kQT" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/maintenance/lower_maint2)
"kRv" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 8
@@ -17092,6 +17998,13 @@
/obj/effect/spawner/random/engineering/cable,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
+"kVo" = (
+/obj/machinery/vending/MarineMed,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"kVT" = (
/obj/machinery/door/poddoor/mainship/umbilical/south{
dir = 2;
@@ -17107,6 +18020,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_north_maint)
+"kXe" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/research)
"kXj" = (
/obj/machinery/camera/autoname{
dir = 1
@@ -17262,6 +18181,13 @@
dir = 8
},
/area/sulaco/hangar/droppod)
+"lfJ" = (
+/obj/machinery/marine_selector/gear/leader,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"lfS" = (
/obj/vehicle/ridden/motorbike,
/obj/machinery/door_control/mainship/req{
@@ -17274,6 +18200,12 @@
},
/turf/open/floor/prison/marked,
/area/sulaco/cargo)
+"lfT" = (
+/obj/effect/spawner/random_set/christmas_costume,
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 4
+ },
+/area/sulaco/medbay/west)
"lgl" = (
/turf/closed/wall/mainship/gray,
/area/shuttle/distress/arrive_2)
@@ -17284,6 +18216,9 @@
/obj/item/reagent_containers/dropper,
/obj/item/stack/sheet/mineral/phoron,
/obj/machinery/reagentgrinder,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -17297,6 +18232,12 @@
/obj/machinery/loadout_vendor,
/turf/open/floor/wood,
/area/sulaco/bridge/office)
+"lkn" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"lkp" = (
/turf/open/floor/prison/red,
/area/mainship/shipboard/weapon_room)
@@ -17398,6 +18339,10 @@
dir = 1
},
/area/sulaco/marine)
+"lrm" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay/west)
"lrT" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/manifold/yellow/hidden{
@@ -17543,6 +18488,9 @@
/obj/machinery/camera/autoname{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/surgery_two)
"lzc" = (
@@ -17663,6 +18611,9 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/obj/structure/disposalpipe/segment,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"lFo" = (
@@ -17678,6 +18629,10 @@
},
/turf/open/floor/prison,
/area/sulaco/cargo)
+"lGo" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint2)
"lGM" = (
/obj/effect/ai_node,
/turf/open/floor/plating/warning{
@@ -17795,6 +18750,12 @@
"lNU" = (
/turf/open/shuttle/escapepod/five,
/area/mainship/command/self_destruct)
+"lOd" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/mainship/living/starboard_garden)
"lOC" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -17819,6 +18780,12 @@
},
/turf/closed/wall/mainship/white/outer,
/area/sulaco/medbay/surgery_one)
+"lQh" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cargo)
"lQv" = (
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/plating,
@@ -18028,6 +18995,9 @@
},
/obj/structure/table/mainship/nometal,
/obj/item/facepaint/green,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cryosleep)
"mdt" = (
@@ -18226,6 +19196,12 @@
},
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_north_maint)
+"mqA" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"mqC" = (
/obj/effect/ai_node,
/turf/open/floor/prison/bright_clean,
@@ -18353,21 +19329,46 @@
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/sulaco/hallway/evac)
+"myN" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint3)
"mzl" = (
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/adv,
/obj/item/reagent_containers/spray/surgery,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
/area/sulaco/medbay/surgery_one)
+"mzI" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/mainship/living/starboard_garden)
"mzT" = (
/turf/closed/wall/mainship/white/outer,
/area/space)
"mAk" = (
/obj/machinery/marine_selector/clothes,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
+"mAu" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"mBj" = (
/obj/structure/table/reinforced,
/obj/item/book/manual/supermatter_engine,
@@ -18499,6 +19500,7 @@
/area/sulaco/firingrange)
"mFa" = (
/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/gray,
/area/mainship/living/basketball)
"mFc" = (
@@ -18550,6 +19552,15 @@
dir = 1
},
/area/sulaco/medbay)
+"mJx" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"mKk" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
@@ -18587,6 +19598,9 @@
/obj/machinery/camera/autoname{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/surgery_one)
"mNA" = (
@@ -18607,6 +19621,9 @@
/obj/structure/cable,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison/red,
/area/sulaco/marine)
"mON" = (
@@ -18632,6 +19649,16 @@
/obj/item/reagent_containers/food/snacks/flour,
/turf/open/floor/freezer,
/area/sulaco/cafeteria/kitchen)
+"mPg" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 9;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/prison/red,
+/area/sulaco/hallway/central_hall3)
"mPO" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/light/mainship{
@@ -18671,10 +19698,20 @@
},
/obj/item/clothing/head/hardhat/dblue,
/obj/effect/decal/cleanable/cobweb,
+/obj/effect/spawner/random_set/christmas_costume,
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint2)
+"mRG" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint3)
"mTu" = (
/obj/structure/sign/prop1,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship/gray,
/area/sulaco/maintenance/lower_maint2)
"mTN" = (
@@ -18753,6 +19790,9 @@
/obj/machinery/camera/autoname{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"mZj" = (
@@ -18799,6 +19839,9 @@
desc = "As the legendary US Army chaplain once said, 'There are no Athiests in fancy offices'.";
name = "Holy Bible"
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
/turf/open/floor/tile/chapel,
/area/sulaco/marine/chapel)
"nbJ" = (
@@ -18928,6 +19971,12 @@
/obj/effect/spawner/random/misc/structure/supplycrate,
/turf/open/floor/prison/plate,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
+"nmQ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/prison/green/full,
+/area/sulaco/marine)
"nnz" = (
/obj/machinery/door/poddoor/railing{
dir = 1;
@@ -19112,6 +20161,12 @@
/obj/item/reagent_containers/dropper,
/obj/item/stack/sheet/mineral/phoron,
/obj/item/reagent_containers/glass/beaker/large,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -19241,6 +20296,12 @@
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/turf/open/floor/prison,
/area/sulaco/hallway/evac)
+"nIe" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint2)
"nIK" = (
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/plating/mainship,
@@ -19415,6 +20476,10 @@
/obj/machinery/cic_maptable,
/turf/open/floor/prison,
/area/sulaco/cargo)
+"nQB" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"nSs" = (
/obj/machinery/light/mainship{
dir = 8
@@ -19531,6 +20596,18 @@
"nWB" = (
/turf/closed/wall/mainship/gray/outer,
/area/sulaco/cafeteria)
+"nXt" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
+"nYf" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"nZF" = (
/obj/machinery/door/poddoor/mainship/umbilical/south{
id = "prepblasteast";
@@ -19573,6 +20650,9 @@
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
"oct" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/tile/darkgreen/darkgreen2{
dir = 10
},
@@ -19641,6 +20721,15 @@
/obj/machinery/vending/nanomed,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria/kitchen)
+"oiK" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"oiN" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -19872,6 +20961,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"oxw" = (
@@ -19920,6 +21012,12 @@
},
/turf/open/floor/prison,
/area/sulaco/hallway/lower_foreship)
+"oAL" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/prison/green/full,
+/area/sulaco/marine)
"oBa" = (
/obj/machinery/door/poddoor/mainship/ai/exterior{
dir = 1
@@ -20007,6 +21105,7 @@
/area/mainship/living/tankerbunks)
"oEw" = (
/obj/structure/window/framed/mainship/gray/toughened,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/prison,
/area/sulaco/cafeteria)
"oEH" = (
@@ -20106,6 +21205,9 @@
/obj/structure/table/reinforced,
/obj/item/storage/firstaid/adv,
/obj/item/reagent_containers/spray/surgery,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -20186,6 +21288,9 @@
dir = 1
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/grass,
/area/mainship/living/starboard_garden)
"oOw" = (
@@ -20311,6 +21416,9 @@
/area/sulaco/firingrange)
"oXn" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -20337,6 +21445,12 @@
"oYE" = (
/turf/closed/wall/mainship/gray/outer,
/area/sulaco/disposal)
+"pbh" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/hallway/evac)
"pbw" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 4
@@ -20366,12 +21480,19 @@
/obj/machinery/status_display{
pixel_y = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship/white,
/area/sulaco/medbay)
"pdB" = (
/obj/machinery/bot/cleanbot,
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint3)
+"pdP" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"pdS" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 10
@@ -20431,6 +21552,23 @@
},
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint3)
+"pgq" = (
+/obj/machinery/door/poddoor/shutters/mainship{
+ dir = 1;
+ id = "or1privacyshutter";
+ name = "\improper Privacy Shutters"
+ },
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 4
+ },
+/area/sulaco/medbay/surgery_one)
"pgQ" = (
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
dir = 4
@@ -20495,6 +21633,12 @@
"pjA" = (
/obj/structure/table/mainship/nometal,
/obj/item/reagent_containers/food/snacks/protein_pack,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
"pjV" = (
@@ -20665,6 +21809,19 @@
/obj/machinery/computer/squad_manager,
/turf/open/floor/prison,
/area/sulaco/marine)
+"pst" = (
+/obj/machinery/marine_selector/gear/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
+"ptd" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/maintenance/lower_maint2)
"ptg" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison/plate,
@@ -20695,6 +21852,9 @@
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/engineering/toolbox,
/obj/item/lightreplacer,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -20887,6 +22047,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/sulaco/briefing)
"pFh" = (
@@ -21008,6 +22169,12 @@
/obj/effect/spawner/random/medical/beaker/bluespace,
/turf/open/floor/prison/whitegreen/full,
/area/sulaco/research)
+"pMq" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 9
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/firingrange)
"pMx" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
@@ -21058,6 +22225,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"pQL" = (
@@ -21185,6 +22355,12 @@
dir = 8
},
/area/mainship/shipboard/weapon_room)
+"qck" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/prison/whitegreen/corner,
+/area/sulaco/medbay)
"qct" = (
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/plating,
@@ -21221,6 +22397,13 @@
/obj/structure/cable,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
+"qhV" = (
+/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/prison/sterilewhite,
+/area/sulaco/cafeteria/kitchen)
"qiK" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
@@ -21240,6 +22423,9 @@
/obj/structure/table/mainship/nometal,
/obj/item/defibrillator,
/obj/item/defibrillator,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -21269,6 +22455,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -21296,6 +22483,12 @@
dir = 1
},
/area/sulaco/marine/chapel)
+"qnE" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"qnI" = (
/obj/structure/cable,
/turf/open/floor/prison/whitegreen/corner{
@@ -21525,6 +22718,13 @@
"qDO" = (
/turf/open/floor/mainship_hull/gray/dir,
/area/space)
+"qEw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"qES" = (
/obj/effect/turf_decal/warning_stripes/thick/corner{
dir = 4
@@ -21604,6 +22804,12 @@
},
/turf/open/floor/prison,
/area/sulaco/hallway/lower_foreship)
+"qJr" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/medbay/hangar)
"qJH" = (
/obj/machinery/photocopier,
/turf/open/floor/prison/whitegreen/corner{
@@ -21733,6 +22939,9 @@
/area/sulaco/cryosleep)
"qPU" = (
/obj/structure/closet/secure_closet/chemical,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -21904,6 +23113,15 @@
/obj/machinery/computer/camera_advanced/overwatch/req,
/turf/open/floor/prison/plate,
/area/sulaco/cargo)
+"rfC" = (
+/obj/structure/bed/chair/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = -13
+ },
+/turf/open/floor/prison/darkyellow{
+ dir = 8
+ },
+/area/sulaco/briefing)
"rfJ" = (
/obj/machinery/light/mainship{
dir = 8
@@ -22056,6 +23274,12 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/prison,
/area/sulaco/marine)
+"rkZ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"rlf" = (
/obj/machinery/light/mainship{
dir = 1
@@ -22221,6 +23445,13 @@
/obj/structure/cable,
/turf/open/floor/prison/red,
/area/sulaco/marine)
+"rtN" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/chemistry)
"rtO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -22256,6 +23487,10 @@
/obj/structure/window/framed/mainship/gray/toughened/hull,
/turf/open/floor/plating/platebotc,
/area/sulaco/command/eva)
+"rwg" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"rwk" = (
/obj/machinery/self_destruct/rod,
/turf/open/floor/mainship/tcomms,
@@ -22266,6 +23501,12 @@
},
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar/cas)
+"rwP" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/prison,
+/area/sulaco/hallway/central_hall2)
"rxh" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -22311,6 +23552,12 @@
"rzq" = (
/turf/open/floor/prison,
/area/sulaco/engineering/atmos)
+"rzD" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = -5
+ },
+/turf/open/floor/prison/bright_clean,
+/area/sulaco/hangar)
"rAt" = (
/obj/machinery/door/poddoor/shutters/mainship/selfdestruct{
dir = 8
@@ -22396,6 +23643,9 @@
"rGz" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/burger,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
"rGD" = (
@@ -22440,6 +23690,17 @@
/obj/machinery/light/mainship,
/obj/item/whistle,
/obj/item/tool/stamp/denied,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = -4
+ },
/turf/open/floor/prison,
/area/sulaco/cargo/office)
"rIx" = (
@@ -22468,6 +23729,12 @@
},
/turf/open/floor/prison/bright_clean,
/area/sulaco/bridge)
+"rLA" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/storage)
"rLJ" = (
/obj/machinery/air_alarm{
dir = 4
@@ -22614,6 +23881,12 @@
/obj/effect/ai_node,
/turf/open/floor/plating,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
+"rVT" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay)
"rWc" = (
/obj/effect/ai_node,
/turf/open/floor/prison/sterilewhite,
@@ -22648,6 +23921,17 @@
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/wood,
/area/sulaco/bridge/office)
+"rXR" = (
+/obj/machinery/door/poddoor/opened/east{
+ dir = 2;
+ id = "gardenblast"
+ },
+/obj/structure/window/framed/mainship/white/toughened/hull,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/plating/platebotc,
+/area/mainship/living/starboard_garden)
"rYR" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -22699,6 +23983,12 @@
/turf/open/floor/prison,
/area/sulaco/hallway/central_hall3)
"sbO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/chemistry)
"sbP" = (
@@ -22895,6 +24185,12 @@
},
/turf/open/floor/prison,
/area/sulaco/hallway/evac)
+"siu" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay)
"sjB" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 5
@@ -22974,6 +24270,12 @@
},
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"smV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/mainship/living/starboard_garden)
"sng" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment{
@@ -23036,6 +24338,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/cult,
/area/sulaco/morgue)
+"srN" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/cmo)
"srT" = (
/obj/structure/bed/chair/nometal{
dir = 1
@@ -23155,6 +24463,12 @@
/obj/machinery/firealarm,
/turf/open/floor/prison,
/area/sulaco/engineering/lower_engineering)
+"sxA" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"syi" = (
/obj/effect/ai_node,
/turf/open/floor/prison/plate,
@@ -23248,6 +24562,9 @@
/area/mainship/living/tankerbunks)
"sDU" = (
/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -23256,6 +24573,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
/area/sulaco/firingrange)
+"sEw" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/cmo)
"sFv" = (
/obj/machinery/camera/autoname{
dir = 4
@@ -23274,6 +24597,12 @@
/obj/structure/cable,
/turf/open/floor/mainship/ai,
/area/sulaco/command/ai)
+"sHX" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"sId" = (
/obj/structure/table/mainship/nometal,
/obj/item/tool/hand_labeler,
@@ -23343,6 +24672,9 @@
pixel_x = 5;
pixel_y = 9
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/bright_clean,
/area/sulaco/hydro)
"sKM" = (
@@ -23451,6 +24783,9 @@
/obj/machinery/cryopod/right{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/west)
"sPg" = (
@@ -23490,6 +24825,9 @@
/area/sulaco/marine/chapel)
"sQd" = (
/obj/machinery/loadout_vendor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"sQE" = (
@@ -23562,6 +24900,9 @@
},
/obj/item/storage/firstaid/adv,
/obj/machinery/camera/autoname,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -23619,6 +24960,9 @@
dir = 4
},
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating/platebotc,
/area/sulaco/marine)
"sZZ" = (
@@ -23646,6 +24990,17 @@
"tbJ" = (
/turf/closed/wall/mainship/gray,
/area/sulaco/bridge)
+"tbW" = (
+/obj/structure/bed/chair/nometal,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 4;
+ pixel_y = 6
+ },
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/prison/darkpurple{
+ dir = 4
+ },
+/area/sulaco/briefing)
"tcf" = (
/obj/machinery/camera/autoname{
dir = 8
@@ -23727,6 +25082,12 @@
},
/turf/open/floor/prison,
/area/mainship/living/pilotbunks)
+"tgO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"tgP" = (
/obj/structure/ob_ammo/ob_fuel,
/obj/structure/ob_ammo/ob_fuel,
@@ -23792,6 +25153,9 @@
"tkc" = (
/obj/structure/cable,
/obj/machinery/loadout_vendor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -23853,6 +25217,9 @@
"tny" = (
/obj/machinery/light/mainship,
/obj/effect/decal/cleanable/dirt,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/briefing)
"toH" = (
@@ -23872,6 +25239,14 @@
},
/turf/open/floor/wood,
/area/mainship/living/basketball)
+"tpa" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/prison/red{
+ dir = 1
+ },
+/area/sulaco/hallway/central_hall)
"tpu" = (
/obj/machinery/light/mainship{
dir = 8
@@ -23921,6 +25296,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/sulaco/briefing)
"ttZ" = (
@@ -23997,6 +25373,9 @@
/obj/machinery/light/mainship,
/obj/structure/rack,
/obj/item/toy/beach_ball/basketball,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/tile/darkgreen/darkgreen2,
/area/mainship/living/basketball)
"txF" = (
@@ -24081,6 +25460,13 @@
"tCB" = (
/turf/closed/wall/mainship/gray,
/area/sulaco/bar)
+"tCT" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"tDJ" = (
/obj/effect/turf_decal/warning_stripes/thin,
/turf/closed/wall/mainship/gray/outer,
@@ -24295,6 +25681,12 @@
/area/sulaco/liaison/quarters)
"tRg" = (
/obj/structure/table/mainship/nometal,
+/obj/item/prop/mainship/candle{
+ pixel_y = 6
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = -9
+ },
/turf/open/floor/prison,
/area/sulaco/bar)
"tRW" = (
@@ -24394,6 +25786,9 @@
/area/sulaco/hangar/storage)
"tXi" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship/gray,
/area/sulaco/briefing)
"tXW" = (
@@ -24449,6 +25844,12 @@
},
/turf/open/floor/plating/plating_catwalk/prison,
/area/sulaco/hallway/central_hall)
+"udS" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/briefing)
"ueb" = (
/turf/closed/wall/mainship/white/outer,
/area/sulaco/hallway/lower_main_hall)
@@ -24578,6 +25979,25 @@
},
/turf/open/floor/plating,
/area/sulaco/hangar)
+"uiX" = (
+/obj/structure/window/framed/mainship/gray/toughened,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
+"ujp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"ujq" = (
/obj/machinery/light/mainship{
dir = 1
@@ -24664,6 +26084,14 @@
"uor" = (
/turf/closed/wall/mainship/gray,
/area/sulaco/engineering/lower_engineering)
+"uot" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 4
+ },
+/area/sulaco/medbay/west)
"uoG" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 5
@@ -24698,8 +26126,20 @@
/obj/machinery/camera/autoname{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/chemistry)
+"upI" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"utx" = (
/obj/structure/bed/chair/sofa/corner{
dir = 4
@@ -24871,6 +26311,12 @@
/obj/machinery/atmospherics/pipe/simple/yellow/hidden,
/turf/open/floor/prison/darkyellow/corner,
/area/sulaco/engineering)
+"uDf" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/storage)
"uDh" = (
/obj/structure/table/mainship/nometal,
/obj/item/stack/sheet/cardboard{
@@ -24924,6 +26370,12 @@
},
/turf/open/floor/plating,
/area/sulaco/hangar)
+"uGJ" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/marine)
"uHR" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 1
@@ -24989,8 +26441,22 @@
/turf/open/floor/prison,
/area/sulaco/hallway/lower_main_hall)
"uMe" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/wall/mainship/gray/outer,
/area/mainship/living/basketball)
+"uMR" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 8
+ },
+/area/sulaco/medbay/west)
"uMT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -25016,6 +26482,12 @@
/obj/machinery/tank_part_fabricator,
/turf/open/floor/mainship/hexagon,
/area/mainship/living/tankerbunks)
+"uNC" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"uNQ" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/reagent_dispensers/fueltank,
@@ -25056,8 +26528,18 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating/platebotc,
/area/sulaco/medbay/chemistry)
+"uPL" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"uQi" = (
/obj/structure/window/reinforced{
dir = 4
@@ -25089,6 +26571,9 @@
"uSw" = (
/obj/machinery/light/mainship,
/obj/machinery/marine_selector/clothes,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"uTr" = (
@@ -25304,6 +26789,9 @@
"vhq" = (
/obj/machinery/loadout_vendor,
/obj/machinery/loadout_vendor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"vhM" = (
@@ -25321,6 +26809,9 @@
/obj/structure/ob_ammo/warhead/incendiary,
/obj/structure/ob_ammo/warhead/incendiary,
/obj/machinery/camera/autoname,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison/red{
dir = 1
},
@@ -25354,6 +26845,7 @@
pixel_x = -4;
pixel_y = 1
},
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria)
"vkI" = (
@@ -25403,8 +26895,18 @@
/area/sulaco/firingrange)
"vnh" = (
/obj/machinery/marine_selector/clothes/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
+"vnO" = (
+/obj/structure/lattice,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 6
+ },
+/turf/open/space/basic,
+/area/space)
"vnU" = (
/turf/open/floor/tile/chapel{
dir = 1
@@ -25417,6 +26919,13 @@
"vov" = (
/turf/closed/wall/mainship/gray,
/area/sulaco/mechpilotquarters)
+"voK" = (
+/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/plating/platebotc,
+/area/sulaco/medbay)
"vpx" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
dir = 9
@@ -25447,6 +26956,9 @@
/obj/machinery/power/apc/mainship{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner,
/area/sulaco/medbay/surgery_two)
"vtv" = (
@@ -25547,6 +27059,13 @@
/obj/effect/ai_node,
/turf/open/floor/tile/dark2,
/area/mainship/living/basketball)
+"vxs" = (
+/obj/machinery/marine_selector/clothes/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"vxZ" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 1
@@ -25624,6 +27143,9 @@
pixel_x = 2;
pixel_y = -2
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/security)
"vAy" = (
@@ -25642,6 +27164,22 @@
/obj/machinery/grill/unwrenched,
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint2)
+"vBf" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/prison/bright_clean,
+/area/sulaco/hangar/cas)
+"vBm" = (
+/obj/structure/bed/chair/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/prison/darkyellow{
+ dir = 4
+ },
+/area/sulaco/briefing)
"vBD" = (
/obj/machinery/air_alarm{
dir = 1
@@ -25650,6 +27188,9 @@
/obj/machinery/recharger,
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
@@ -25741,6 +27282,7 @@
pixel_x = -6;
pixel_y = 8
},
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/prison,
/area/sulaco/cargo/office)
"vIJ" = (
@@ -25749,6 +27291,12 @@
"vIO" = (
/turf/open/floor/tile/dark2,
/area/mainship/living/basketball)
+"vJE" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray/outer,
+/area/sulaco/briefing)
"vKO" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -25785,6 +27333,13 @@
/obj/structure/sign/prop3,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria/kitchen)
+"vMZ" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"vNm" = (
/obj/effect/turf_decal/warning_stripes/thin,
/obj/structure/cable,
@@ -25957,6 +27512,12 @@
dir = 5
},
/area/sulaco/research)
+"vTB" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/morgue)
"vTH" = (
/obj/machinery/camera/autoname,
/turf/open/floor/tile/hydro,
@@ -26066,6 +27627,9 @@
"wca" = (
/obj/machinery/light/mainship,
/obj/machinery/vending/uniform_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"wco" = (
@@ -26229,6 +27793,12 @@
/obj/effect/landmark/start/job/ai,
/turf/open/floor/mainship/tcomms,
/area/sulaco/command/ai)
+"wnU" = (
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
+/turf/open/floor/prison/green/full,
+/area/sulaco/marine)
"woe" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
@@ -26277,6 +27847,16 @@
/obj/machinery/vending/weapon,
/turf/open/floor/prison/bright_clean,
/area/sulaco/hangar)
+"wqV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 5;
+ pixel_y = -6
+ },
+/turf/open/floor/prison,
+/area/sulaco/briefing)
"wrd" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 1
@@ -26308,6 +27888,15 @@
},
/turf/open/floor/prison/bright_clean,
/area/mainship/command/self_destruct)
+"wve" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"wwM" = (
/obj/machinery/light/mainship,
/turf/open/floor/wood,
@@ -26448,6 +28037,12 @@
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/turf/open/floor/prison/whitegreen/full,
/area/sulaco/research)
+"wHp" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/mainship/living/starboard_garden)
"wHL" = (
/obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1,
/turf/open/floor/prison,
@@ -26478,6 +28073,10 @@
/area/sulaco/cafeteria/kitchen)
"wJL" = (
/obj/structure/sign/electricshock,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship/gray,
/area/sulaco/marine)
"wKj" = (
@@ -26542,6 +28141,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/prison,
/area/sulaco/briefing)
+"wOS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white/outer,
+/area/sulaco/medbay/storage)
"wPX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -26595,6 +28200,13 @@
},
/turf/open/floor/prison,
/area/sulaco/maintenance/upperdeck_AIcore_maint)
+"wTm" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white,
+/area/sulaco/medbay/west)
"wTo" = (
/turf/open/floor/prison/arrow/clean,
/area/mainship/command/self_destruct)
@@ -26633,10 +28245,19 @@
/area/sulaco/hallway/central_hall)
"wUm" = (
/obj/machinery/computer/sleep_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 1
},
/area/sulaco/medbay)
+"wUw" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/gray,
+/area/sulaco/cafeteria)
"wUY" = (
/obj/structure/table/reinforced,
/obj/structure/window/reinforced{
@@ -26654,6 +28275,22 @@
},
/turf/open/floor/prison,
/area/sulaco/briefing)
+"wVi" = (
+/obj/structure/closet/secure_closet/medical3,
+/obj/item/storage/surgical_tray,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/prison/whitegreen/corner{
+ dir = 4
+ },
+/area/sulaco/medbay/west)
+"wVq" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/gray,
+/area/mainship/living/basketball)
"wVI" = (
/obj/machinery/air_alarm{
dir = 4
@@ -26673,6 +28310,13 @@
},
/turf/open/floor/prison,
/area/sulaco/firingrange)
+"wWh" = (
+/obj/structure/window/framed/mainship/gray/toughened,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"wWE" = (
/obj/effect/landmark/start/job/shiptech,
/obj/structure/cable,
@@ -26725,8 +28369,13 @@
"xab" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/food_or_drink/burger,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria/kitchen)
+"xaF" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/sulaco/marine)
"xba" = (
/obj/machinery/holopad{
active_power_usage = 130;
@@ -26803,6 +28452,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
/area/sulaco/maintenance/lower_maint)
+"xfe" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/prison,
+/area/sulaco/marine)
"xfM" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/yellow/hidden{
@@ -26976,6 +28631,9 @@
dir = 1
},
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"xur" = (
@@ -27090,6 +28748,9 @@
/obj/machinery/light/mainship{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
@@ -27173,6 +28834,9 @@
"xHY" = (
/obj/machinery/light/mainship,
/obj/machinery/loadout_vendor,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"xIb" = (
@@ -27301,6 +28965,9 @@
pixel_y = 7
},
/obj/item/tool/pen,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 7
+ },
/turf/open/floor/prison/bright_clean,
/area/sulaco/bridge)
"xOu" = (
@@ -27398,12 +29065,18 @@
/area/sulaco/cargo)
"xWb" = (
/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 4
},
/area/sulaco/medbay/chemistry)
"xWe" = (
/obj/machinery/chem_dispenser,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
@@ -27414,6 +29087,10 @@
},
/turf/open/floor/prison,
/area/sulaco/hallway/lower_main_hall)
+"xWw" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/gray,
+/area/mainship/living/basketball)
"xWz" = (
/turf/open/floor/prison,
/area/sulaco/firingrange)
@@ -27432,6 +29109,12 @@
/area/sulaco/maintenance/upperdeck_AIcore_maint)
"xXD" = (
/obj/structure/table/mainship/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"xXJ" = (
@@ -27485,6 +29168,7 @@
"xZq" = (
/obj/structure/table/mainship/nometal,
/obj/item/reagent_containers/food/snacks/cookie,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/prison/sterilewhite,
/area/sulaco/cafeteria/kitchen)
"yai" = (
@@ -27635,6 +29319,12 @@
/area/sulaco/medbay/cmo)
"yiU" = (
/obj/machinery/vending/MarineMed,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/open/floor/prison,
/area/sulaco/marine)
"yiY" = (
@@ -43830,10 +45520,10 @@ nVU
aPg
aPg
aPg
-aQh
+iIz
mTu
-aQh
-aQh
+nIe
+ptd
aQh
aQw
wLH
@@ -43853,22 +45543,22 @@ vgl
cts
hFj
cts
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-aDz
-cDU
-cDU
+gCS
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+wVq
+mRG
+bjN
cDU
qzH
fXi
@@ -44086,12 +45776,12 @@ aQh
aQh
aPg
aUt
-aPg
-aLf
+kQT
+jax
uux
xEi
-uux
-aLf
+cVC
+qnE
aQh
aQw
aDm
@@ -44110,10 +45800,10 @@ vgl
aFZ
hlO
xHk
-aDz
+xWw
aFY
gWJ
-eHQ
+jMo
vTl
rLJ
tct
@@ -44126,8 +45816,8 @@ gWJ
eHQ
vTl
oct
-cDU
-cDU
+mRG
+bjN
cDU
fXi
xKi
@@ -44348,7 +46038,7 @@ jRj
xJd
xJd
xJd
-jRj
+vxs
aQh
aQw
aDm
@@ -44600,7 +46290,7 @@ anw
anw
xXL
xXL
-anw
+rwg
amf
xJd
xJd
@@ -44851,13 +46541,13 @@ wrd
aaI
quS
abr
-anw
+sHX
tJw
aKC
cFX
afG
afG
-anw
+rwg
nKD
aLC
aMB
@@ -45114,12 +46804,12 @@ aKD
oRM
oRM
wjT
-aJy
+iax
jRj
xJd
aMF
xJd
-jRj
+vxs
aQh
wLH
aQw
@@ -45368,25 +47058,25 @@ aaH
aJy
lTw
pFh
-oRM
+bzk
oRM
hvO
-anw
-aLf
-eDb
+tCT
+kMS
+uiX
aMS
-aLf
-aLf
-aQh
-aQh
-aQh
-aQh
-aQh
+jXd
+vMZ
+nIe
+nIe
+nIe
+ptd
+lGo
nOn
qzc
mOs
-aQh
-aQh
+nIe
+ptd
aQh
aQh
aQw
@@ -45395,7 +47085,7 @@ aQh
vOr
rpe
vOr
-aDz
+xWw
yhY
xYK
php
@@ -45637,8 +47327,8 @@ kqp
sRW
gXD
wAF
-sRW
-aLf
+pst
+jax
knr
xJd
rtA
@@ -46142,17 +47832,17 @@ aKD
adZ
adZ
tfx
-anw
+rwg
xPc
tsP
xJd
fJF
-eDb
+wWh
oMd
xJd
xJd
dTH
-aLf
+oiK
hlP
qzc
rtA
@@ -46404,12 +48094,12 @@ waM
aLJ
xJd
ayl
-aLf
+xaF
pdX
vVz
rOy
jGG
-aLf
+xaF
oHm
aeW
cSb
@@ -46423,24 +48113,24 @@ vgl
bvV
dIn
jLl
-aDz
-aDz
-aDz
-aDz
-aDz
+iOe
+giU
+giU
+giU
+giU
tjS
dMX
tOy
-aDz
+giU
dMX
dMX
-aDz
+giU
uMe
uMe
-xKi
+cGN
aJS
-cDU
-cDU
+fRR
+myN
cDU
fXi
xKi
@@ -46656,22 +48346,22 @@ aKD
afG
afG
afG
-anw
+rwg
xPc
aLM
qzc
dls
-aLf
-aLf
-aLf
-aLf
-aLf
-aLf
+ujp
+kMS
+kMS
+kMS
+wve
+jax
vax
qzc
wYX
aLk
-htm
+ezQ
uRT
vTH
qXN
@@ -46928,7 +48618,7 @@ dmj
mmI
oJO
aLk
-htm
+ezQ
euR
qXN
qXN
@@ -47427,7 +49117,7 @@ aKD
adZ
adZ
adZ
-anw
+rwg
aLo
aMd
xJd
@@ -47442,7 +49132,7 @@ dmj
xJd
wYX
aLk
-htm
+ezQ
euR
fRw
qXN
@@ -47684,17 +49374,17 @@ aKD
rGz
wMI
mnO
-anw
-aLf
+tCT
+gTH
aMo
eDb
-aLf
+fhf
wJL
-aLf
+gTH
wyp
-eDb
-aLf
-aLf
+fbJ
+fhf
+uNC
fSQ
xJd
wYX
@@ -47941,17 +49631,17 @@ aKD
pjA
fEv
uwG
-aJy
+iax
jUJ
aMp
ppY
-cAK
-kqp
+lfJ
+hLI
kNc
gRR
qzc
cKq
-aLf
+xaF
kQE
xJd
avL
@@ -48203,12 +49893,12 @@ vVz
eYn
aNX
wca
-aLf
+xaF
jRd
wMn
mgW
vnh
-aLf
+xaF
ocS
xJd
avL
@@ -48352,7 +50042,7 @@ llL
aBR
apu
asd
-asd
+iPo
asd
ats
ava
@@ -48455,17 +50145,17 @@ aKD
aKX
oRM
buz
-anw
+rwg
cAK
npC
qMk
-jUJ
-aLf
+eeh
+xaF
lJH
lzl
aNX
-lJH
-aLf
+fMp
+xaF
xbz
xJd
avL
@@ -48712,16 +50402,16 @@ aKL
oaj
oaj
anw
-anw
-aLf
+wUw
+kMS
aMu
-eDb
-aLf
-aLf
-aLf
+uiX
+wve
+ujp
+kMS
sAb
-eDb
-aLf
+uiX
+wve
gxf
xbz
xJd
@@ -48746,7 +50436,7 @@ ppl
aKN
ifF
oiG
-aMg
+qhV
xab
aMc
vMY
@@ -48961,7 +50651,7 @@ ami
uFe
aaY
aHY
-aaY
+eUY
aaY
abQ
oRM
@@ -48983,7 +50673,7 @@ yiY
bgW
aLF
nps
-aLk
+wnU
yiU
aLf
wKB
@@ -49241,7 +50931,7 @@ arT
swn
ngU
aLk
-yiU
+kVo
aLf
xHk
vFL
@@ -49740,17 +51430,17 @@ fKJ
aec
ccC
kQa
-anw
+rkZ
jQe
nWx
aYV
hdZ
-xJd
-aLk
-aLk
-aLk
+dGg
+nmQ
aLk
aLk
+oAL
+nmQ
lqm
tsP
xJd
@@ -49997,22 +51687,22 @@ lpY
lpY
lpY
lpY
-lpY
-aLf
-aLf
-aLf
+lQh
+mqA
+mqA
+mqA
izI
-aLf
-aLf
+hJM
+xaF
htm
gdR
-htm
-aLf
+ezQ
+xaF
lIp
vRu
qzc
bbP
-xJd
+xfe
aLf
xHk
oSf
@@ -50260,16 +51950,16 @@ bhK
jCo
gLJ
buK
-aLf
-aLf
-aLf
-aLf
-aLf
+dXx
+mqA
+mqA
+hJM
+dXx
nfk
sZM
gAL
-euR
-euR
+jHP
+uGJ
euR
vgl
vgl
@@ -50782,15 +52472,15 @@ hCz
pIP
xKR
pIP
-aam
-rDx
+gfw
+wVi
hzC
xAq
aca
-vHb
+lrm
fKu
-ntk
-aam
+ilR
+nXt
pXn
mzT
mzT
@@ -51039,19 +52729,19 @@ uyf
hbH
xKR
pIP
-aam
+bWY
aar
abo
abL
fjF
-aam
+bWY
djp
ntk
acG
-abR
+icc
cXw
sDU
-cXw
+jHD
vHb
mDu
mDu
@@ -51292,23 +52982,23 @@ dhz
alk
aqh
iGf
-hCz
+ebC
pIP
xKR
dAv
-aam
+bWY
rDx
abp
aeC
cHd
-aam
+bWY
jGq
ntk
cRY
-iNQ
-fBF
-iNQ
+uot
fBF
+lfT
+hyi
vHb
mDu
qDO
@@ -51553,12 +53243,12 @@ aqm
cyq
jPq
puw
-aam
+bWY
iNQ
qnI
iNQ
qPU
-aam
+bWY
duH
lQA
aam
@@ -51810,7 +53500,7 @@ hFf
xWt
xKR
pIP
-aam
+bWY
aaP
aeu
aeD
@@ -51818,11 +53508,11 @@ lEL
eDl
jpD
sdk
-aam
-aam
-aam
-aam
-aam
+upI
+wTm
+cnl
+cnl
+uPL
vHb
mDu
qDO
@@ -52067,12 +53757,12 @@ hFf
xWt
xKR
kXj
-aam
+bWY
sWd
clt
acg
gGK
-aam
+bWY
wpJ
pDT
aZQ
@@ -52324,12 +54014,12 @@ hFf
xWt
tkS
pIP
-aam
+bWY
kvF
aam
abN
-aam
-aam
+tgO
+bWY
iQM
wCQ
jad
@@ -52581,7 +54271,7 @@ two
aTg
aVH
pIP
-aam
+jNK
abb
abC
hZZ
@@ -52838,7 +54528,7 @@ bkk
xWt
xKR
pIP
-aan
+jxA
hoc
aan
opr
@@ -52847,7 +54537,7 @@ aan
fGe
xKv
bVT
-acI
+hJm
acY
adq
oIW
@@ -53095,19 +54785,19 @@ hFf
fOe
leD
dAv
-aan
+faS
nzD
upr
ueo
sbO
-aan
+ijp
vRI
qAW
oxv
-aam
-aam
-aam
-aam
+mAu
+cnl
+cnl
+uPL
vHb
mDu
qDO
@@ -53232,7 +54922,7 @@ aVc
aRh
aFW
aOb
-aRh
+kXe
kSg
jGA
arc
@@ -53357,10 +55047,10 @@ xWb
egL
acf
xWe
-aan
+jxA
acj
onD
-bVT
+uMR
acP
acZ
adr
@@ -53614,7 +55304,7 @@ lgz
abJ
aci
abk
-aan
+jxA
acu
rlh
wSa
@@ -53871,11 +55561,11 @@ aas
aaE
abi
abl
-aan
+jxA
bGH
onD
-bVT
-acP
+uMR
+pgq
adb
adQ
abM
@@ -54003,7 +55693,7 @@ jsB
tao
tus
aOW
-aRh
+kXe
sTR
dez
arg
@@ -54023,7 +55713,7 @@ eMk
aAI
lae
akN
-sPn
+hRj
hWu
teI
wnN
@@ -54123,12 +55813,12 @@ xMC
pIP
tvS
pIP
-aan
+jxA
aav
aax
xou
abm
-aan
+jxA
vRI
scG
pQl
@@ -54269,7 +55959,7 @@ niS
avr
avr
avr
-awI
+tpa
rXJ
sPg
aCA
@@ -54380,19 +56070,19 @@ sbT
aWx
gjE
aWx
-aan
+rtN
aaM
aaX
kzw
-aan
-aan
-aaJ
+jFK
+rtN
+fAY
adl
hHK
-aaJ
-aaJ
-aaJ
-jXT
+mJx
+fAY
+cli
+eIT
jXT
mDu
qDO
@@ -54642,7 +56332,7 @@ iOv
ade
lbq
fmX
-aaJ
+fUd
icY
lbq
doY
@@ -55392,7 +57082,7 @@ aPg
aPg
aPg
tyQ
-phs
+hMP
sUe
aMV
okh
@@ -55405,7 +57095,7 @@ tMH
xWz
uiN
erP
-pIP
+ddz
wXV
uXi
aaJ
@@ -55413,7 +57103,7 @@ inK
adf
hNA
oXn
-aaJ
+nYf
adU
odW
adf
@@ -55672,7 +57362,7 @@ oxz
afc
eqh
nBH
-pKP
+bDq
ade
gXI
ade
@@ -55906,7 +57596,7 @@ mDu
mDu
aPg
tyQ
-phs
+pMq
cEV
pBI
xWz
@@ -56420,7 +58110,7 @@ aPg
sBH
tXW
gBU
-phs
+buS
lcd
bfT
emj
@@ -56705,12 +58395,12 @@ ade
fzI
ade
vBD
-jXT
-hjK
-dMC
-dMC
-dMC
-hjK
+blw
+lOd
+rXR
+rXR
+rXR
+wHp
hjK
mDu
qDO
@@ -56962,7 +58652,7 @@ adf
wAz
nok
atx
-jXT
+aNM
rjf
sMe
fXB
@@ -57207,13 +58897,13 @@ omu
pIP
xKR
kXj
-aaJ
-fVo
-fVo
+rVT
+hqc
+hqc
aeK
-aeK
-fVo
-fVo
+hGC
+srN
+sEw
fmW
ade
jhf
@@ -57224,7 +58914,7 @@ nCN
nAl
rPZ
rOn
-sMe
+jfB
dMC
mDu
qDO
@@ -57481,7 +59171,7 @@ sZZ
gJO
uyz
iWb
-sMe
+jfB
dMC
mDu
qDO
@@ -57731,14 +59421,14 @@ agz
fdz
ade
mJk
-ade
+qck
cvw
-fxq
+voK
fhg
uEO
vCQ
ttZ
-sMe
+jfB
dMC
mDu
qDO
@@ -57990,7 +59680,7 @@ uIX
faC
aej
tkc
-jXT
+aNM
aRX
won
fhg
@@ -58119,7 +59809,7 @@ cKA
aov
apJ
ank
-aor
+rwP
asS
nka
avz
@@ -58241,18 +59931,18 @@ aaQ
jtP
aaQ
aaQ
-aaQ
+uDf
afC
-aaQ
-aaQ
-moa
-jXT
-jXT
-hjK
-dMC
-dMC
-dMC
-hjK
+rLA
+rLA
+wOS
+eIT
+siu
+smV
+iDf
+iDf
+iDf
+mzI
hjK
mDu
qDO
@@ -59657,9 +61347,9 @@ nzi
mDu
aYZ
alI
-akW
-akW
-akW
+cxw
+pdP
+pdP
tXi
awl
asT
@@ -59914,16 +61604,16 @@ nzi
mDu
aYZ
agm
-akW
-anr
+nQB
+img
apa
arm
anr
atY
avD
atY
-anr
-akW
+wqV
+udS
akW
azd
lmE
@@ -60171,7 +61861,7 @@ nzi
mDu
aYZ
eEH
-akW
+nQB
fmH
apO
arn
@@ -60180,8 +61870,8 @@ arn
avE
arn
ayN
-anr
-akW
+hqp
+cxw
azZ
jXo
aJm
@@ -60428,7 +62118,7 @@ nzi
mDu
aYZ
drJ
-akW
+nQB
aoA
apP
apP
@@ -60438,7 +62128,7 @@ aro
ghD
ayO
aAb
-akW
+nQB
tny
jXo
mDu
@@ -60541,7 +62231,7 @@ aOd
aPq
aPA
aRd
-jtC
+vBf
jtC
kAz
aWe
@@ -60685,7 +62375,7 @@ mDu
mDu
aYZ
alI
-akW
+nQB
anr
apQ
awb
@@ -60694,9 +62384,9 @@ awb
cVn
awb
ayP
-anr
-akW
-anr
+lkn
+nQB
+lkn
jXo
mDu
mDu
@@ -60951,9 +62641,9 @@ iKv
xPO
anr
anr
-wOA
-akW
-anr
+qEw
+nQB
+lkn
jXo
mDu
qDO
@@ -61199,18 +62889,18 @@ mDu
aYZ
aYZ
pMU
-akW
+nQB
anr
apR
arq
-arq
+vBm
arq
fuV
arq
ayQ
-anr
-akW
-anr
+lkn
+nQB
+lkn
jXo
mDu
qDO
@@ -61466,8 +63156,8 @@ avF
apS
sUP
mZi
-akW
-anr
+eWb
+lkn
jXo
mDu
qDO
@@ -61568,7 +63258,7 @@ aIT
aPp
aPq
aPA
-aRd
+qJr
bRu
aPF
bbu
@@ -61713,10 +63403,10 @@ mDu
aYZ
kau
pMU
-akW
+nQB
cmN
apT
-ars
+rfC
ihO
ars
sjY
@@ -61970,7 +63660,7 @@ mDu
aYZ
aaw
mhV
-akW
+nQB
aoE
aoB
aoB
@@ -62227,18 +63917,18 @@ mDu
aYZ
ojL
pHg
-akW
+nQB
aqj
apV
-aru
-aru
+chh
+tbW
auh
aIt
aru
boT
wUY
efq
-jXo
+vJE
jXo
mDu
qDO
@@ -62484,7 +64174,7 @@ mDu
aYZ
xUM
oYo
-akW
+nQB
aoj
apW
apW
@@ -62741,7 +64431,7 @@ mDu
aYZ
aaw
amg
-akW
+nQB
aoG
apX
arv
@@ -62998,8 +64688,8 @@ mDu
aYZ
cWj
aaW
-akW
-anr
+nQB
+sxA
anr
anr
wOA
@@ -63255,7 +64945,7 @@ mDu
aYZ
aaW
aaW
-akW
+nQB
aoA
apY
arw
@@ -64026,7 +65716,7 @@ aaW
aaW
fYC
pQf
-akW
+nQB
anr
anr
anr
@@ -64283,17 +65973,17 @@ aQi
aQi
aQi
aQi
-aQi
-aQi
-aQi
-aQi
-aQi
+kFj
+vTB
+vTB
+vTB
+vTB
arH
atc
auM
-akW
-akW
-akW
+kLH
+kLH
+aBy
jXo
mDu
mDu
@@ -65680,7 +67370,7 @@ pfc
aPF
aPF
aPF
-aPF
+gRH
aPF
dEd
aPF
@@ -65942,7 +67632,7 @@ aPF
jVA
aPF
aPF
-aPF
+rzD
aPF
bbh
aPF
@@ -67110,7 +68800,7 @@ anQ
aaW
aaw
gbw
-tRg
+dxQ
amT
ncU
duZ
@@ -68162,7 +69852,7 @@ djr
fbS
gLT
aIb
-aIb
+jUb
aIb
aIb
gRM
@@ -68657,7 +70347,7 @@ baz
baz
aZG
aYM
-mYf
+mPg
cHX
axO
azg
@@ -68678,7 +70368,7 @@ djr
aIb
aIb
aIb
-aIb
+jUb
djr
aIb
djr
@@ -68914,7 +70604,7 @@ bbs
baz
aZH
aYM
-mYf
+dEI
cHX
axO
azg
@@ -69700,7 +71390,7 @@ aaw
aJe
ioy
djr
-aHc
+pbh
aHP
aHP
aHP
@@ -69708,7 +71398,7 @@ aIc
aHP
aHP
aHP
-aHc
+pbh
aHP
aHP
aHP
@@ -70058,7 +71748,7 @@ mnu
aUu
oQC
aTM
-aUt
+vnO
aUt
lzW
wTo
diff --git a/_maps/map_files/Theseus/TGS_Theseus.dmm b/_maps/map_files/Theseus/TGS_Theseus.dmm
index 599e4ef4cc7b2..19a0047fb6491 100644
--- a/_maps/map_files/Theseus/TGS_Theseus.dmm
+++ b/_maps/map_files/Theseus/TGS_Theseus.dmm
@@ -225,6 +225,7 @@
/area/mainship/shipboard/starboard_point_defense)
"aaW" = (
/obj/structure/table/mainship/nometal,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/orange{
dir = 5
},
@@ -297,6 +298,11 @@
"abj" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/gnome,
+/obj/effect/spawner/random/misc/present,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -4;
+ pixel_y = 8
+ },
/turf/open/floor/mainship/orange{
dir = 4
},
@@ -364,6 +370,9 @@
/obj/item/storage/box/tgmc_mre,
/obj/item/storage/box/tgmc_mre,
/obj/item/pizzabox/meat,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/squads/req)
"abx" = (
@@ -390,6 +399,9 @@
/obj/vehicle/ridden/motorbike{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/cargo,
/area/mainship/squads/req)
"abA" = (
@@ -1104,6 +1116,9 @@
/area/mainship/squads/req)
"adV" = (
/obj/machinery/cic_maptable,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"adW" = (
@@ -1252,6 +1267,10 @@
dir = 4
},
/area/mainship/medical/surgery_hallway)
+"agL" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"ahA" = (
/turf/closed/wall/mainship,
/area/mainship/command/corporateliaison)
@@ -1348,6 +1367,12 @@
/obj/structure/closet/secure_closet/captain,
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"amb" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"ann" = (
/obj/structure/ship_ammo/cas/rocket/banshee,
/turf/open/floor/mainship/cargo,
@@ -1431,6 +1456,9 @@
/area/mainship/powered)
"arJ" = (
/obj/machinery/computer/cryopod,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/alpha)
"arK" = (
@@ -1577,6 +1605,7 @@
"avy" = (
/obj/docking_port/stationary/marine_dropship/crash_target,
/obj/effect/spawner/random/misc/gnome,
+/obj/item/a_gift/anything,
/turf/open/floor/mainship/research/containment/floor1,
/area/mainship/medical/medical_science)
"avz" = (
@@ -1587,6 +1616,15 @@
dir = 4
},
/area/mainship/medical/medical_science)
+"avU" = (
+/obj/structure/mirror{
+ dir = 4
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/wood,
+/area/mainship/living/tankerbunks)
"avW" = (
/turf/open/floor/mainship/cargo/arrow{
dir = 4
@@ -1706,6 +1744,13 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/starboard_hallway)
+"ayq" = (
+/obj/machinery/marine_selector/gear/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/alpha)
"ayw" = (
/turf/closed/wall/mainship/research/containment/wall/south,
/area/mainship/medical/medical_science)
@@ -1799,9 +1844,19 @@
dir = 1
},
/area/mainship/engineering/lower_engineering)
+"aAW" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"aAY" = (
/obj/structure/window/framed/mainship,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/squads/alpha)
"aBa" = (
@@ -1816,6 +1871,7 @@
"aBc" = (
/obj/machinery/self_destruct/console,
/obj/effect/spawner/random/misc/plushie/nospawnninety,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/tcomms,
/area/mainship/command/self_destruct)
"aBe" = (
@@ -1968,6 +2024,9 @@
/area/mainship/living/commandbunks)
"aIE" = (
/obj/machinery/computer/cryopod,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"aIZ" = (
@@ -2062,6 +2121,9 @@
/area/mainship/hallways/starboard_hallway)
"aMk" = (
/obj/machinery/marine_selector/gear/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/alpha)
"aMm" = (
@@ -2105,6 +2167,15 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/plating,
/area/mainship/medical/cmo_office)
+"aNv" = (
+/obj/structure/sink{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/mainship/sterile/side,
+/area/mainship/medical/chemistry)
"aNC" = (
/obj/structure/bed/chair/comfy{
dir = 4
@@ -2122,6 +2193,12 @@
},
/turf/open/floor/mainship/orange,
/area/mainship/engineering/lower_engine_monitoring)
+"aNS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/starboard_garden)
"aPe" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/floor,
@@ -2156,6 +2233,9 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue,
/area/mainship/squads/delta)
"aRY" = (
@@ -2215,6 +2295,7 @@
/area/mainship/living/officer_rnr)
"aVh" = (
/obj/machinery/bot/roomba,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/green{
dir = 1
},
@@ -2276,6 +2357,9 @@
/area/mainship/hallways/hangar/droppod)
"aVN" = (
/obj/machinery/vending/MarineMed/Blood,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"aWl" = (
@@ -2286,6 +2370,14 @@
/obj/machinery/door/firedoor/multi_tile,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/repair_bay)
+"aWq" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 10
+ },
+/turf/open/floor/mainship/green{
+ dir = 9
+ },
+/area/mainship/squads/req)
"aWr" = (
/obj/structure/cable,
/obj/machinery/power/apc/mainship{
@@ -2385,6 +2477,9 @@
/area/mainship/living/starboard_emb)
"aXY" = (
/obj/machinery/marine_selector/gear/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/alpha)
"aYw" = (
@@ -2438,6 +2533,9 @@
/area/mainship/living/basketball)
"aZi" = (
/obj/machinery/marine_selector/gear/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/alpha)
"aZk" = (
@@ -2515,6 +2613,12 @@
dir = 4
},
/area/mainship/hallways/starboard_hallway)
+"bar" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"bas" = (
/obj/machinery/telecomms/relay/preset/telecomms,
/turf/open/floor/mainship/tcomms,
@@ -2962,10 +3066,22 @@
},
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"bge" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/starboard_garden)
"bgf" = (
/obj/machinery/computer/telecomms/monitor/preset,
/turf/open/floor/mainship/mono,
/area/mainship/command/telecomms)
+"bgr" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"bgu" = (
/mob/living/simple_animal/cat/Jones,
/turf/open/floor/wood,
@@ -3094,6 +3210,9 @@
/obj/effect/turf_decal/warning_stripes,
/obj/item/toy/beach_ball/basketball,
/obj/machinery/holopad,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/wood,
/area/mainship/living/basketball)
"bir" = (
@@ -3153,6 +3272,21 @@
/obj/effect/soundplayer/deltaplayer,
/turf/closed/wall/mainship,
/area/mainship/shipboard/firing_range)
+"bje" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = 6;
+ pixel_y = 6
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = -9;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -2;
+ pixel_y = -4
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/self_destruct)
"bji" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -3412,6 +3546,8 @@
/turf/open/floor/mainship/mono,
/area/mainship/hallways/aft_umbilical)
"bku" = (
+/obj/structure/flora/tree/pine/xmas/presents,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/terragov{
dir = 8
},
@@ -3461,6 +3597,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/green,
/area/mainship/squads/req)
"bkE" = (
@@ -3794,6 +3933,13 @@
dir = 1
},
/area/mainship/living/starboard_emb)
+"bod" = (
+/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"bog" = (
/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted,
/turf/open/floor/mainship/sterile,
@@ -3821,6 +3967,7 @@
/obj/machinery/air_alarm{
dir = 4
},
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
"bot" = (
@@ -3912,6 +4059,9 @@
/obj/structure/bed/stool{
pixel_y = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/grass,
/area/mainship/living/starboard_garden)
"bpt" = (
@@ -4165,6 +4315,14 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/engineering/lower_engineering)
+"brG" = (
+/obj/structure/window/framed/mainship,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/alpha)
"brJ" = (
/obj/structure/disposalpipe/segment/corner,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -4247,6 +4405,9 @@
/obj/machinery/status_display{
pixel_y = 32
},
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/orange{
dir = 9
},
@@ -4358,6 +4519,9 @@
"buq" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/chem_dispenser/soda,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/mainship/medical/surgery_hallway)
"bur" = (
@@ -5067,6 +5231,10 @@
"bDQ" = (
/obj/structure/table/mainship/nometal,
/obj/item/stack/sheet/metal/large_stack,
+/obj/effect/spawner/random/misc/present,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/engineering/lower_engineering)
"bDR" = (
@@ -5303,6 +5471,12 @@
dir = 6
},
/area/mainship/engineering/lower_engineering)
+"bHR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/medical_science)
"bIb" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/red{
@@ -5441,6 +5615,9 @@
dir = 4
},
/obj/machinery/camera/autoname/mainship,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/alpha)
"bKa" = (
@@ -5683,6 +5860,9 @@
/area/mainship/medical/operating_room_four)
"bMk" = (
/obj/machinery/computer/body_scanconsole,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"bMl" = (
@@ -5694,6 +5874,9 @@
/area/mainship/living/grunt_rnr)
"bMp" = (
/obj/machinery/iv_drip,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"bMr" = (
@@ -5712,6 +5895,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/floor,
/area/mainship/command/cic)
"bMB" = (
@@ -5728,6 +5914,9 @@
dir = 8
},
/obj/effect/landmark/start/job/shiptech,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/squads/req)
"bMI" = (
@@ -5738,18 +5927,27 @@
/obj/item/clothing/mask/cigarette/cigar,
/obj/effect/spawner/random/misc/cigarettes,
/obj/item/tool/lighter/zippo,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/squads/req)
"bMJ" = (
/obj/structure/bed/chair/sofa/right{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/squads/req)
"bMK" = (
/obj/structure/bed/chair/sofa/corner{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/wood,
/area/mainship/squads/req)
"bML" = (
@@ -6089,6 +6287,17 @@
/obj/machinery/light/mainship{
dir = 1
},
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 10;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -10;
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"bQV" = (
@@ -6114,6 +6323,7 @@
/obj/machinery/door/firedoor/mainship{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/mainship/living/starboard_garden)
"bRd" = (
@@ -6248,6 +6458,12 @@
dir = 1
},
/area/mainship/medical/lower_medical)
+"bRX" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"bSe" = (
/obj/structure/toilet{
dir = 4
@@ -6308,12 +6524,26 @@
"bSP" = (
/obj/structure/table/mainship/nometal,
/obj/item/pizzabox/margherita,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/floor,
/area/mainship/living/cafeteria_starboard)
"bSQ" = (
/obj/machinery/light/mainship{
dir = 1
},
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -2
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 7;
+ pixel_y = 8
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 4
+ },
/turf/open/floor/mainship/red{
dir = 1
},
@@ -6367,6 +6597,9 @@
/obj/item/tool/lighter/zippo,
/obj/machinery/door_control/mainship/corporate,
/obj/structure/table/wood/fancy,
+/obj/item/prop/mainship/candle{
+ pixel_y = 6
+ },
/turf/open/floor/wood,
/area/mainship/command/corporateliaison)
"bTE" = (
@@ -6770,6 +7003,7 @@
"bYf" = (
/obj/structure/table/mainship/nometal,
/obj/item/storage/box/MRE,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/floor,
/area/mainship/living/cafeteria_port)
"bYh" = (
@@ -6848,6 +7082,7 @@
/obj/effect/turf_decal/siding/purple{
dir = 1
},
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/floor,
/area/mainship/living/bridgebunks)
"bZb" = (
@@ -6997,6 +7232,9 @@
"cbA" = (
/obj/machinery/door/firedoor/mainship,
/obj/machinery/smartfridge/chemistry,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/mainship/medical/lower_medical)
"cbE" = (
@@ -7054,6 +7292,9 @@
dir = 1
},
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"ccy" = (
@@ -7080,6 +7321,18 @@
"ccT" = (
/obj/machinery/light/mainship,
/obj/machinery/computer/squad_selector,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/prop/mainship/candle/short,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 9;
+ pixel_y = 14
+ },
/turf/open/floor/mainship/blue,
/area/mainship/squads/delta)
"cdt" = (
@@ -7115,6 +7368,9 @@
"cdT" = (
/obj/machinery/marine_selector/clothes/leader,
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"cdX" = (
@@ -7125,6 +7381,9 @@
/area/mainship/medical/lower_medical)
"cec" = (
/obj/machinery/vending/uniform_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"cef" = (
@@ -7138,6 +7397,9 @@
"ceh" = (
/obj/machinery/marine_selector/clothes/medic,
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"cei" = (
@@ -7151,6 +7413,9 @@
"cek" = (
/obj/machinery/marine_selector/clothes/engi,
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"cen" = (
@@ -7289,6 +7554,25 @@
id = "basketball";
pixel_y = 30
},
+/obj/item/prop/mainship/candle{
+ pixel_x = 7;
+ pixel_y = 9
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 15
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -11;
+ pixel_y = -4
+ },
/turf/open/floor/wood,
/area/mainship/living/basketball)
"clo" = (
@@ -7304,6 +7588,12 @@
dir = 1
},
/area/mainship/medical/operating_room_three)
+"cna" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"cnd" = (
/obj/machinery/vending/marineFood,
/obj/item/reagent_containers/food/snacks/protein_pack,
@@ -7516,11 +7806,24 @@
dir = 6
},
/area/mainship/hallways/aft_hallway)
+"cAl" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/starboard_garden)
"cAx" = (
/obj/structure/bed,
/obj/item/bedsheet/orange,
/turf/open/floor/wood,
/area/mainship/engineering/ce_room)
+"cBm" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"cBA" = (
/turf/closed/wall/mainship/research/containment/wall/purple{
dir = 4
@@ -7600,6 +7903,7 @@
"cKR" = (
/obj/structure/table/mainship/nometal,
/obj/item/stack/sheet/glass/glass/large_stack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/blue/full,
/area/mainship/command/cic)
"cLn" = (
@@ -7648,6 +7952,12 @@
/obj/item/reagent_containers/glass/rag,
/turf/open/floor/mainship/floor,
/area/mainship/living/grunt_rnr)
+"cSd" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"cSl" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -7709,6 +8019,12 @@
dir = 4
},
/area/mainship/medical/medical_science)
+"cWk" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/cmo_office)
"cWB" = (
/obj/docking_port/stationary/marine_dropship/crash_target,
/turf/open/floor/plating/plating_catwalk,
@@ -7833,6 +8149,15 @@
/obj/effect/spawner/random/food_or_drink/kitchenknife,
/turf/open/floor/mainship/mono,
/area/mainship/living/officer_rnr)
+"diK" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"diM" = (
/obj/structure/bed/bunkbed,
/obj/effect/landmark/start/job/transportofficer,
@@ -7986,6 +8311,7 @@
"dwc" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/vending/nanomed,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/blue/full,
/area/mainship/command/cic)
"dwp" = (
@@ -8181,6 +8507,11 @@
/area/mainship/living/cryo_cells)
"dIe" = (
/obj/machinery/loadout_vendor,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -5;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"dIf" = (
@@ -8188,6 +8519,9 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 6
},
@@ -8320,6 +8654,16 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/living/cafeteria_port)
+"dOw" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/outer,
+/area/mainship/command/cic)
+"dPg" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer,
+/area/mainship/command/cic)
"dPt" = (
/obj/structure/barricade/metal{
dir = 8
@@ -8374,6 +8718,7 @@
/obj/machinery/power/apc/mainship{
dir = 8
},
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/mono,
/area/mainship/living/cafeteria_port)
"dVQ" = (
@@ -8576,6 +8921,16 @@
},
/turf/open/floor/tile/dark,
/area/mainship/engineering/lower_engine_monitoring)
+"epI" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/cmo_office)
+"epQ" = (
+/obj/structure/window/framed/mainship/white,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/medical/cmo_office)
"eqI" = (
/obj/machinery/chem_dispenser/soda{
dir = 8
@@ -8677,6 +9032,12 @@
/obj/docking_port/stationary/marine_dropship/crash_target,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/operating_room_three)
+"exg" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"ext" = (
/obj/machinery/status_display{
pixel_y = 32
@@ -8687,6 +9048,9 @@
/obj/machinery/keycard_auth{
pixel_y = -30
},
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
/turf/open/floor/mainship/silver,
/area/mainship/command/cic)
"eyd" = (
@@ -8705,6 +9069,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue,
/area/mainship/squads/delta)
"eAQ" = (
@@ -8775,6 +9142,11 @@
dir = 1
},
/obj/machinery/computer/squad_manager,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -2;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/red{
dir = 1
},
@@ -8782,6 +9154,9 @@
"eGg" = (
/obj/structure/window/framed/mainship/hull,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/command/cic)
"eJo" = (
@@ -8865,6 +9240,11 @@
/obj/item/roller,
/obj/item/roller,
/obj/item/roller,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 3;
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/sterile/side{
dir = 1
},
@@ -8915,12 +9295,27 @@
"eRE" = (
/turf/open/floor/carpet,
/area/mainship/living/commandbunks)
+"eRJ" = (
+/obj/structure/bed/stool{
+ pixel_y = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/grass,
+/area/mainship/living/starboard_garden)
"eSg" = (
/obj/structure/bed/chair/office/dark{
dir = 1
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/cmo_office)
+"eTT" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"eVB" = (
/obj/structure/cable,
/obj/machinery/light/mainship{
@@ -8928,6 +9323,18 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/port_hull)
+"eVG" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/starboard_garden)
+"eWA" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"eWQ" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -8975,12 +9382,24 @@
"far" = (
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
+"fbx" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/hangar/droppod)
"fbJ" = (
/obj/structure/dropship_equipment/shuttle/sentry_holder,
/turf/open/floor/mainship/orange{
dir = 1
},
/area/mainship/hallways/hangar)
+"fdE" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/delta)
"fep" = (
/obj/machinery/atmospherics/components/unary/vent_pump/layer1{
dir = 4;
@@ -8991,6 +9410,10 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/hallways/bow_hallway)
+"ffE" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"fgc" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 10
@@ -9088,11 +9511,17 @@
/obj/structure/table/mainship/nometal,
/obj/item/storage/box/bodybags,
/obj/item/storage/box/bodybags,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"fmx" = (
/obj/machinery/chem_master,
/obj/item/reagent_containers/glass/beaker/bluespace,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/chemistry)
"fmE" = (
@@ -9151,6 +9580,13 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/command/bridge)
+"fpo" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"fpO" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{
@@ -9166,15 +9602,41 @@
/area/mainship/hallways/bow_hallway)
"fpV" = (
/obj/machinery/cloning/vats,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"fqH" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/surgery_hallway)
+"frG" = (
+/obj/structure/bed/chair/comfy/black,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/silver/full,
+/area/mainship/hallways/hangar)
"frP" = (
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/mainship/mono,
/area/mainship/hull/port_hull)
+"frX" = (
+/obj/machinery/door/poddoor/shutters{
+ id = "qm_warehouse";
+ name = "\improper Warehouse Shutters"
+ },
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/req)
"fsL" = (
/obj/machinery/camera/autoname/mainship{
dir = 1
@@ -9275,6 +9737,7 @@
"fxh" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/table_lighting,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/silver{
dir = 5
},
@@ -9387,6 +9850,12 @@
dir = 1
},
/area/mainship/squads/delta)
+"fEa" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_four)
"fEn" = (
/obj/machinery/light/mainship{
dir = 4
@@ -9443,6 +9912,7 @@
/area/mainship/command/cic)
"fHN" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights,
/turf/closed/wall/mainship,
/area/mainship/squads/delta)
"fIS" = (
@@ -9453,6 +9923,12 @@
/obj/machinery/tank_part_fabricator,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"fJa" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"fKd" = (
/obj/machinery/microwave,
/obj/structure/table/mainship/nometal,
@@ -9467,6 +9943,12 @@
/obj/structure/cable,
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"fKl" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"fLi" = (
/obj/machinery/holopad,
/turf/open/floor/mainship/floor,
@@ -9498,6 +9980,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/squads/req)
+"fMl" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"fMI" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/paperbin,
@@ -9592,6 +10080,17 @@
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/plating/icefloor/warnplate,
/area/mainship/living/tankerbunks)
+"fWV" = (
+/obj/machinery/vending/armor_supply,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -6
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/req)
"fYx" = (
/obj/effect/turf_decal/warning_stripes/thin,
/obj/machinery/power/terminal{
@@ -9730,6 +10229,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/living/starboard_emb)
+"gdF" = (
+/obj/structure/table/mainship/nometal,
+/obj/item/storage/box/MRE,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/floor,
+/area/mainship/living/cafeteria_port)
"gdI" = (
/obj/machinery/vending/dinnerware,
/turf/open/floor/prison/kitchen,
@@ -9809,6 +10314,14 @@
/obj/structure/dropship_equipment/cas/weapon/bomblet_pod,
/turf/open/floor/mainship/cargo,
/area/mainship/hallways/hangar)
+"ggQ" = (
+/obj/structure/window/framed/mainship,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/alpha)
"ghz" = (
/obj/structure/bed/chair/nometal{
dir = 4
@@ -9820,12 +10333,25 @@
dir = 8
},
/area/mainship/command/bridge)
+"ghV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"gia" = (
/obj/machinery/door/airlock/mainship/generic{
name = "Kitchen"
},
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
+"giw" = (
+/obj/machinery/marine_selector/gear/engi,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/alpha)
"gjx" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 8
@@ -9844,6 +10370,17 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/living/grunt_rnr)
+"gnn" = (
+/obj/structure/window/framed/mainship/requisitions,
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/machinery/door/poddoor/shutters/mainship/req/ro{
+ dir = 2
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/squads/req)
"goT" = (
/obj/machinery/camera/autoname/mainship{
dir = 1
@@ -9878,6 +10415,12 @@
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/wood,
/area/mainship/living/basketball)
+"gqp" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"gra" = (
/obj/structure/closet,
/obj/machinery/air_alarm,
@@ -10053,6 +10596,9 @@
/area/mainship/squads/req)
"gEw" = (
/obj/machinery/vending/weapon,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"gEJ" = (
@@ -10081,6 +10627,13 @@
/obj/effect/spawner/random/misc/soap/regularweighted,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/command/corporateliaison)
+"gIZ" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"gJa" = (
/obj/machinery/door/airlock/mainship/generic/pilot,
/turf/open/floor/mainship/mono,
@@ -10127,6 +10680,15 @@
dir = 1
},
/area/mainship/command/corporateliaison)
+"gNq" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"gNV" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
@@ -10274,6 +10836,13 @@
dir = 8
},
/area/mainship/medical/medical_science)
+"gZv" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"haf" = (
/turf/open/floor/mainship/green/full,
/area/mainship/squads/req)
@@ -10498,6 +11067,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/starboard_hull)
+"hmh" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"hnw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/structure/cable,
@@ -10528,12 +11103,22 @@
/area/mainship/command/cic)
"hrn" = (
/obj/structure/dropship_equipment/shuttle/flare_launcher,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
/turf/open/floor/mainship/orange,
/area/mainship/hallways/hangar)
"hrH" = (
/mob/living/simple_animal/cat/Runtime,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/cmo_office)
+"hsQ" = (
+/obj/machinery/vending/armor_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/delta)
"hta" = (
/obj/structure/table/mainship/nometal,
/obj/item/storage/pill_bottle/dylovene{
@@ -10544,6 +11129,7 @@
pixel_x = 5
},
/obj/item/healthanalyzer,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/sterile/side{
dir = 8
},
@@ -10555,6 +11141,9 @@
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
"hug" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -6
+ },
/turf/open/floor/mainship/terragov/west{
dir = 4
},
@@ -10589,6 +11178,10 @@
"hwd" = (
/obj/structure/table/mainship/nometal,
/obj/item/radio/intercom/general,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 4
+ },
/turf/open/floor/mainship/silver{
dir = 9
},
@@ -10753,6 +11346,9 @@
"hJa" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/air_alarm,
+/obj/item/prop/mainship/candle{
+ pixel_y = 7
+ },
/turf/open/floor/mainship/mono,
/area/mainship/command/telecomms)
"hKi" = (
@@ -10832,6 +11428,23 @@
},
/turf/open/floor/tile/dark,
/area/mainship/engineering/lower_engine_monitoring)
+"hRp" = (
+/obj/machinery/marine_selector/gear/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/alpha)
+"hRx" = (
+/obj/structure/bed/chair/nometal{
+ dir = 1
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -7;
+ pixel_y = -1
+ },
+/turf/open/floor/mainship/blue/full,
+/area/mainship/hallways/hangar)
"hSb" = (
/obj/structure/cable,
/obj/structure/disposalpipe/segment,
@@ -10913,6 +11526,15 @@
},
/turf/open/floor/wood,
/area/mainship/living/officer_rnr)
+"hWc" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"hWJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -10924,6 +11546,10 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/operating_room_three)
+"hYL" = (
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/req)
"hZh" = (
/obj/machinery/light/mainship,
/turf/open/floor/mainship/sterile/side,
@@ -10953,6 +11579,18 @@
/obj/item/toy/plush/moth,
/turf/open/floor/mainship/mono,
/area/mainship/living/port_emb)
+"ick" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
+"icU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"idR" = (
/obj/structure/cable,
/turf/open/floor/mainship/sterile/side{
@@ -10971,6 +11609,14 @@
/obj/effect/ai_node,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"ifc" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/sterile/corner{
+ dir = 4
+ },
+/area/mainship/medical/lower_medical)
"ifh" = (
/obj/machinery/optable,
/turf/open/floor/mainship/mono,
@@ -11017,6 +11663,13 @@
/obj/machinery/chem_dispenser/soda,
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
+"ikm" = (
+/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"ikr" = (
/obj/machinery/door/airlock/multi_tile/mainship/research{
name = "Research Wing"
@@ -11126,6 +11779,7 @@
/obj/machinery/door/poddoor/shutters/mainship/req/ro{
dir = 2
},
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"isK" = (
@@ -11348,6 +12002,14 @@
"iJv" = (
/turf/open/floor/mainship/floor,
/area/mainship/squads/alpha)
+"iKO" = (
+/obj/structure/window/framed/mainship/hull,
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/command/cic)
"iLR" = (
/obj/machinery/door/poddoor/mainship/indestructible,
/turf/closed/wall/mainship/outer,
@@ -11362,6 +12024,26 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
+"iMk" = (
+/obj/machinery/light/mainship,
+/obj/machinery/computer/squad_selector,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -5;
+ pixel_y = -4
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = -3;
+ pixel_y = 11
+ },
+/turf/open/floor/mainship/blue,
+/area/mainship/squads/delta)
"iNc" = (
/obj/machinery/air_alarm,
/obj/machinery/bot/cleanbot,
@@ -11385,6 +12067,12 @@
dir = 4
},
/area/mainship/medical/medical_science)
+"iOq" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/wood,
+/area/mainship/squads/req)
"iOS" = (
/turf/open/floor/mainship/sterile/side{
dir = 10
@@ -11518,6 +12206,12 @@
},
/turf/open/floor/mainship/stripesquare,
/area/mainship/hallways/hangar/droppod)
+"iZv" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/closed/wall/mainship,
+/area/mainship/hallways/hangar)
"iZE" = (
/obj/machinery/air_alarm,
/turf/open/floor/mainship/orange{
@@ -11672,6 +12366,9 @@
/area/mainship/medical/surgery_hallway)
"jkR" = (
/obj/item/reagent_containers/food/snacks/grown/poppy,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/living/starboard_garden)
"jnG" = (
@@ -11679,6 +12376,9 @@
/obj/structure/disposalpipe/trunk{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"jnS" = (
@@ -11708,6 +12408,12 @@
/obj/structure/cable,
/turf/open/floor/mainship/floor,
/area/mainship/squads/delta)
+"jrv" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"jsp" = (
/obj/structure/bed/chair/nometal{
dir = 8
@@ -11743,6 +12449,13 @@
dir = 8
},
/obj/structure/closet/secure_closet/chemical,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 4
},
@@ -11760,6 +12473,10 @@
dir = 10
},
/area/mainship/hallways/hangar)
+"jur" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_four)
"jvm" = (
/obj/structure/disposalpipe/segment,
/turf/open/floor/mainship/mono,
@@ -11785,6 +12502,9 @@
/obj/item/tool/hand_labeler,
/obj/machinery/light/mainship,
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/alpha)
"jwN" = (
@@ -11834,6 +12554,14 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/mono,
/area/mainship/hull/port_hull)
+"jBT" = (
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/window/framed/mainship/requisitions,
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/squads/req)
"jCH" = (
/obj/effect/ai_node,
/turf/open/floor/plating,
@@ -12024,6 +12752,10 @@
},
/turf/open/floor/wood,
/area/mainship/living/commandbunks)
+"jTA" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"jTN" = (
/obj/structure/cable,
/obj/machinery/door/airlock/mainship/generic{
@@ -12086,6 +12818,12 @@
dir = 10
},
/area/mainship/living/numbertwobunks)
+"jYp" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"jZv" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
dir = 4
@@ -12116,6 +12854,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
+"kac" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/floor,
+/area/mainship/living/tankerbunks)
"kbP" = (
/obj/machinery/processor{
pixel_y = 5
@@ -12145,6 +12889,9 @@
/obj/structure/window/framed/mainship,
/obj/machinery/door/firedoor/mainship,
/obj/machinery/door/poddoor/shutters/mainship/req/ro,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/floor/plating,
/area/mainship/squads/req)
"khr" = (
@@ -12195,6 +12942,13 @@
"kkN" = (
/turf/open/floor/mainship/tcomms,
/area/mainship/shipboard/port_point_defense)
+"klG" = (
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/hallways/starboard_hallway)
"klS" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -12227,6 +12981,12 @@
/obj/item/reagent_containers/food/snacks/protein_pack,
/turf/open/floor/mainship/floor,
/area/mainship/living/cafeteria_port)
+"kow" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"kpc" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 5
@@ -12323,6 +13083,10 @@
dir = 1
},
/area/mainship/living/port_emb)
+"ktk" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/outer,
+/area/mainship/command/cic)
"kto" = (
/obj/machinery/light/mainship{
dir = 8
@@ -12351,6 +13115,16 @@
/obj/vehicle/ridden/motorbike,
/turf/open/floor/mainship/cargo,
/area/mainship/squads/req)
+"kwm" = (
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/window/framed/mainship/requisitions,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/req)
"kxd" = (
/turf/open/floor/mainship/green{
dir = 6
@@ -12478,6 +13252,16 @@
/obj/effect/turf_decal/warning_stripes/thin,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"kDM" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/mainship/green,
+/area/mainship/squads/req)
"kFq" = (
/obj/machinery/shower{
dir = 8
@@ -12494,6 +13278,10 @@
/obj/effect/spawner/random/misc/paperbin,
/obj/item/tool/pen,
/obj/machinery/faxmachine/research,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 12;
+ pixel_y = 8
+ },
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/medical_science)
"kFM" = (
@@ -12592,6 +13380,12 @@
dir = 4
},
/area/mainship/squads/alpha)
+"kNT" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"kQD" = (
/obj/structure/cable,
/obj/machinery/door/airlock/mainship/ai{
@@ -12712,6 +13506,12 @@
dir = 8
},
/area/mainship/hallways/starboard_hallway)
+"lcb" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"lcy" = (
/obj/machinery/vending/nanomed,
/turf/open/floor/mainship/floor,
@@ -12731,6 +13531,12 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/engineering/engine_core)
+"lex" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"leA" = (
/obj/effect/turf_decal/warning_stripes/box/small{
dir = 1
@@ -12748,6 +13554,17 @@
/obj/structure/cable,
/turf/open/floor/mainship/floor,
/area/mainship/engineering/lower_engine_monitoring)
+"lgq" = (
+/obj/structure/bed/chair/comfy/black,
+/obj/item/prop/mainship/candle{
+ pixel_x = 2;
+ pixel_y = 7
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -7
+ },
+/turf/open/floor/mainship/silver/full,
+/area/mainship/hallways/hangar)
"lgs" = (
/obj/machinery/door/firedoor/mainship{
dir = 2
@@ -12870,6 +13687,9 @@
/area/mainship/living/tankerbunks)
"lol" = (
/obj/structure/dropship_equipment/electronics/spotlights,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
/turf/open/floor/mainship/orange,
/area/mainship/hallways/hangar)
"loE" = (
@@ -12898,6 +13718,9 @@
/obj/structure/bed/chair/nometal{
dir = 4
},
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/open/floor/wood,
/area/mainship/medical/surgery_hallway)
"lrX" = (
@@ -12926,6 +13749,12 @@
dir = 5
},
/area/mainship/medical/surgery_hallway)
+"lsV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_four)
"lth" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/reagentgrinder,
@@ -13001,6 +13830,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
+"lwy" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/wood,
+/area/mainship/medical/surgery_hallway)
"lxe" = (
/turf/open/floor/mainship/orange{
dir = 5
@@ -13114,6 +13949,9 @@
light_color = "#da2f1b"
},
/obj/machinery/computer/camera_advanced/overwatch/req,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"lEm" = (
@@ -13177,6 +14015,9 @@
/obj/structure/platform{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/floor,
/area/mainship/command/cic)
"lHu" = (
@@ -13211,6 +14052,10 @@
},
/turf/open/floor/mainship/ai,
/area/mainship/command/airoom)
+"lIL" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"lIO" = (
/obj/effect/turf_decal/warning_stripes/box/small{
dir = 1
@@ -13229,6 +14074,9 @@
/obj/item/camera_film,
/obj/item/camera,
/obj/structure/table/wood/fancy,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/mono,
/area/mainship/command/corporateliaison)
"lJf" = (
@@ -13269,6 +14117,15 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
+"lMB" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"lMY" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -13366,6 +14223,18 @@
dir = 8
},
/area/mainship/command/cic)
+"lSs" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
+"lUz" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_four)
"lUU" = (
/turf/closed/wall/mainship/research/containment/wall/corner{
dir = 8
@@ -13403,6 +14272,27 @@
"lYN" = (
/turf/open/floor/mainship/mono,
/area/mainship/living/officer_rnr)
+"lZB" = (
+/obj/machinery/light/mainship{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 2;
+ pixel_y = -3
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/turf/open/floor/mainship/red{
+ dir = 1
+ },
+/area/mainship/squads/alpha)
+"man" = (
+/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/medical/lower_medical)
"may" = (
/obj/machinery/vending/MarineMed,
/turf/open/floor/mainship/floor,
@@ -13445,6 +14335,14 @@
dir = 4
},
/area/mainship/living/cryo_cells)
+"mea" = (
+/obj/structure/window/framed/mainship/hull,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/mainship/command/cic)
"mft" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -13588,6 +14486,12 @@
/obj/effect/soundplayer/deltaplayer,
/turf/open/floor/mainship_hull,
/area/space)
+"moS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"mpc" = (
/obj/machinery/light/mainship,
/turf/open/floor/mainship/silver,
@@ -13655,6 +14559,13 @@
/turf/open/floor/mainship/orange,
/area/mainship/hull/starboard_hull)
"mvV" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 7
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 6;
+ pixel_y = -4
+ },
/turf/open/floor/mainship/terragov/west{
dir = 8
},
@@ -13732,6 +14643,12 @@
/area/mainship/living/cafeteria_starboard)
"mBt" = (
/obj/machinery/computer/ordercomp,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/open/floor/mainship/green,
/area/mainship/squads/req)
"mBx" = (
@@ -13793,6 +14710,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/surgery_hallway)
"mDN" = (
@@ -13842,6 +14762,12 @@
},
/turf/open/floor/wood,
/area/mainship/living/pilotbunks)
+"mIy" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"mIL" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -14031,6 +14957,17 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/plating,
/area/mainship/medical/lower_medical)
+"mUW" = (
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/req)
"mVi" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -14054,6 +14991,13 @@
dir = 8
},
/area/mainship/command/bridge)
+"mVK" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"mVM" = (
/obj/structure/window/reinforced/tinted/frosted{
dir = 4
@@ -14180,6 +15124,7 @@
"nfz" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/door_control/old/req,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/green,
/area/mainship/squads/req)
"nga" = (
@@ -14192,6 +15137,7 @@
"ngm" = (
/obj/structure/table/mainship/nometal,
/obj/item/instrument/guitar,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/floor,
/area/mainship/living/cafeteria_port)
"ngq" = (
@@ -14241,12 +15187,27 @@
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/plating,
/area/mainship/hallways/hangar)
+"njF" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"njN" = (
/obj/structure/sink{
dir = 4
},
/turf/open/floor/prison/kitchen,
/area/mainship/living/grunt_rnr)
+"nlp" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"nmb" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 4
@@ -14268,6 +15229,17 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/engineering/engine_core)
+"nnc" = (
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle{
+ pixel_x = 9;
+ pixel_y = 11
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -11
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/self_destruct)
"npx" = (
/obj/machinery/light/mainship{
dir = 8
@@ -14330,6 +15302,12 @@
/obj/structure/cable,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/aft_hallway)
+"nsU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer,
+/area/mainship/command/cic)
"ntI" = (
/obj/machinery/door/firedoor/multi_tile{
dir = 1
@@ -14343,6 +15321,24 @@
/obj/machinery/vending/tool,
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
+"nuG" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = 3;
+ pixel_y = -1
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 8;
+ pixel_y = 12
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -9;
+ pixel_y = -5
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -22
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/self_destruct)
"nuJ" = (
/obj/structure/window/reinforced/tinted/frosted{
dir = 8
@@ -14379,6 +15375,10 @@
/obj/effect/spawner/random/food_or_drink/kitchen,
/turf/open/floor/mainship/floor,
/area/mainship/living/grunt_rnr)
+"nAo" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"nAt" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
@@ -14406,6 +15406,12 @@
dir = 1
},
/area/mainship/medical/lower_medical)
+"nBY" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"nCj" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/mainship/sterile/dark,
@@ -14441,6 +15447,12 @@
dir = 8
},
/area/mainship/engineering/lower_engineering)
+"nFv" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"nGE" = (
/turf/open/floor/mainship/orange{
dir = 4
@@ -14450,6 +15462,7 @@
/obj/structure/shipmast{
pixel_y = 2
},
+/obj/structure/flora/tree/pine/xmas/presents,
/turf/open/floor/mainship/green/full,
/area/mainship/squads/req)
"nHq" = (
@@ -14620,6 +15633,19 @@
"nRA" = (
/turf/open/floor/plating,
/area/mainship/living/evacuation/pod/four)
+"nRH" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 5;
+ pixel_y = -5
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/req)
+"nSg" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/cmo_office)
"nSl" = (
/turf/closed/wall/mainship/white,
/area/mainship/medical/lower_medical)
@@ -14658,6 +15684,12 @@
/obj/machinery/power/apc/mainship/hardened,
/turf/open/floor/mainship/ai,
/area/mainship/command/airoom)
+"nUW" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"nVC" = (
/obj/structure/cable,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -14714,6 +15746,9 @@
/obj/structure/window/reinforced{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/alpha)
"obg" = (
@@ -14792,6 +15827,13 @@
dir = 5
},
/area/mainship/engineering/ce_room)
+"ogv" = (
+/obj/machinery/status_display/ai,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/command/airoom)
"ogw" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 6
@@ -14905,6 +15947,15 @@
"ost" = (
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
+"osJ" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"osZ" = (
/obj/machinery/status_display{
pixel_y = 34
@@ -14930,6 +15981,9 @@
"oxc" = (
/obj/machinery/firealarm,
/obj/structure/closet/secure_closet/medical3,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/sterile/side{
dir = 1
},
@@ -14987,6 +16041,12 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/mainship/sterile,
/area/mainship/medical/medical_science)
+"oAd" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/numbertwobunks)
"oAu" = (
/obj/machinery/light/mainship/small{
dir = 4
@@ -15059,12 +16119,24 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/mainship/orange,
/area/mainship/engineering/lower_engineering)
+"oFF" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"oFP" = (
/obj/structure/closet/emcloset,
/turf/open/floor/mainship/orange{
dir = 1
},
/area/mainship/engineering/lower_engineering)
+"oFZ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"oGS" = (
/obj/machinery/air_alarm{
dir = 4
@@ -15125,6 +16197,9 @@
/obj/structure/table/mainship/nometal,
/obj/item/paper,
/obj/item/taperecorder,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
/turf/open/floor/mainship/floor,
/area/mainship/hallways/repair_bay)
"oKV" = (
@@ -15199,6 +16274,9 @@
/area/mainship/medical/medical_science)
"oRU" = (
/obj/structure/prop/mainship/mission_planning_system,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/green{
dir = 10
},
@@ -15268,6 +16346,9 @@
"oYB" = (
/obj/machinery/marine_selector/clothes/smartgun,
/obj/structure/sign/poster,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"oYC" = (
@@ -15322,6 +16403,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"pbs" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
"pbV" = (
/turf/open/floor/mainship/green/corner,
/area/mainship/squads/req)
@@ -15334,6 +16421,9 @@
/area/mainship/hallways/hangar)
"pdH" = (
/obj/machinery/computer/cloning_console/vats,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"peh" = (
@@ -15362,6 +16452,13 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/orange,
/area/mainship/hallways/starboard_hallway)
+"pgm" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"pgn" = (
/obj/machinery/door/airlock/mainship/maint{
dir = 2
@@ -15527,6 +16624,17 @@
},
/turf/open/floor/carpet/side,
/area/mainship/living/commandbunks)
+"psH" = (
+/obj/machinery/camera/autoname/mainship,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 11;
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"ptS" = (
/obj/effect/ai_node,
/turf/open/floor/mainship/purple/corner{
@@ -15575,12 +16683,18 @@
dir = 4
},
/obj/machinery/sleeper,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 8
},
/area/mainship/medical/lower_medical)
"pyR" = (
/obj/machinery/vending/medical/shipside,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"pAa" = (
@@ -15671,6 +16785,21 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/plating,
/area/mainship/shipboard/port_point_defense)
+"pId" = (
+/obj/structure/window/framed/mainship/requisitions,
+/obj/machinery/door/poddoor/mainship/open{
+ id = "CIC Lockdown";
+ name = "\improper Combat Information Center Blast Door"
+ },
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/mainship/command/cic)
"pJk" = (
/turf/open/floor/mainship/floor,
/area/mainship/engineering/ce_room)
@@ -15848,6 +16977,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/delta)
"pWP" = (
@@ -15883,6 +17015,17 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/command/cic)
+"pYk" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 7;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/mono,
+/area/mainship/squads/req)
"pYz" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 1
@@ -15957,6 +17100,9 @@
/obj/structure/bed/chair/office/dark{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/chemistry)
"qgD" = (
@@ -16060,6 +17206,7 @@
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/misc/paperbin,
/obj/item/tool/pen/blue,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/carpet/side{
dir = 4
},
@@ -16067,6 +17214,9 @@
"qmn" = (
/obj/machinery/light/mainship,
/obj/machinery/cloning/vats,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"qmJ" = (
@@ -16080,6 +17230,14 @@
dir = 6
},
/area/mainship/living/tankerbunks)
+"qmU" = (
+/obj/structure/window/framed/mainship/white,
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/open/floor/plating,
+/area/mainship/medical/lower_medical)
"qod" = (
/obj/machinery/air_alarm{
dir = 4
@@ -16127,6 +17285,7 @@
/obj/structure/table/mainship/nometal,
/obj/item/weapon/combat_knife,
/obj/item/storage/toolbox/mechanical,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/white{
dir = 1
},
@@ -16230,6 +17389,12 @@
dir = 4
},
/area/mainship/hallways/repair_bay)
+"qwl" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"qwP" = (
/obj/machinery/camera/autoname/mainship{
dir = 8
@@ -16254,6 +17419,9 @@
"qys" = (
/obj/structure/bed,
/obj/item/bedsheet/medical,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"qyD" = (
@@ -16263,6 +17431,19 @@
/obj/machinery/vending/engivend,
/turf/open/floor/mainship/floor,
/area/mainship/hallways/hangar)
+"qyV" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = -10;
+ pixel_y = -3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/turf/open/floor/mainship/silver{
+ dir = 8
+ },
+/area/mainship/command/cic)
"qza" = (
/obj/structure/table/mainship/nometal,
/obj/item/storage/firstaid/toxin{
@@ -16278,6 +17459,21 @@
dir = 8
},
/area/mainship/medical/surgery_hallway)
+"qzZ" = (
+/obj/item/prop/mainship/candle{
+ pixel_x = -7;
+ pixel_y = 6
+ },
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 9;
+ pixel_y = 8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 21
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/command/self_destruct)
"qAK" = (
/obj/machinery/vending/MarineMed/Blood,
/turf/open/floor/mainship/sterile/side,
@@ -16353,6 +17549,20 @@
/obj/structure/cable,
/turf/open/floor/mainship/mono,
/area/mainship/squads/req)
+"qDJ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
+"qDK" = (
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/window/framed/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/delta)
"qEl" = (
/obj/structure/cable,
/turf/open/floor/mainship/mono,
@@ -16410,6 +17620,10 @@
dir = 4
},
/area/mainship/hull/port_hull)
+"qJi" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"qKs" = (
/obj/structure/table/wood,
/obj/item/pizzabox/meat,
@@ -16427,6 +17641,12 @@
/obj/machinery/holopad,
/turf/open/floor/mainship/mono,
/area/mainship/living/starboard_garden)
+"qMn" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_three)
"qMJ" = (
/obj/machinery/door/airlock/mainship/research/glass/cell/cell1,
/obj/machinery/door/poddoor/shutters/mainship/cell/cell1,
@@ -16448,6 +17668,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/green,
/area/mainship/squads/req)
"qOi" = (
@@ -16474,6 +17697,7 @@
/obj/structure/table/mainship/nometal,
/obj/item/storage/toolbox/electrical,
/obj/item/storage/toolbox/electrical,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/orange{
dir = 4
},
@@ -16525,6 +17749,17 @@
/obj/machinery/telecomms/bus/preset_two,
/turf/open/floor/mainship/tcomms,
/area/mainship/command/telecomms)
+"qTT" = (
+/obj/structure/table/mainship/nometal,
+/obj/machinery/cell_charger,
+/obj/item/cell/high,
+/obj/item/tool/hand_labeler,
+/obj/item/tool/hand_labeler,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/green{
+ dir = 8
+ },
+/area/mainship/squads/req)
"qVk" = (
/obj/machinery/door/window,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -16533,6 +17768,15 @@
},
/turf/open/floor/mainship/floor,
/area/mainship/living/basketball)
+"qVt" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"qVw" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/obj/machinery/light/mainship/small{
@@ -16552,6 +17796,12 @@
dir = 10
},
/area/mainship/medical/surgery_hallway)
+"qXe" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"qXV" = (
/obj/machinery/light/mainship{
dir = 1
@@ -16625,6 +17875,9 @@
dir = 4
},
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/green,
/area/mainship/squads/req)
"rbA" = (
@@ -16830,8 +18083,24 @@
"ruy" = (
/turf/open/floor/mainship/cargo,
/area/mainship/squads/delta)
+"ruL" = (
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/green/corner{
+ dir = 1
+ },
+/area/mainship/squads/req)
+"ruQ" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/mainship/squads/delta)
"rwd" = (
/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 4
},
@@ -16839,6 +18108,9 @@
"rws" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/computer/supplydrop_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/mainship/squads/req)
"rxv" = (
@@ -16851,6 +18123,15 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
+"ryt" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"ryJ" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable,
@@ -16987,6 +18268,12 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer1,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/port_hallway)
+"rMg" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/tankerbunks)
"rMv" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -16994,6 +18281,10 @@
/area/mainship/command/cic)
"rMK" = (
/obj/structure/bed/chair/comfy/black,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 1;
+ pixel_y = 5
+ },
/turf/open/floor/mainship/silver/full,
/area/mainship/hallways/hangar)
"rNO" = (
@@ -17030,6 +18321,9 @@
/area/mainship/hallways/bow_hallway)
"rRE" = (
/obj/structure/closet/secure_closet/guncabinet/emergency_combat_gear,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"rRW" = (
@@ -17049,6 +18343,15 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/aft_umbilical)
+"rTe" = (
+/obj/effect/turf_decal/warning_stripes/thin{
+ dir = 8
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/hangar)
"rTn" = (
/obj/structure/cable,
/obj/effect/ai_node,
@@ -17069,6 +18372,9 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/silver{
dir = 10
},
@@ -17093,6 +18399,9 @@
id = "cl_shutters";
pixel_y = -1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/silver{
dir = 10
},
@@ -17109,6 +18418,9 @@
pixel_x = -17;
pixel_y = 16
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/silver{
dir = 10
},
@@ -17116,6 +18428,13 @@
"rXz" = (
/turf/open/floor/mainship/floor,
/area/mainship/shipboard/firing_range)
+"rXE" = (
+/obj/structure/bed/chair/comfy/black,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3
+ },
+/turf/open/floor/mainship/silver/full,
+/area/mainship/hallways/hangar)
"rYp" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -17165,6 +18484,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
+"sbM" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/medical_science)
"scY" = (
/obj/structure/table/mainship/nometal,
/obj/item/tool/crowbar,
@@ -17199,6 +18524,10 @@
/obj/effect/landmark/start/job/squadengineer,
/turf/open/floor/mainship/mono,
/area/mainship/living/cryo_cells)
+"sgh" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_one)
"sgw" = (
/obj/structure/cable,
/turf/open/floor/wood,
@@ -17214,6 +18543,10 @@
dir = 6
},
/area/mainship/command/cic)
+"shO" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/closed/wall/mainship,
+/area/mainship/living/bridgebunks)
"sic" = (
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/spray/cleaner,
@@ -17234,6 +18567,15 @@
dir = 1
},
/area/mainship/hallways/hangar)
+"siB" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"siJ" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
@@ -17373,6 +18715,9 @@
"spa" = (
/obj/machinery/door/firedoor/mainship,
/obj/structure/window/framed/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/squads/delta)
"spV" = (
@@ -17426,6 +18771,21 @@
},
/turf/open/floor/plating/plating_catwalk,
/area/mainship/living/grunt_rnr)
+"stf" = (
+/obj/structure/window/framed/mainship/requisitions,
+/obj/machinery/door/poddoor/mainship/open{
+ id = "CIC Lockdown";
+ name = "\improper Combat Information Center Blast Door"
+ },
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/mainship/command/cic)
"stM" = (
/obj/structure/bed,
/obj/effect/landmark/start/job/pilotofficer,
@@ -17462,6 +18822,9 @@
/obj/structure/bed/stool{
pixel_y = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/grass,
/area/mainship/living/starboard_garden)
"sxD" = (
@@ -17534,13 +18897,36 @@
pixel_x = 9;
pixel_y = 7
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
+"sEO" = (
+/obj/structure/bed/chair/nometal{
+ dir = 1
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 5;
+ pixel_y = -2
+ },
+/turf/open/floor/mainship/red/full,
+/area/mainship/hallways/hangar)
"sEZ" = (
/turf/open/floor/mainship/green{
dir = 10
},
/area/mainship/squads/req)
+"sGw" = (
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/green{
+ dir = 5
+ },
+/area/mainship/squads/req)
"sGK" = (
/obj/machinery/telecomms/bus/preset_three,
/turf/open/floor/mainship/tcomms,
@@ -17555,6 +18941,14 @@
"sIX" = (
/obj/machinery/light/mainship,
/obj/machinery/computer/squad_manager,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle/short,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -6;
+ pixel_y = 11
+ },
/turf/open/floor/mainship/blue,
/area/mainship/squads/delta)
"sJd" = (
@@ -17562,6 +18956,14 @@
/obj/machinery/camera/autoname/mainship,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/living/cryo_cells)
+"sJZ" = (
+/obj/structure/window/framed/mainship/white,
+/obj/machinery/door/firedoor/mainship{
+ dir = 2
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor/plating,
+/area/mainship/medical/lower_medical)
"sLD" = (
/obj/machinery/light/mainship/small,
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
@@ -17707,6 +19109,9 @@
/area/mainship/hull/port_hull)
"sSR" = (
/obj/structure/prop/mainship/mapping_computer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/green,
/area/mainship/command/cic)
"sTe" = (
@@ -17733,11 +19138,36 @@
/obj/effect/ai_node,
/turf/open/floor/mainship/mono,
/area/mainship/hull/port_hull)
+"sWy" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/command/cic)
+"sWR" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
+"sXu" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/surgery_hallway)
"sXw" = (
/obj/machinery/computer/orbital_cannon_console,
/obj/structure/bed/chair/ob_chair,
/turf/open/floor/mainship/mono,
/area/mainship/shipboard/port_point_defense)
+"sXE" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/operating_room_four)
"sYL" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
@@ -17880,6 +19310,12 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1,
/turf/open/floor/plating/plating_catwalk,
/area/mainship/hull/port_hull)
+"til" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/space/basic,
+/area/space)
"tkF" = (
/obj/machinery/light/mainship{
dir = 1
@@ -17890,6 +19326,7 @@
/area/mainship/medical/operating_room_four)
"tkJ" = (
/obj/structure/rack,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/red/full,
/area/mainship/command/cic)
"tlq" = (
@@ -17899,12 +19336,22 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/repair_bay)
+"tmk" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/req)
"tmm" = (
/turf/open/floor/plating,
/area/mainship/living/evacuation/pod/one)
"tmp" = (
/turf/open/floor/mainship/floor,
/area/mainship/command/cic)
+"tmq" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/living/starboard_garden)
"tmP" = (
/obj/machinery/door/airlock/multi_tile/mainship/comdoor{
name = "\improper Officer's Study"
@@ -18080,6 +19527,10 @@
/obj/machinery/hydroponics,
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
+"tAW" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"tBz" = (
/turf/open/floor/mainship/silver/corner{
dir = 8
@@ -18111,6 +19562,9 @@
dir = 1
},
/obj/structure/table/mainship/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/silver{
dir = 6
},
@@ -18156,9 +19610,18 @@
dir = 8
},
/area/mainship/medical/operating_room_four)
+"tGw" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"tHw" = (
/obj/structure/window/framed/mainship/white,
/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/medical/surgery_hallway)
"tHB" = (
@@ -18261,6 +19724,9 @@
/area/mainship/command/cic)
"tMs" = (
/obj/structure/prop/mainship/mission_planning_system,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/green,
/area/mainship/command/cic)
"tMR" = (
@@ -18357,8 +19823,20 @@
},
/turf/open/floor/wood,
/area/mainship/engineering/ce_room)
+"tTM" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"tUf" = (
/obj/effect/soundplayer/deltaplayer,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship,
/area/mainship/living/starboard_garden)
"tUM" = (
@@ -18381,6 +19859,9 @@
id = "or2privacyshutter";
name = "\improper Privacy Shutters"
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/medical/operating_room_four)
"tWg" = (
@@ -18611,8 +20092,18 @@
},
/obj/structure/cable,
/obj/machinery/firealarm,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
+"unQ" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"unW" = (
/obj/structure/bed/chair/nometal{
dir = 1
@@ -18624,6 +20115,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"uqa" = (
@@ -18637,6 +20131,12 @@
/obj/item/storage/donut_box,
/turf/open/floor/wood,
/area/mainship/living/grunt_rnr)
+"urV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"utn" = (
/obj/machinery/holopad,
/turf/open/floor/mainship/floor,
@@ -18650,6 +20150,9 @@
/obj/item/reagent_containers/dropper,
/obj/item/reagent_containers/glass/beaker/large,
/obj/machinery/power/apc/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/mainship/sterile/side{
dir = 1
},
@@ -18722,6 +20225,14 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/plating,
/area/mainship/hull/port_hull)
+"uAu" = (
+/obj/structure/window/framed/mainship/white,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/mainship/medical/lower_medical)
"uBu" = (
/obj/machinery/researchcomp,
/turf/open/floor/mainship/floor,
@@ -18793,6 +20304,9 @@
/area/mainship/medical/lower_medical)
"uEK" = (
/obj/structure/window/framed/mainship/white,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"uEX" = (
@@ -18836,6 +20350,9 @@
id = "or1privacyshutter";
name = "\improper Privacy Shutters"
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/mainship/medical/operating_room_one)
"uHk" = (
@@ -18895,6 +20412,7 @@
/obj/item/ammo_magazine/pistol,
/obj/item/ammo_magazine/pistol,
/obj/item/weapon/gun/pistol/rt3,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/mono,
/area/mainship/shipboard/firing_range)
"uLM" = (
@@ -18920,6 +20438,9 @@
/area/mainship/living/cryo_cells)
"uOp" = (
/obj/machinery/bodyscanner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 8
},
@@ -18999,6 +20520,25 @@
"uVR" = (
/turf/open/floor/mainship/mono,
/area/mainship/living/grunt_rnr)
+"uWt" = (
+/obj/structure/window/framed/mainship/requisitions,
+/obj/machinery/door/poddoor/mainship/open{
+ id = "CIC Lockdown";
+ name = "\improper Combat Information Center Blast Door"
+ },
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/mainship/command/cic)
+"uWE" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"uXw" = (
/obj/machinery/power/apc/mainship,
/obj/structure/cable,
@@ -19054,6 +20594,9 @@
/area/mainship/medical/chemistry)
"uYY" = (
/obj/machinery/iv_drip,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 8
},
@@ -19112,6 +20655,9 @@
/area/mainship/living/officer_rnr)
"vfD" = (
/obj/vehicle/ridden/wheelchair,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 4
},
@@ -19152,6 +20698,9 @@
/area/mainship/shipboard/firing_range)
"vkC" = (
/obj/machinery/light/mainship,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/green{
dir = 6
},
@@ -19197,6 +20746,9 @@
/area/mainship/living/grunt_rnr)
"vpH" = (
/obj/machinery/cryopod/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/corner{
dir = 8
},
@@ -19231,6 +20783,13 @@
/area/mainship/engineering/lower_engineering)
"vrv" = (
/obj/machinery/cic_maptable,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -10;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/sterile/side{
dir = 1
},
@@ -19269,6 +20828,14 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
+"vtC" = (
+/obj/structure/window/framed/mainship,
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/mainship/squads/alpha)
"vtE" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
@@ -19397,6 +20964,12 @@
/obj/effect/spawner/random/misc/soap/regularweighted,
/turf/open/floor/mainship/mono,
/area/mainship/living/port_emb)
+"vAi" = (
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"vAo" = (
/turf/open/floor/mainship/mono,
/area/mainship/command/self_destruct)
@@ -19455,6 +21028,9 @@
/obj/machinery/camera/autoname/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"vJr" = (
@@ -19520,6 +21096,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/engineering/engine_core)
+"vQY" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/mainship/living/cryo_cells)
"vRA" = (
/obj/machinery/light/mainship{
dir = 1
@@ -19559,6 +21141,9 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/mainship/squads/alpha)
"vTn" = (
@@ -19580,6 +21165,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hull/port_hull)
+"vWp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/delta)
"vWS" = (
/obj/machinery/light/mainship/small,
/obj/structure/cable,
@@ -19635,6 +21226,13 @@
},
/turf/open/floor/wood,
/area/mainship/living/basketball)
+"wbH" = (
+/obj/machinery/door/firedoor/mainship,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/stripesquare,
+/area/mainship/hallways/port_hallway)
"wca" = (
/turf/open/floor/mainship/purple{
dir = 8
@@ -19682,6 +21280,9 @@
pixel_x = 17;
pixel_y = 16
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/silver{
dir = 6
},
@@ -19935,6 +21536,18 @@
"wFs" = (
/turf/open/floor/mainship/mono,
/area/mainship/hallways/repair_bay)
+"wGq" = (
+/obj/machinery/iv_drip,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/sterile,
+/area/mainship/medical/surgery_hallway)
+"wGy" = (
+/obj/structure/bed/chair/nometal{
+ dir = 1
+ },
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/open/floor/mainship/blue/full,
+/area/mainship/hallways/hangar)
"wGZ" = (
/obj/structure/cable,
/obj/machinery/door/airlock/mainship/maint{
@@ -20133,6 +21746,12 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/hallways/port_hallway)
+"wWR" = (
+/obj/machinery/loadout_vendor,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/misc/present,
+/turf/open/floor/mainship/floor,
+/area/mainship/squads/req)
"wXn" = (
/turf/open/floor/mainship/floor,
/area/mainship/living/pilotbunks)
@@ -20191,6 +21810,10 @@
/obj/structure/table/mainship/nometal,
/obj/item/storage/firstaid/regular,
/obj/item/shotgunbox/blank,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 10;
+ pixel_y = 9
+ },
/turf/open/floor/mainship/red{
dir = 5
},
@@ -20277,6 +21900,9 @@
"xmg" = (
/obj/structure/table/mainship/nometal,
/obj/effect/spawner/random/engineering/structure/handheld_lighting,
+/obj/item/prop/mainship/candle{
+ pixel_y = 6
+ },
/turf/open/floor/mainship/floor,
/area/mainship/hallways/repair_bay)
"xmy" = (
@@ -20325,6 +21951,9 @@
/area/mainship/command/cic)
"xpE" = (
/obj/machinery/vending/armor_supply,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/mainship/mono,
/area/mainship/squads/delta)
"xsH" = (
@@ -20361,6 +21990,10 @@
},
/turf/open/floor/mainship/mono,
/area/mainship/squads/alpha)
+"xvE" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"xwr" = (
/turf/open/floor/carpet/side{
dir = 9
@@ -20422,6 +22055,17 @@
dir = 1
},
/area/mainship/living/cafeteria_port)
+"xCy" = (
+/obj/item/radio/intercom/general,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -10;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/mono,
+/area/mainship/hallways/starboard_hallway)
"xCB" = (
/obj/effect/turf_decal/warning_stripes/thin{
dir = 1
@@ -20632,6 +22276,14 @@
/obj/machinery/light/mainship,
/turf/open/floor/mainship/orange,
/area/mainship/engineering/ce_room)
+"xUy" = (
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
+/turf/open/floor/mainship/orange{
+ dir = 1
+ },
+/area/mainship/engineering/lower_engineering)
"xUR" = (
/turf/closed/wall/mainship,
/area/mainship/living/tankerbunks)
@@ -20661,6 +22313,10 @@
/obj/machinery/door/firedoor/mainship,
/turf/open/floor/mainship/mono,
/area/mainship/hallways/bow_hallway)
+"xXm" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/white,
+/area/mainship/medical/lower_medical)
"xXY" = (
/obj/machinery/vending/marineFood,
/turf/open/floor/mainship/mono,
@@ -20718,6 +22374,15 @@
},
/turf/open/floor/mainship/ai,
/area/mainship/command/airoom)
+"yds" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/mainship/squads/alpha)
"ydD" = (
/obj/structure/closet,
/obj/item/toy/beach_ball,
@@ -20796,6 +22461,9 @@
/area/mainship/command/bridge)
"yfx" = (
/obj/machinery/computer/sleep_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"ygZ" = (
@@ -32880,14 +34548,14 @@ wPV
wPV
etF
fPA
-bYT
-eGg
-bYT
+ktk
eGg
+nsU
eGg
eGg
-bYT
eGg
+nsU
+mea
bYT
qOi
wPV
@@ -33137,7 +34805,7 @@ wPV
wPV
wPV
wPV
-pBS
+iKO
ilq
jQu
lzB
@@ -33394,7 +35062,7 @@ wPV
wPV
eAS
wPV
-pBS
+iKO
lNG
uZL
wPw
@@ -33651,7 +35319,7 @@ wPV
wPV
wPV
wPV
-pBS
+iKO
hqL
tmp
tmp
@@ -33908,7 +35576,7 @@ wPV
wPV
eFi
fPA
-bYT
+dPg
snR
dQd
kWU
@@ -34165,7 +35833,7 @@ wPV
arE
wPV
wPV
-pBS
+iKO
gtL
tmp
lEm
@@ -34419,10 +36087,10 @@ aaa
aai
bXg
bXg
-bYT
+ktk
eGg
eGg
-bYT
+dOw
vTS
jVh
smS
@@ -34430,9 +36098,9 @@ bku
bky
oeS
bMz
-inF
-eGg
+moS
eGg
+mea
bYT
uyS
uyS
@@ -34676,7 +36344,7 @@ aaa
aai
acg
goT
-inF
+agL
cxa
lSf
bmw
@@ -35190,7 +36858,7 @@ aaa
aai
acg
tDH
-inF
+agL
rDz
rDz
inF
@@ -35201,9 +36869,9 @@ wPw
lkZ
bzs
exI
-inF
-rDz
-rDz
+gNq
+stf
+pId
inF
wem
aVu
@@ -35447,7 +37115,7 @@ aaa
aai
acg
tDH
-inF
+agL
hwd
fYK
hjo
@@ -35704,7 +37372,7 @@ aaa
aai
bXK
tDH
-inF
+agL
fxh
wSO
daP
@@ -35961,7 +37629,7 @@ aai
aai
acg
tDH
-inF
+agL
inF
wYt
inF
@@ -35974,7 +37642,7 @@ ofA
tZK
rJg
wYt
-inF
+pbs
inF
wem
aVu
@@ -36218,7 +37886,7 @@ rbR
adM
aal
tDH
-inF
+agL
eMi
wVv
hjB
@@ -36475,7 +38143,7 @@ aap
aap
acg
acg
-inF
+agL
gxh
uPt
hvT
@@ -36732,20 +38400,20 @@ tmm
aap
bXL
inF
-inF
-inF
-inF
-inF
-inF
-rDz
+cna
+qDJ
+qDJ
+qDJ
+qDJ
+uWt
pTq
-rDz
+uWt
lto
-rDz
-inF
-inF
-inF
-inF
+uWt
+qDJ
+qDJ
+qDJ
+sWy
inF
inF
vTQ
@@ -36993,10 +38661,10 @@ cKR
seI
fZc
hjX
-inF
+jYp
kpc
pYe
-lSf
+qyV
dLf
ogw
inF
@@ -37764,7 +39432,7 @@ dFd
phs
xdr
hqs
-inF
+jYp
ksb
pYe
xpp
@@ -39302,7 +40970,7 @@ bji
fCV
fCV
tdp
-ozi
+avU
nNM
tdp
wRe
@@ -39563,7 +41231,7 @@ cGf
uyz
xUR
lod
-vGR
+kac
vGR
dkd
xUR
@@ -39823,7 +41491,7 @@ mVM
vGR
vGR
jFP
-xUR
+rMg
bEk
uyz
xUR
@@ -42150,7 +43818,7 @@ htp
vDT
lOP
lvI
-abR
+oAd
xwJ
sMo
gWC
@@ -42375,7 +44043,7 @@ rbR
bgb
bea
bea
-gfg
+rTe
bGr
ifv
beU
@@ -43178,7 +44846,7 @@ hHM
sim
lOP
vSJ
-abR
+oAd
abR
uym
abR
@@ -45221,11 +46889,11 @@ hrn
bgb
dwy
uns
-rMK
+rXE
sMI
lvI
umS
-umS
+sEO
xir
xir
uGA
@@ -45478,11 +47146,11 @@ nsk
bgb
lsl
uns
-rMK
+lgq
sMI
bWx
umS
-unW
+wGy
xir
xjj
uns
@@ -45714,7 +47382,7 @@ aaa
aai
aak
bgb
-bgb
+iZv
kMC
kMC
kMC
@@ -45735,11 +47403,11 @@ lol
bgb
qyD
uns
-rMK
+frG
sMI
lvI
unW
-unW
+hRx
xjj
xjj
uGh
@@ -45992,7 +47660,7 @@ rtt
yay
lcy
uns
-rMK
+rXE
sMI
lvI
unW
@@ -47262,7 +48930,7 @@ aUC
aUC
adm
bqK
-blt
+fbx
brp
wxQ
uGB
@@ -48804,7 +50472,7 @@ byG
fLr
adp
vuE
-blt
+fbx
bIy
wxQ
uGB
@@ -50350,35 +52018,35 @@ pES
pES
eiT
cfd
-eiT
-blQ
-blQ
-blQ
-blQ
-blQ
-blQ
-nSl
+klG
+bRX
+bRX
+bRX
+bRX
+bRX
+mVK
+ryt
bRU
lXa
-nSl
+kow
bRU
lXa
-nSl
-bsC
-bsC
-bsC
-bsC
-bsC
-bsC
-tWg
+diK
+lUz
+lUz
+lUz
+lUz
+lUz
+fEa
+wbH
aCq
tWg
-acf
-acf
-acf
-acf
-acf
-acf
+tmq
+aNS
+aNS
+aNS
+aNS
+cAl
acf
jNc
jNc
@@ -50607,13 +52275,13 @@ byi
pES
bQZ
gYz
-blj
+ikm
blQ
cdt
dpd
flf
gPy
-blQ
+lIL
jdE
wsC
iOS
@@ -50626,7 +52294,7 @@ rpx
sni
tGe
uIw
-bsC
+jur
nsv
dzn
ruj
@@ -50635,7 +52303,7 @@ qMi
vhL
pPG
aGC
-pPG
+eRJ
acf
bSe
jNc
@@ -50864,13 +52532,13 @@ xGP
bJe
biu
gYz
-biu
+amb
blQ
bnn
bqN
hBs
lzV
-blQ
+lIL
nRc
iGu
iGu
@@ -50883,7 +52551,7 @@ aei
sOM
bMl
uEg
-bsC
+jur
kuC
bQh
ruj
@@ -51121,13 +52789,13 @@ iVL
ojD
bRC
bTQ
-biu
+amb
blQ
xUf
bqN
niM
aeH
-blQ
+lIL
tqR
iGu
ljk
@@ -51140,7 +52808,7 @@ tkF
wNU
bMl
bMg
-bsC
+jur
xCa
uHW
rBm
@@ -51149,7 +52817,7 @@ rpv
aca
jkR
aeB
-pPG
+eRJ
acf
cbT
iwt
@@ -51378,13 +53046,13 @@ gjx
pES
aoU
bjU
-biu
+amb
blQ
boP
dBR
boT
rJr
-blQ
+gZv
eNZ
ljk
wsC
@@ -51397,7 +53065,7 @@ bsG
bKI
tHD
bMh
-bsC
+jur
osZ
dzn
ruj
@@ -51635,13 +53303,13 @@ hdP
bJw
aLX
bjU
-blj
-blQ
-blQ
+ikm
+sgh
+njF
uGF
bjE
uGF
-blQ
+fMl
vrv
bRU
bDb
@@ -51649,21 +53317,21 @@ uBZ
bDb
ost
aVN
-bsC
+lsV
tVY
bvL
tVY
-bsC
-bsC
+sXE
+jur
nsv
dzn
bWC
tUf
-acf
-acf
-acf
-acf
-acf
+bge
+bge
+bge
+bge
+eVG
acf
gaW
jNc
@@ -51892,8 +53560,8 @@ gpq
kmW
biu
bjV
-biu
-nSl
+amb
+xXm
cdX
bGZ
lMe
@@ -51911,7 +53579,7 @@ bJC
lMe
bGZ
uOp
-nSl
+xXm
qhN
dzn
ruj
@@ -52149,8 +53817,8 @@ hdP
pES
ayo
bTZ
-acw
-wyX
+nlp
+man
boR
iGu
lMe
@@ -52168,7 +53836,7 @@ iGu
lMe
iGu
bMk
-nga
+sJZ
rbP
rMd
eeo
@@ -52176,7 +53844,7 @@ kVk
jNc
bSD
rsG
-jNc
+shO
soQ
nJN
mjF
@@ -52920,26 +54588,26 @@ gpq
pES
hjE
bjV
-biu
-nSl
+amb
+uWE
wyX
nBH
uEK
-nSl
+bar
bxw
iZI
cbA
-nSl
-nSl
-mUE
-mUE
-mUE
-nSl
-nSl
+bar
+bar
+uAu
+uAu
+uAu
+bar
+lMB
qos
kpy
-qvb
-nga
+ifc
+sJZ
ruj
bQh
ruj
@@ -53177,7 +54845,7 @@ hdP
pES
bQZ
bjV
-blj
+ikm
nSl
ndj
ufX
@@ -53196,7 +54864,7 @@ nSl
xAX
ubo
mUE
-nSl
+xXm
nsv
bQh
ruj
@@ -53432,10 +55100,10 @@ xkA
xkA
gpq
kmW
-biu
+gqp
bjV
-biu
-nSl
+amb
+xXm
cjV
dKa
hSb
@@ -53449,11 +55117,11 @@ iCy
iCy
iCy
vzs
-nSl
+xXm
uXw
iOS
uYY
-nSl
+xXm
ruj
bQh
bWC
@@ -53689,10 +55357,10 @@ xkA
xkA
hdP
pES
-aLX
+psH
bjV
-biu
-nSl
+amb
+xXm
oxk
bqR
qmn
@@ -53710,7 +55378,7 @@ rxv
dDa
iGu
qys
-nSl
+xXm
ruj
sjN
mft
@@ -53946,10 +55614,10 @@ aZh
aZh
bAa
pES
-jQk
+xCy
bjV
-biu
-nSl
+amb
+xXm
boX
axx
pdH
@@ -53963,11 +55631,11 @@ iCy
euA
dEc
qAK
-nSl
+xXm
eAQ
ueJ
bMp
-nSl
+xXm
ruj
nQl
ruj
@@ -54205,8 +55873,8 @@ cxp
bJe
ayo
bTZ
-acw
-nSl
+nlp
+xXm
oxk
dMY
fpV
@@ -54217,14 +55885,14 @@ hZh
blP
eJo
iCy
-ttY
+wGq
jkH
hNH
-nSl
+xXm
eWQ
avl
qys
-nSl
+xXm
rbP
wVB
eeo
@@ -54462,26 +56130,26 @@ dEu
bLt
bRP
bTQ
-blj
-nSl
+ikm
+xXm
xCj
yea
pdH
-nga
+qmU
utq
qgb
-esS
+aNv
blP
oxc
buD
mqf
buD
xoW
-nSl
+xXm
csh
iGu
bMp
-nSl
+xXm
nsv
bQh
ruj
@@ -54719,12 +56387,12 @@ tpX
pES
hjE
bjV
-biu
-nSl
+amb
+xXm
kFq
aJS
rRE
-nSl
+xXm
uYN
vmj
fmx
@@ -54734,11 +56402,11 @@ buD
dEc
buD
bHo
-nSl
+xXm
mdD
ufH
qys
-nSl
+xXm
ruj
bQh
ruj
@@ -54976,12 +56644,12 @@ pES
pES
aLX
bjV
-biu
+amb
nSl
nSl
nBH
nSl
-nSl
+xXm
gCW
vmj
jsN
@@ -54991,11 +56659,11 @@ oaf
dEc
oaf
uyP
-nSl
+xXm
acB
kpy
vfD
-nSl
+xXm
osZ
bQh
bWC
@@ -55233,26 +56901,26 @@ adu
bLD
bRC
buH
-biu
-blP
+amb
+jTA
cjW
sZN
fqH
-blP
+sXu
blP
lAF
-blP
-blP
-blP
+eTT
+nBY
+nBY
tHw
oPm
tHw
-blP
-nSl
+nBY
+cSd
xAX
ubo
nSl
-nSl
+xXm
qhN
gfn
ruj
@@ -55490,8 +57158,8 @@ aXm
aXm
uJR
bjV
-biu
-blP
+amb
+jTA
bog
sZN
bKB
@@ -55509,7 +57177,7 @@ gUG
soO
bKB
vpH
-blP
+jTA
ruj
bQh
jVY
@@ -55747,8 +57415,8 @@ bAr
fxw
biu
bjV
-biu
-blP
+amb
+jTA
vyW
dOe
dxe
@@ -55766,7 +57434,7 @@ rAT
xik
uiP
mDH
-blP
+jTA
ruj
bQh
bne
@@ -56004,11 +57672,11 @@ abx
fxw
biu
bjV
-biu
-blP
-blP
-blP
-blP
+amb
+lcb
+nUW
+nUW
+oFZ
dEc
bKF
jsp
@@ -56023,7 +57691,7 @@ riu
riu
afU
rwd
-blP
+jTA
rbP
rMd
eeo
@@ -56261,26 +57929,26 @@ uKu
fxw
ayo
bke
-acw
+nlp
blP
cow
dPz
-blP
+lcb
gUL
-blP
-blP
+nUW
+nUW
sSi
bAt
-alz
+bHR
ozv
oPN
-alz
-blP
+bHR
+nUW
buq
-wpN
+lwy
sgw
lrU
-blP
+jTA
ruj
bQh
ruj
@@ -56518,7 +58186,7 @@ vvd
fxw
biu
bjV
-biu
+amb
blP
dIX
bqX
@@ -56537,7 +58205,7 @@ dWR
wpN
sgw
sqz
-blP
+jTA
ruj
bQh
bWC
@@ -56775,7 +58443,7 @@ uDw
aXm
aLX
bjV
-biu
+amb
blP
ckd
ckd
@@ -56794,7 +58462,7 @@ fjk
wpN
sgw
ilx
-blP
+jTA
ruj
bQh
dfz
@@ -57032,7 +58700,7 @@ tJw
bMr
biu
bjV
-biu
+amb
blP
blP
blP
@@ -57051,7 +58719,7 @@ blP
vvn
fLm
blP
-blP
+jTA
ruj
bQh
ruj
@@ -57289,7 +58957,7 @@ tur
ael
bSh
bUd
-biu
+amb
alz
cqq
qHh
@@ -57546,7 +59214,7 @@ kjG
aXm
uJR
bjV
-biu
+amb
alz
uYE
eEf
@@ -57803,7 +59471,7 @@ hEk
fxw
biu
bjV
-biu
+amb
bBI
nNB
nNB
@@ -57822,7 +59490,7 @@ aNh
kxp
fAJ
aNh
-fAJ
+epI
ruj
bQv
jVY
@@ -58060,7 +59728,7 @@ aXm
aXm
bQZ
bjV
-biu
+amb
bBI
wqU
ebt
@@ -58079,7 +59747,7 @@ bCF
mKj
dJm
lth
-fAJ
+epI
qhN
bQv
bWC
@@ -58317,7 +59985,7 @@ bBz
aXM
aoU
bjV
-biu
+amb
bBI
ars
fnC
@@ -58336,7 +60004,7 @@ vts
dEE
wnT
eLZ
-aNh
+epQ
ruj
bQv
ruj
@@ -58574,7 +60242,7 @@ jeN
aXM
ayo
bke
-acw
+nlp
bBI
wEQ
bEM
@@ -58593,7 +60261,7 @@ jDa
cJu
hrH
vyn
-aNh
+epQ
rbP
rMd
eeo
@@ -58831,7 +60499,7 @@ buS
aXM
aLX
bjV
-biu
+amb
bBI
cmC
fnC
@@ -58850,7 +60518,7 @@ kic
eSg
vzx
dHq
-fAJ
+epI
ruj
bQv
ruj
@@ -59063,7 +60731,7 @@ aaa
aaa
aaa
aaa
-aaa
+til
aaa
aaa
aaa
@@ -59088,7 +60756,7 @@ rQH
aXM
jQk
krL
-biu
+amb
bBI
jhu
elP
@@ -59107,7 +60775,7 @@ bUZ
uvF
dMz
obD
-fAJ
+epI
kuC
bQv
ruj
@@ -59345,26 +61013,26 @@ sLN
aXM
uJR
bjV
-biu
-bBI
-bBI
-bBI
-bBI
-bBI
-bBI
-alz
-alz
-alz
-alz
-alz
-alz
-alz
-fAJ
-fAJ
-fAJ
-fAJ
-fAJ
-fAJ
+fKl
+qMn
+qMn
+qMn
+qMn
+qMn
+qMn
+sbM
+sbM
+sbM
+sbM
+sbM
+sbM
+sbM
+cWk
+cWk
+cWk
+cWk
+cWk
+nSg
ruj
bQv
bne
@@ -59616,11 +61284,11 @@ rkB
poF
rjC
jMY
-iWe
+hYL
hfD
eby
erX
-cxA
+qTT
wCe
ruj
bQv
@@ -60126,10 +61794,10 @@ bAG
dIe
bpq
kxd
-aat
-bpq
+fWV
+sGw
kxd
-dIe
+wWR
bDM
seG
vEt
@@ -60638,7 +62306,7 @@ lNr
lNr
abX
otD
-dls
+aWq
sEZ
bzq
dls
@@ -60872,18 +62540,18 @@ aaa
aaa
aai
rbR
-aWH
-aWH
+xvE
+hmh
aAY
aAY
aAY
-aWH
+hmh
qCJ
ntI
-aWH
-aAY
+hmh
aAY
aAY
+vtC
aWH
aLX
krL
@@ -60910,18 +62578,18 @@ msT
ruj
gVb
bWC
-cbn
+ffE
spa
spa
spa
-cbn
+ghV
dEs
jsv
-cbn
+ghV
spa
spa
spa
-cbn
+lex
cbn
fZA
aVk
@@ -61129,7 +62797,7 @@ aaa
aaa
aai
rbR
-aWH
+unQ
bJY
bQk
bQk
@@ -61144,12 +62812,12 @@ jwy
aWH
uJR
bjV
-biu
-bnF
+urV
+lSs
seG
bKP
-bnF
-bnF
+lSs
+fJa
bnE
seG
seG
@@ -61157,17 +62825,17 @@ bAG
nGK
aVh
seG
-seG
+pYk
seG
mxf
wgD
wgD
qiL
-bnF
+exg
kuC
bQw
jVY
-cbn
+tAW
bQH
pGn
pGn
@@ -61386,7 +63054,7 @@ aaa
aaa
aai
tDH
-aWH
+unQ
arJ
aZO
aaU
@@ -61406,25 +63074,25 @@ ult
vaF
bAG
bGj
-bnF
+nAo
kvt
seG
-seG
+nRH
kzX
acj
-vaF
-seG
+ruL
seG
+mUW
mBt
-bnF
+lSs
kfp
kfp
vYx
-bnF
+fJa
ext
bQw
ruj
-cbn
+tAW
mmE
bZQ
awz
@@ -61643,11 +63311,11 @@ aaa
aaa
aai
tDH
-aWH
-aWH
-aWH
-aWH
-aWH
+fpo
+yds
+yds
+siB
+nFv
blS
abg
kMY
@@ -61663,7 +63331,7 @@ seG
jFn
bAG
bsU
-bnF
+nAo
bwe
bsV
bPT
@@ -61677,11 +63345,11 @@ bnF
haI
nQq
abt
-nMf
+gnn
rbP
rMd
eeo
-cbn
+tAW
mmE
tBV
iLV
@@ -61689,10 +63357,10 @@ ktN
sVt
vJr
xpE
-cbn
-cbn
-cbn
-cbn
+aAW
+qVt
+qVt
+hWc
cbn
wem
aVk
@@ -61900,11 +63568,11 @@ aaa
aaa
aai
tDH
-aWH
+unQ
aWO
bdv
aXY
-aWH
+unQ
bpD
abg
iJv
@@ -61915,8 +63583,8 @@ jwy
aWH
biu
bjV
-biu
-bnF
+amb
+exg
nYL
kzX
acj
@@ -61938,7 +63606,7 @@ irZ
ruj
bQw
ruj
-cbn
+tAW
wLT
pGn
pGn
@@ -61946,7 +63614,7 @@ pGn
utn
vJr
ezg
-cbn
+tAW
cef
cdQ
oYB
@@ -62157,7 +63825,7 @@ aaa
aaa
aai
rbR
-aWH
+unQ
oBV
iJv
cKy
@@ -62172,7 +63840,7 @@ vTf
aWH
biu
bjV
-biu
+amb
wcO
bpq
bnD
@@ -62191,11 +63859,11 @@ bnF
cnU
hFj
nfz
-nMf
+gnn
ruj
bQw
ruj
-cbn
+tAW
mmE
bZQ
awz
@@ -62414,11 +64082,11 @@ aaa
aaa
aai
aaC
-aWH
+unQ
aWO
bQr
-aXY
-aWH
+ayq
+unQ
bSQ
abg
bjP
@@ -62429,12 +64097,12 @@ oaW
aWH
biu
bjV
-biu
+amb
wcO
adg
aGL
bGm
-wcO
+jBT
bDM
buI
xhL
@@ -62448,11 +64116,11 @@ nMf
bJL
pBI
bMB
-bnF
+nAo
qhN
bQw
bWC
-cbn
+tAW
mmE
tBV
iLV
@@ -62460,7 +64128,7 @@ laz
mMr
vJr
ccT
-cbn
+tAW
cef
aXI
oYB
@@ -62671,11 +64339,11 @@ aaa
aaa
aai
rbR
-aWH
-aWH
-aWH
-aWH
-aWH
+sWR
+tTM
+tTM
+osJ
+cBm
bri
abg
iJv
@@ -62686,12 +64354,12 @@ jwy
bAg
biu
bjV
-blj
-bnF
-bnF
-wcO
-bnF
-bnF
+bod
+tmk
+tmk
+kwm
+tmk
+mIy
bpn
jiv
xhL
@@ -62700,12 +64368,12 @@ xhL
xhL
xhL
bAK
-rbv
-bnF
-bnF
-bnF
-bnF
-bnF
+kDM
+tmk
+tmk
+tmk
+tmk
+mIy
nsv
bQw
ruj
@@ -62714,13 +64382,13 @@ wLT
pGn
pGn
pGn
-pGn
+fdE
vJr
cec
-cbn
-cbn
-cbn
-cbn
+gIZ
+qVt
+qVt
+hWc
cbn
jAD
aVk
@@ -62928,11 +64596,11 @@ aaa
aaa
aai
tDH
-aWH
+unQ
aWN
bdv
aMk
-aWH
+unQ
aTT
aad
bCp
@@ -62966,7 +64634,7 @@ acj
ruj
hIv
ruj
-cbn
+tAW
mmE
bZQ
awz
@@ -62974,7 +64642,7 @@ ktN
acX
adI
aRC
-cbn
+tAW
ceg
cdQ
ceh
@@ -63185,7 +64853,7 @@ aaa
aaa
aai
aaj
-aWH
+unQ
aCI
iJv
iJv
@@ -63223,7 +64891,7 @@ acn
jJv
lPI
bne
-cbn
+tAW
mmE
tBV
iLV
@@ -63442,12 +65110,12 @@ aaa
aaa
aai
tDH
-aWH
+unQ
aWN
bQr
-aMk
-aWH
-bSQ
+hRp
+unQ
+lZB
aae
cgD
iJv
@@ -63480,15 +65148,15 @@ bnD
ruj
bQw
ruj
-cbn
+tAW
wLT
pGn
pGn
pGn
acZ
adW
-ccT
-cbn
+iMk
+tAW
ceg
aXI
ceh
@@ -63699,11 +65367,11 @@ aaa
aaa
aai
rbR
-aWH
-aWH
-aWH
-aWH
-aWH
+sWR
+tTM
+tTM
+osJ
+cBm
blS
aaf
kMY
@@ -63715,40 +65383,40 @@ aWH
jQk
bjV
biu
-bnF
-bnF
+qJi
+tmk
aAP
-bnF
-bnF
-bnF
-bnF
-jiQ
-jiQ
+tmk
+tmk
+tmk
+tmk
+frX
+frX
jiQ
-jiQ
-jiQ
-bnF
-bnF
-bnF
-bnF
+frX
+frX
+tmk
+qwl
+qJi
+tmk
twq
-bnF
+qwl
bnF
ruj
bQw
ruj
-cbn
+tAW
mmE
bZQ
awz
laz
ada
vJr
-xpE
-cbn
-cbn
-cbn
-cbn
+hsQ
+pgm
+qVt
+qVt
+hWc
cbn
fZA
aVk
@@ -63956,11 +65624,11 @@ aaa
aaa
aai
aak
-aWH
+unQ
aWR
bdv
aZi
-aWH
+unQ
wJn
aaf
kMY
@@ -63972,7 +65640,7 @@ aWH
biu
bjV
blj
-bnF
+nAo
bpx
pqU
iWe
@@ -63986,15 +65654,15 @@ vby
oXg
vfW
rws
-bnF
+nAo
tMR
svt
-tMR
+iOq
bnF
nsv
bQw
bWC
-cbn
+tAW
mmE
tBV
iLV
@@ -64002,7 +65670,7 @@ laz
ada
vJr
ezg
-cbn
+tAW
cej
cdQ
cek
@@ -64213,7 +65881,7 @@ aaa
aaa
aai
rbR
-aWH
+unQ
aWQ
iJv
iJv
@@ -64229,7 +65897,7 @@ aWH
ayo
bke
acw
-bnF
+nAo
rZT
dop
iWe
@@ -64243,7 +65911,7 @@ eBv
vnI
iWe
adV
-bnF
+nAo
bJN
wfH
abv
@@ -64251,7 +65919,7 @@ bnF
rbP
rMd
eeo
-cbn
+tAW
wLT
pGn
pGn
@@ -64470,11 +66138,11 @@ aaa
aaa
aai
tDH
-aWH
+unQ
aWR
bQr
-aZi
-aWH
+giw
+unQ
eGf
jZv
bjP
@@ -64486,7 +66154,7 @@ aWH
hjE
bjV
biu
-bnF
+nAo
bpz
brn
fTB
@@ -64500,7 +66168,7 @@ vby
oXg
iWe
lDM
-bnF
+nAo
bJN
svt
bMH
@@ -64508,7 +66176,7 @@ bnF
ext
bQw
ruj
-cbn
+tAW
mmE
bZQ
awz
@@ -64516,7 +66184,7 @@ ktN
ada
vJr
sIX
-cbn
+tAW
cej
aXI
cek
@@ -64727,11 +66395,11 @@ aaa
aaa
aai
tDH
-aWH
-aWH
-aWH
-aWH
-aWH
+sWR
+tTM
+tTM
+osJ
+unQ
bri
jZv
kMY
@@ -64743,7 +66411,7 @@ aWH
mRy
bjV
biu
-bnF
+nAo
oiS
xZq
iiq
@@ -64757,7 +66425,7 @@ vby
oXg
iWe
abz
-bnF
+nAo
bJO
gDo
bMI
@@ -64765,18 +66433,18 @@ bnF
uXD
bQw
ruj
-cbn
+tAW
mmE
tBV
iLV
ktN
ada
-vJr
+ruQ
cec
-cbn
-cbn
-cbn
-cbn
+gIZ
+qVt
+qVt
+hWc
cbn
qae
aVk
@@ -64984,7 +66652,7 @@ aaa
aaa
aai
tDH
-aWH
+unQ
hOm
ack
iJv
@@ -65000,7 +66668,7 @@ aWH
biu
bjV
blj
-bnF
+nAo
bpw
qxm
iWe
@@ -65022,7 +66690,7 @@ bnF
nsv
bQA
ruj
-cbn
+tAW
wLT
pGn
pGn
@@ -65241,11 +66909,11 @@ aaa
aaa
aai
rbR
-aWH
+unQ
xvC
bQr
bcx
-aWH
+unQ
bsT
kNB
kMY
@@ -65257,7 +66925,7 @@ aWH
aLX
bjV
biu
-bnF
+nAo
bpx
bro
sic
@@ -65271,7 +66939,7 @@ aat
mzi
may
jnG
-bnF
+nAo
bJP
wMx
bMK
@@ -65279,7 +66947,7 @@ bnF
kuC
bQA
bWC
-cbn
+tAW
mmE
ruy
awz
@@ -65287,7 +66955,7 @@ cei
tvp
xQt
dIf
-cbn
+tAW
cen
aXI
cdT
@@ -65498,56 +67166,56 @@ aaZ
aaZ
aai
bQl
-aWH
-aWH
-aWH
-aWH
-aWH
-aWH
+oFF
+jrv
+jrv
+eWA
+oFF
+jrv
lEo
ntI
-aWH
-aAY
-aAY
-aAY
+jrv
+ggQ
+ggQ
+brG
aWH
bBp
bTL
eiT
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
+vQY
+icU
+icU
+icU
+icU
+icU
+icU
+icU
+icU
dHI
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
-blZ
+icU
+icU
+icU
+ick
+vQY
+icU
+icU
+ick
blZ
tWg
oxX
tWg
-cbn
-spa
-spa
-spa
-cbn
+kNT
+qDK
+qDK
+qDK
+vWp
aKc
jsv
-cbn
-cbn
-cbn
-cbn
-cbn
+bgr
+kNT
+vWp
+vWp
+bgr
cbn
eEW
aVk
@@ -66806,11 +68474,11 @@ lBB
kyh
bpO
eyd
-blZ
+vAi
mGz
lxE
byj
-blZ
+qXe
sJd
bpN
bnK
@@ -68369,7 +70037,7 @@ bSV
bUI
bUL
ngm
-bYf
+gdF
rnS
bRQ
fZA
@@ -68605,11 +70273,11 @@ bpO
kyh
bpO
aMM
-blZ
+tGw
mGz
bCg
mGz
-blZ
+qXe
aMV
bpO
kyh
@@ -70130,7 +71798,7 @@ bfU
rbR
adj
nUz
-bhJ
+ogv
tgF
lBr
qVQ
@@ -70916,7 +72584,7 @@ hSf
cUz
oXT
bhO
-bjs
+xUy
btp
bys
bys
@@ -75799,7 +77467,7 @@ xON
vHF
bvd
qMa
-vAo
+qzZ
avW
axm
auo
@@ -75807,7 +77475,7 @@ aBa
auo
axm
avW
-vAo
+bje
qMa
bvd
vHF
@@ -77855,7 +79523,7 @@ xON
vXG
oka
qMa
-vAo
+nuG
hlj
auq
vAo
@@ -77863,7 +79531,7 @@ pZA
vAo
auq
hlj
-vAo
+nnc
qMa
oka
vXG
diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm
index ca840b689c4f2..21aa0cb9eb535 100644
--- a/_maps/map_files/generic/Admin_Level.dmm
+++ b/_maps/map_files/generic/Admin_Level.dmm
@@ -534,6 +534,11 @@
},
/turf/closed/wall,
/area/centcom/valhalla)
+"aEz" = (
+/obj/machinery/status_display,
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/tdome)
"aFd" = (
/obj/structure/table,
/obj/item/clipboard,
@@ -650,6 +655,15 @@
},
/turf/open/floor/wood,
/area/centcom/valhalla)
+"aLt" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"aLR" = (
/obj/structure/girder,
/turf/open/floor/plating/ground/mars/random/cave,
@@ -720,6 +734,19 @@
},
/turf/open/floor/plating,
/area/centcom/valhalla)
+"aPX" = (
+/obj/item/a_gift/anything{
+ pixel_x = 1;
+ pixel_y = -4
+ },
+/obj/item/a_gift/anything{
+ pixel_y = 9
+ },
+/obj/item/a_gift/anything{
+ pixel_x = 10
+ },
+/turf/open/floor/podhatch/floor,
+/area/tdome)
"aQE" = (
/obj/effect/turf_decal/warning_stripes/thick{
dir = 5
@@ -781,6 +808,12 @@
},
/turf/open/floor/wood,
/area/centcom/valhalla)
+"aVa" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/floor/plating,
+/area/tdome)
"aVk" = (
/obj/machinery/door/airlock/mainship/generic/bathroom,
/turf/open/floor/mainship/sterile/white,
@@ -1003,6 +1036,7 @@
/obj/item/reagent_containers/food/drinks/britcup,
/obj/effect/spawner/random/food_or_drink/drink_alcohol_bottle,
/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"bcQ" = (
@@ -1374,6 +1408,12 @@
/obj/effect/turf_decal/warning_stripes/thick,
/turf/open/floor/tile/lightred,
/area/centcom/valhalla)
+"bHZ" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"bIy" = (
/obj/machinery/status_display,
/turf/closed/wall/r_wall,
@@ -1815,12 +1855,22 @@
pixel_y = 1
},
/obj/effect/ai_node,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 1
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"cre" = (
/obj/machinery/marine_selector/gear/commander/valhalla,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"crp" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/tdome)
"crv" = (
/obj/machinery/firealarm{
dir = 1
@@ -2082,6 +2132,9 @@
/obj/item/explosive/grenade/chem_grenade/cleaner,
/obj/item/explosive/grenade/chem_grenade/cleaner,
/obj/structure/table,
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 5
+ },
/turf/open/floor/tile/red/yellowfull,
/area/tdome/tdomeadmin)
"cGi" = (
@@ -2207,6 +2260,9 @@
pixel_x = 2
},
/obj/effect/ai_node,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"cNB" = (
@@ -3707,6 +3763,15 @@
/obj/structure/closet/emcloset,
/turf/open/floor/tile/neutral,
/area/centcom/valhalla)
+"eSX" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 5;
+ pixel_y = 4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/wood,
+/area/tdome/tdomeobserve)
"eTf" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/turf/open/floor/tile/escape{
@@ -4035,6 +4100,14 @@
/obj/machinery/chem_master/condimaster,
/turf/open/floor/wood,
/area/tdome/tdomeobserve)
+"fsA" = (
+/obj/structure/rack/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/effect/spawner/random_set/christmas_costume,
+/turf/open/floor/plating,
+/area/tdome)
"fti" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -4137,6 +4210,11 @@
dir = 5
},
/area/centcom/valhalla)
+"fCL" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/wood,
+/area/tdome/tdomeobserve)
"fCR" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
@@ -4156,6 +4234,12 @@
},
/turf/open/floor/tile/neutral/corner,
/area/centcom/valhalla)
+"fFT" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"fHt" = (
/turf/open/floor/tile/neutral/corner{
dir = 8
@@ -4592,6 +4676,10 @@
pixel_x = -4;
pixel_y = 5
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 5
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"gje" = (
@@ -4989,6 +5077,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 5
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 5
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"gJS" = (
@@ -5174,6 +5265,7 @@
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/soup/milosoup,
/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"hda" = (
@@ -5239,6 +5331,10 @@
pixel_x = 2;
pixel_y = 5
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2;
+ pixel_y = 5
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"hhR" = (
@@ -6754,6 +6850,10 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
+"jxM" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship,
+/area/tdome)
"jxN" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
@@ -6901,6 +7001,13 @@
},
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"jGb" = (
+/obj/structure/rack/nometal,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/plating,
+/area/tdome)
"jGs" = (
/obj/structure/table,
/obj/item/reagent_containers/syringe{
@@ -6988,6 +7095,15 @@
/obj/effect/landmark/itemspawner/highlander,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"jMD" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"jMW" = (
/obj/machinery/firealarm{
dir = 1
@@ -7191,6 +7307,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 2
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 2
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"jZh" = (
@@ -7305,6 +7424,7 @@
/area/centcom/valhalla)
"keG" = (
/obj/structure/table,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/tile/red/yellowfull,
/area/tdome/tdomeadmin)
"keP" = (
@@ -7424,6 +7544,12 @@
/obj/structure/bed/chair/wood/wings,
/turf/open/floor/wood,
/area/tdome/tdomeobserve)
+"kmH" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"knm" = (
/obj/structure/window/framed/colony/reinforced/hull,
/turf/open/floor/tile/dark/gray,
@@ -7541,6 +7667,22 @@
},
/turf/open/floor/freezer,
/area/centcom/valhalla)
+"ktL" = (
+/obj/item/a_gift/anything{
+ pixel_x = 3;
+ pixel_y = -6
+ },
+/obj/item/a_gift/anything{
+ pixel_x = -6;
+ pixel_y = -6
+ },
+/obj/item/a_gift/anything{
+ pixel_x = 3;
+ pixel_y = 3
+ },
+/obj/item/a_gift/anything,
+/turf/open/floor/podhatch/floor,
+/area/tdome)
"kuq" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/structure/closet/crate,
@@ -7723,6 +7865,12 @@
/obj/effect/landmark/itemspawner/fakewizard,
/turf/open/floor/tile/dark,
/area/centcom/valhalla)
+"kJr" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"kJw" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/ai_node,
@@ -7788,6 +7936,15 @@
/obj/effect/turf_decal/sandytile/sandyplating,
/turf/open/floor/plating/ironsand,
/area/centcom/valhalla/exterior)
+"kPp" = (
+/obj/structure/table/wood,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -5;
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/wood,
+/area/tdome/tdomeobserve)
"kPK" = (
/obj/structure/table,
/obj/item/storage/box/gloves{
@@ -8056,6 +8213,10 @@
pixel_x = -2;
pixel_y = 7
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 7
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"lmF" = (
@@ -8101,6 +8262,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 2
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 2
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"lof" = (
@@ -8334,6 +8498,15 @@
/obj/item/flashlight,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"lMS" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"lMV" = (
/obj/effect/turf_decal/warning_stripes/thick/corner{
dir = 4
@@ -8394,6 +8567,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 5
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 5
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"lPX" = (
@@ -8480,6 +8656,15 @@
},
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"lZb" = (
+/obj/structure/window/framed/mainship/hull,
+/obj/effect/forcefield{
+ desc = "You can't get in. Heh.";
+ name = "Blocker"
+ },
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor,
+/area/tdome)
"lZp" = (
/obj/structure/bed,
/obj/item/bedsheet/blue,
@@ -9066,6 +9251,16 @@
/obj/item/storage/box/lights/mixed,
/turf/open/floor/plating,
/area/centcom/valhalla)
+"mUh" = (
+/obj/structure/window/framed/mainship/hull,
+/obj/effect/forcefield{
+ desc = "You can't get in. Heh.";
+ name = "Blocker"
+ },
+/obj/structure/disposalpipe/segment,
+/obj/structure/prop/holidays/string_lights,
+/turf/open/floor,
+/area/tdome)
"mUA" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4
@@ -9458,6 +9653,10 @@
pixel_x = 1;
pixel_y = 3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1;
+ pixel_y = 3
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"ntE" = (
@@ -9759,6 +9958,17 @@
/area/centcom/valhalla)
"nQD" = (
/obj/machinery/igniter,
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_y = -14
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -11
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -12;
+ pixel_y = -10
+ },
/turf/open/floor/tile/blue/taupeblue{
dir = 4
},
@@ -9834,6 +10044,10 @@
/obj/effect/landmark/itemspawner/chicken,
/turf/open/floor/plating,
/area/centcom/valhalla)
+"nXJ" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship,
+/area/tdome)
"nXO" = (
/obj/effect/turf_decal/sandedge/corner2,
/turf/open/floor/plating,
@@ -10603,6 +10817,15 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/centcom/valhalla)
+"phj" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"phm" = (
/obj/structure/morgue,
/obj/effect/decal/cleanable/cobweb,
@@ -10848,6 +11071,12 @@
/obj/effect/turf_decal/warning_stripes/mech,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"pHj" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"pIc" = (
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/yellow{
@@ -11068,6 +11297,10 @@
pixel_x = -2;
pixel_y = 7
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 7
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"qaL" = (
@@ -11484,6 +11717,7 @@
/obj/structure/table,
/obj/item/flashlight/lamp,
/obj/effect/spawner/random/food_or_drink/sugary_snack,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/grimy,
/area/centcom/valhalla)
"qJT" = (
@@ -11641,6 +11875,10 @@
pixel_x = -3;
pixel_y = 7
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = 7
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"qRQ" = (
@@ -11860,6 +12098,10 @@
pixel_x = 3;
pixel_y = 3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 3;
+ pixel_y = 3
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"rfV" = (
@@ -11911,6 +12153,13 @@
/obj/machinery/marine_selector/gear/smartgun/valhalla,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"riA" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"rjI" = (
/obj/effect/turf_decal/warning_stripes/thick/corner,
/obj/effect/turf_decal/tile/black,
@@ -12164,6 +12413,11 @@
dir = 8
},
/area/centcom/valhalla)
+"rEj" = (
+/obj/structure/rack/nometal,
+/obj/effect/spawner/random_set/christmas_costume,
+/turf/open/floor/plating,
+/area/tdome)
"rFk" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8
@@ -12627,6 +12881,10 @@
pixel_x = -4;
pixel_y = 3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 3
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"soi" = (
@@ -12744,6 +13002,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 3
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"sxh" = (
@@ -13106,6 +13367,7 @@
name = "Thunderdome Flash"
},
/obj/machinery/camera/autoname/thunderdome/hidden,
+/obj/structure/flora/tree/pine/xmas/presents/unlimited,
/turf/open/floor/podhatch/floor,
/area/tdome)
"sYY" = (
@@ -13178,6 +13440,29 @@
dir = 1
},
/area/centcom/valhalla)
+"tfC" = (
+/obj/machinery/igniter,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle{
+ pixel_y = 3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -12
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 3;
+ pixel_y = 18
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -13;
+ pixel_y = 14
+ },
+/turf/open/floor/tile/blue/taupeblue{
+ dir = 4
+ },
+/area/tdome)
"tfU" = (
/obj/structure/extinguisher_cabinet,
/obj/structure/closet/secure_closet/medical_doctor,
@@ -13606,6 +13891,19 @@
/area/centcom/valhalla)
"tFt" = (
/obj/machinery/igniter,
+/obj/item/prop/mainship/candle,
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 13;
+ pixel_y = -2
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 1;
+ pixel_y = -13
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 16;
+ pixel_y = -15
+ },
/turf/open/floor/tile/red/redtaupe{
dir = 8
},
@@ -13641,6 +13939,12 @@
/obj/machinery/biogenerator,
/turf/open/floor/tile/dark/gray,
/area/centcom/valhalla)
+"tMw" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/floor/plating,
+/area/tdome)
"tNc" = (
/obj/structure/noticeboard{
dir = 4;
@@ -14121,6 +14425,10 @@
pixel_x = 3;
pixel_y = 2
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 3;
+ pixel_y = 2
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"uCL" = (
@@ -14208,6 +14516,12 @@
dir = 4
},
/area/centcom/valhalla)
+"uKO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"uOe" = (
/obj/machinery/teleport/station,
/obj/effect/turf_decal/tile/black{
@@ -14271,6 +14585,10 @@
pixel_x = -2;
pixel_y = 7
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -2;
+ pixel_y = 7
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"uSc" = (
@@ -14290,6 +14608,12 @@
/obj/machinery/computer/pod,
/turf/open/floor/tile/red/yellowfull,
/area/tdome/tdomeadmin)
+"uSU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor,
+/area/tdome)
"uTH" = (
/obj/machinery/atmospherics/components/unary/cryo_cell,
/obj/effect/turf_decal/warning_stripes/thick{
@@ -14501,6 +14825,15 @@
},
/turf/closed/wall,
/area/centcom/valhalla)
+"vhG" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"viZ" = (
/obj/structure/table/wood,
/obj/item/reagent_containers/food/snacks/mexican/taco,
@@ -14511,6 +14844,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_y = 4
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = 4
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"vjU" = (
@@ -14757,6 +15093,8 @@
/area/centcom/valhalla)
"vFf" = (
/obj/structure/table/reinforced,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/tile/white,
/area/tdome/tdomeobserve)
"vFG" = (
@@ -14931,6 +15269,12 @@
/obj/item/tool/stamp/cmo,
/turf/open/floor/plating,
/area/centcom/valhalla)
+"vMU" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship,
+/area/tdome)
"vNx" = (
/obj/machinery/button/valhalla/marine_button{
link = "xenotanksouth";
@@ -15231,6 +15575,9 @@
/obj/effect/spawner/random/food_or_drink/sugary_snack{
pixel_x = -3
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"wae" = (
@@ -15930,6 +16277,13 @@
/obj/item/tool/crowbar/red,
/turf/open/floor/tile/dark,
/area/centcom/valhalla)
+"wWY" = (
+/obj/structure/disposalpipe/segment,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor,
+/area/tdome)
"wXW" = (
/turf/open/floor/mainship/sterile/side{
dir = 9
@@ -16428,6 +16782,27 @@
/obj/structure/bed/stool,
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
+"xJr" = (
+/obj/machinery/igniter,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/obj/item/prop/mainship/candle{
+ pixel_x = 3
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = 11
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_x = -8
+ },
+/obj/item/prop/mainship/candle/short{
+ pixel_y = 14
+ },
+/turf/open/floor/tile/red/redtaupe{
+ dir = 8
+ },
+/area/tdome)
"xKl" = (
/obj/structure/closet/secure_closet/freezer/fridge,
/obj/item/storage/box/donkpockets,
@@ -16724,6 +17099,10 @@
pixel_x = 2;
pixel_y = 6
},
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 2;
+ pixel_y = 6
+ },
/turf/open/floor/tile/cafe,
/area/centcom/valhalla)
"xYu" = (
@@ -17494,14 +17873,14 @@ osF
xrI
xrI
xrI
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
+jxM
+kJr
+kJr
+kJr
+kJr
+kJr
+kJr
+fFT
lIC
xrI
xrI
@@ -17751,14 +18130,14 @@ lIC
lIC
lIC
lIC
-lIC
-xtI
+nXJ
xtI
xtI
xtI
xtI
xtI
xtI
+crp
lIC
xrI
xrI
@@ -18006,18 +18385,18 @@ lof
lof
fLA
fLA
-lIC
-lIC
-lIC
-xtI
+jxM
+kJr
+pHj
xtI
xtI
xtI
xtI
xtI
xtI
-lIC
-lIC
+aVa
+kJr
+fFT
lIC
xrI
xrI
@@ -18263,7 +18642,7 @@ dIY
dIY
dIY
ubt
-lIC
+nXJ
meN
xtI
gBi
@@ -18274,7 +18653,7 @@ gBi
gBi
gBi
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -18520,7 +18899,7 @@ dIY
dIY
dIY
vhr
-lIC
+nXJ
meN
xtI
gBi
@@ -18531,7 +18910,7 @@ gBi
gBi
gBi
xtI
-meN
+fsA
lIC
xrI
xrI
@@ -18777,8 +19156,8 @@ dIY
dIY
dIY
vhr
-lIC
-meN
+nXJ
+rEj
xtI
gBi
gBi
@@ -18788,7 +19167,7 @@ gBi
gBi
gBi
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -19034,7 +19413,7 @@ dIY
dIY
dIY
dIY
-mzc
+aEz
meN
xtI
gBi
@@ -19045,7 +19424,7 @@ gBi
gBi
gBi
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -19291,7 +19670,7 @@ lIC
qUt
rMb
dIY
-lIC
+nXJ
meN
xtI
gBi
@@ -19302,7 +19681,7 @@ gBi
gBi
gBi
xtI
-meN
+jGb
lIC
xrI
osF
@@ -19548,9 +19927,9 @@ lIC
uaI
uaI
vFf
-lIC
-lIC
-lIC
+kmH
+riA
+jMD
hGe
hGe
hGe
@@ -19558,8 +19937,8 @@ hGe
hGe
hGe
hGe
-lIC
-lIC
+aLt
+bHZ
lIC
lIC
lIC
@@ -19806,7 +20185,7 @@ aJX
wrn
wrn
wrn
-mJp
+lZb
tFt
pBq
pBq
@@ -19815,7 +20194,7 @@ dDv
pBq
pBq
pBq
-tFt
+xJr
mJp
uUF
kMT
@@ -20063,8 +20442,7 @@ nOQ
qpT
wrn
qpT
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -20073,6 +20451,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
vnF
kMT
@@ -20320,8 +20699,7 @@ ped
aDr
iZT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -20330,6 +20708,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
kaA
@@ -20577,8 +20956,7 @@ ykJ
aDr
gxT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -20587,6 +20965,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
cFt
@@ -20825,17 +21204,16 @@ xrI
xrI
lIC
ibs
-tsg
-tsg
-tsg
+fCL
+kPp
+eSX
tsg
mzc
qvl
aDr
iZT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -20844,6 +21222,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
kaA
@@ -21091,7 +21470,7 @@ vuf
sEd
wrn
sEd
-mJp
+lZb
oHd
oHd
aaB
@@ -21100,7 +21479,7 @@ wSO
wSO
lzH
oHd
-oHd
+uSU
mJp
tiO
keG
@@ -21348,12 +21727,12 @@ vuf
wrn
wrn
wrn
-mJp
+lZb
oHd
oHd
vef
tGL
-tGL
+ktL
tGL
daE
oHd
@@ -21605,7 +21984,7 @@ wrn
wrn
wrn
qsK
-mJp
+lZb
oHd
oHd
vef
@@ -21614,7 +21993,7 @@ sYL
tGL
daE
oHd
-oHd
+uSU
mJp
beG
kMT
@@ -21862,12 +22241,12 @@ wrn
wrn
wrn
wrn
-mJp
+lZb
oHd
oHd
vef
tGL
-tGL
+aPX
tGL
daE
oHd
@@ -22119,7 +22498,7 @@ wrn
qpT
wrn
qpT
-mJp
+lZb
oHd
oHd
onv
@@ -22128,7 +22507,7 @@ kuQ
kuQ
sYH
oHd
-oHd
+uSU
mJp
vnF
keG
@@ -22376,8 +22755,7 @@ wrn
aDr
iZT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -22386,6 +22764,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
kaA
@@ -22633,8 +23012,7 @@ wrn
aDr
gxT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -22643,6 +23021,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
cFt
@@ -22890,8 +23269,7 @@ wrn
aDr
iZT
aDr
-mJp
-oHd
+lZb
oHd
oHd
oHd
@@ -22900,6 +23278,7 @@ oHd
oHd
oHd
oHd
+uSU
mJp
eLQ
kaA
@@ -23147,8 +23526,7 @@ wRc
sEd
wrn
vBB
-fOQ
-dNn
+mUh
dNn
dNn
dNn
@@ -23157,6 +23535,7 @@ dNn
dNn
dNn
dNn
+wWY
fOQ
glQ
oNJ
@@ -23404,7 +23783,7 @@ rxq
tpZ
uez
jla
-mJp
+lZb
nQD
slv
slv
@@ -23413,7 +23792,7 @@ evE
slv
slv
slv
-nQD
+tfC
mJp
kMT
kMT
@@ -23660,9 +24039,9 @@ lIC
lIC
lIC
lIC
-lIC
-lIC
-lIC
+jxM
+vhG
+phj
bZu
bZu
bZu
@@ -23670,8 +24049,8 @@ bZu
bZu
bZu
bZu
-lIC
-lIC
+lMS
+fFT
lIC
lIC
lIC
@@ -23917,7 +24296,7 @@ xrI
xrI
xrI
xrI
-lIC
+nXJ
meN
xtI
uwK
@@ -23928,7 +24307,7 @@ uwK
uwK
uwK
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -24174,7 +24553,7 @@ xrI
xrI
xrI
xrI
-mzc
+aEz
meN
xtI
uwK
@@ -24185,7 +24564,7 @@ uwK
uwK
uwK
xtI
-meN
+fsA
lIC
xrI
xrI
@@ -24431,7 +24810,7 @@ xrI
xrI
xrI
xrI
-lIC
+nXJ
meN
xtI
uwK
@@ -24442,7 +24821,7 @@ uwK
uwK
uwK
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -24688,8 +25067,8 @@ xrI
xrI
xrI
xrI
-lIC
-meN
+nXJ
+rEj
xtI
uwK
uwK
@@ -24699,7 +25078,7 @@ uwK
uwK
uwK
xtI
-meN
+jGb
lIC
xrI
xrI
@@ -24945,7 +25324,7 @@ xrI
xrI
xrI
xrI
-lIC
+nXJ
meN
xtI
uwK
@@ -24956,7 +25335,7 @@ uwK
uwK
uwK
xtI
-meN
+fsA
lIC
xrI
xrI
@@ -25202,18 +25581,18 @@ xrI
wQi
xrI
xrI
-lIC
-lIC
-lIC
-xtI
+kmH
+vMU
+uKO
xtI
xtI
xtI
xtI
xtI
xtI
-lIC
-lIC
+tMw
+bHZ
+bHZ
lIC
xrI
xrI
@@ -25461,14 +25840,14 @@ xrI
xrI
xrI
xrI
-lIC
-xtI
+nXJ
xtI
xtI
xtI
xtI
xtI
xtI
+crp
lIC
xrI
xrI
@@ -25718,14 +26097,14 @@ xrI
xrI
xrI
xrI
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
-lIC
+kmH
+vMU
+vMU
+vMU
+vMU
+vMU
+vMU
+bHZ
lIC
xrI
xrI
diff --git a/_maps/modularmaps/EORG/basketball.dmm b/_maps/modularmaps/EORG/basketball.dmm
index f77594d32bfac..d09957d71446e 100644
--- a/_maps/modularmaps/EORG/basketball.dmm
+++ b/_maps/modularmaps/EORG/basketball.dmm
@@ -283,7 +283,6 @@
/obj/effect/turf_decal/warning_stripes/nscenter,
/obj/effect/turf_decal/warning_stripes,
/obj/item/toy/beach_ball/basketball,
-/obj/effect/landmark/weapon_spawn/tier5_weapon_spawn,
/obj/machinery/floodlight/landing/testroom,
/turf/open/floor/wood,
/area/deathmatch)
@@ -895,6 +894,11 @@
"QG" = (
/turf/open/floor/mainship/blue,
/area/deathmatch)
+"QW" = (
+/obj/effect/turf_decal/warning_stripes/nscenter,
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/wood,
+/area/deathmatch)
"Rd" = (
/turf/open/floor/mainship/orange{
dir = 4
@@ -2134,7 +2138,7 @@ ad
ad
dt
aN
-ad
+QW
ad
ad
ad
diff --git a/_maps/modularmaps/EORG/cs_mansion.dmm b/_maps/modularmaps/EORG/cs_mansion.dmm
index 50a66a85127e4..a6c1ef17da15b 100644
--- a/_maps/modularmaps/EORG/cs_mansion.dmm
+++ b/_maps/modularmaps/EORG/cs_mansion.dmm
@@ -607,6 +607,10 @@
/obj/structure/largecrate/random/case,
/turf/open/floor/wood/broken,
/area/deathmatch)
+"AQ" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/grime,
+/area/deathmatch)
"Ba" = (
/obj/effect/turf_decal/riverdecal/edge,
/obj/effect/decal/cleanable/dirt,
@@ -2458,7 +2462,7 @@ Oh
pS
JS
Oh
-Oh
+AQ
gr
Oh
Oh
diff --git a/_maps/modularmaps/EORG/cs_militia.dmm b/_maps/modularmaps/EORG/cs_militia.dmm
index a772cce4076ca..2d54dfff82b0a 100644
--- a/_maps/modularmaps/EORG/cs_militia.dmm
+++ b/_maps/modularmaps/EORG/cs_militia.dmm
@@ -70,6 +70,10 @@
/obj/structure/window/framed/wood,
/turf/open/floor/wood,
/area/deathmatch)
+"hm" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/wood,
+/area/deathmatch)
"hw" = (
/obj/effect/landmark/weapon_spawn/tier2_weapon_spawn,
/turf/open/floor/plating/asteroidplating{
@@ -1722,7 +1726,7 @@ uR
Tb
gK
LT
-LT
+hm
RZ
LT
LT
diff --git a/_maps/modularmaps/EORG/cs_office.dmm b/_maps/modularmaps/EORG/cs_office.dmm
index 80cdbf53a2436..be9a37bae4338 100644
--- a/_maps/modularmaps/EORG/cs_office.dmm
+++ b/_maps/modularmaps/EORG/cs_office.dmm
@@ -707,6 +707,10 @@
dir = 10
},
/area/deathmatch)
+"qS" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/tile/dark/gray,
+/area/deathmatch)
"qW" = (
/obj/structure/largecrate/random,
/turf/open/floor/plating/ground/snow/layer1,
@@ -3213,7 +3217,7 @@ vO
ro
AR
Ye
-DE
+qS
We
ZJ
jg
diff --git a/_maps/modularmaps/EORG/de_dust2.dmm b/_maps/modularmaps/EORG/de_dust2.dmm
index 34cdce99d6c3a..8eb21e3af1a88 100644
--- a/_maps/modularmaps/EORG/de_dust2.dmm
+++ b/_maps/modularmaps/EORG/de_dust2.dmm
@@ -93,6 +93,10 @@
},
/turf/open/floor/plating/ground/dirt,
/area/deathmatch)
+"iL" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/wood,
+/area/deathmatch)
"jk" = (
/obj/effect/landmark/weapon_spawn/tier2_weapon_spawn,
/turf/open/floor/tile,
@@ -1853,7 +1857,7 @@ FE
FE
mC
Ht
-Ht
+iL
Bt
Ht
Ht
diff --git a/_maps/modularmaps/EORG/de_inferno.dmm b/_maps/modularmaps/EORG/de_inferno.dmm
index 1d9186f893c5f..7be1805d8384a 100644
--- a/_maps/modularmaps/EORG/de_inferno.dmm
+++ b/_maps/modularmaps/EORG/de_inferno.dmm
@@ -1162,6 +1162,11 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/asteroidfloor,
/area/deathmatch)
+"DW" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/plating/asteroidfloor,
+/area/deathmatch)
"EZ" = (
/obj/structure/prop/mainship/valmoric,
/turf/open/floor/grass,
@@ -3011,8 +3016,8 @@ pj
EZ
NA
rK
-vJ
Bs
+DW
Xz
fI
KS
diff --git a/_maps/modularmaps/EORG/de_nuke.dmm b/_maps/modularmaps/EORG/de_nuke.dmm
index e486c7412288b..3eeb24b6f0ff5 100644
--- a/_maps/modularmaps/EORG/de_nuke.dmm
+++ b/_maps/modularmaps/EORG/de_nuke.dmm
@@ -23,6 +23,10 @@
/obj/effect/turf_decal/sandytile/sandyplating,
/turf/closed/wall,
/area/deathmatch)
+"dp" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor/grime,
+/area/deathmatch)
"dA" = (
/obj/item/storage/belt/champion,
/turf/open/floor/grime,
@@ -1441,7 +1445,7 @@ XY
db
zB
JT
-JT
+dp
dA
JT
JT
diff --git a/_maps/modularmaps/EORG/old.dmm b/_maps/modularmaps/EORG/old.dmm
index d0eb565989461..f6d61bbacd8a4 100644
--- a/_maps/modularmaps/EORG/old.dmm
+++ b/_maps/modularmaps/EORG/old.dmm
@@ -658,6 +658,10 @@
/obj/effect/ai_node,
/turf/open/floor,
/area/deathmatch)
+"RG" = (
+/obj/structure/flora/tree/pine/xmas/presents/guntree,
+/turf/open/floor,
+/area/deathmatch)
"Sp" = (
/obj/structure/flora/ausbushes/sparsegrass,
/obj/effect/ai_node,
@@ -1066,7 +1070,7 @@ aQ
bT
aZ
bT
-bT
+RG
bT
aZ
bT
diff --git a/_maps/shuttles/alamo.dmm b/_maps/shuttles/alamo.dmm
index 4f9e278956e43..4f00f81ba214d 100644
--- a/_maps/shuttles/alamo.dmm
+++ b/_maps/shuttles/alamo.dmm
@@ -12,6 +12,9 @@
dir = 8
},
/obj/machinery/door/airlock/dropship_hatch/left,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/shuttle/dropship/floor/out{
dir = 1
},
@@ -22,26 +25,36 @@
/area/shuttle/dropship/alamo)
"ae" = (
/obj/structure/dropship_piece/one/cockpit/left,
+/obj/structure/prop/holidays/string_lights/corner,
/turf/template_noop,
/area/shuttle/dropship/alamo)
"af" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/shuttle/dropship1/window,
/area/shuttle/dropship/alamo)
"ag" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/shuttle/dropship1/window{
dir = 1
},
/area/shuttle/dropship/alamo)
"ah" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/shuttle/dropship1/window{
dir = 8
},
/area/shuttle/dropship/alamo)
"ai" = (
/obj/structure/dropship_piece/one/cockpit/right,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/template_noop,
/area/shuttle/dropship/alamo)
"aj" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/cornersalt{
dir = 4
},
@@ -57,6 +70,9 @@
},
/area/shuttle/dropship/alamo)
"an" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/cornersalt{
dir = 8
},
@@ -79,6 +95,9 @@
/turf/template_noop,
/area/shuttle/dropship/alamo)
"ar" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/interiorwindow,
/area/shuttle/dropship/alamo)
"as" = (
@@ -86,6 +105,9 @@
/obj/structure/bed/chair/dropship/pilot{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/shuttle/dropship/floor/out{
dir = 8
},
@@ -98,11 +120,17 @@
pixel_x = -6;
pixel_y = -16
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/shuttle/dropship/floor/out{
dir = 4
},
/area/shuttle/dropship/alamo)
"av" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/interiorwindow{
dir = 1
},
@@ -122,9 +150,14 @@
/turf/template_noop,
/area/shuttle/dropship/alamo)
"ay" = (
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/shuttle/dropship1/cornersalt2,
/area/shuttle/dropship/alamo)
"aB" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/interiormisc{
dir = 4
},
@@ -134,14 +167,22 @@
/turf/open/shuttle/dropship/floor/out,
/area/shuttle/dropship/alamo)
"aD" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/interiormisc{
dir = 8
},
/area/shuttle/dropship/alamo)
"aE" = (
+/obj/structure/prop/holidays/string_lights,
/turf/closed/shuttle/dropship1/edge,
/area/shuttle/dropship/alamo)
"aF" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/shuttle/dropship1/cornersalt2{
dir = 1
},
@@ -151,6 +192,9 @@
/turf/template_noop,
/area/shuttle/dropship/alamo)
"aH" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/finleft{
dir = 4
},
@@ -185,6 +229,9 @@
},
/area/shuttle/dropship/alamo)
"aO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/finright{
dir = 4
},
@@ -199,6 +246,9 @@
},
/area/shuttle/dropship/alamo)
"aR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/finleft{
dir = 1
},
@@ -217,6 +267,9 @@
},
/area/shuttle/dropship/alamo)
"aV" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/finright{
dir = 1
},
@@ -231,6 +284,9 @@
/turf/open/shuttle/dropship/thirtyeight,
/area/shuttle/dropship/alamo)
"aY" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/finleft,
/area/shuttle/dropship/alamo)
"aZ" = (
@@ -259,6 +315,12 @@
/area/shuttle/dropship/alamo)
"bd" = (
/obj/docking_port/mobile/marine_dropship/one,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/aislewindow{
dir = 1
},
@@ -308,6 +370,9 @@
/turf/open/shuttle/dropship/eight,
/area/shuttle/dropship/alamo)
"br" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/cornersalt,
/area/shuttle/dropship/alamo)
"bs" = (
@@ -324,6 +389,9 @@
},
/area/shuttle/dropship/alamo)
"bv" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/cornersalt{
dir = 1
},
@@ -332,6 +400,9 @@
/turf/open/shuttle/dropship/eleven,
/area/shuttle/dropship/alamo)
"by" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/edge/alt,
/area/shuttle/dropship/alamo)
"bD" = (
@@ -370,6 +441,9 @@
},
/area/shuttle/dropship/alamo)
"bJ" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/wall,
/area/shuttle/dropship/alamo)
"bK" = (
@@ -391,11 +465,17 @@
},
/area/shuttle/dropship/alamo)
"bO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/shuttle/dropship1/wall{
dir = 4
},
/area/shuttle/dropship/alamo)
"bP" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/wall{
dir = 8
},
@@ -475,6 +555,9 @@
"di" = (
/obj/machinery/telecomms/relay/preset/telecomms/onboard/nondense,
/obj/machinery/holopad,
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
/turf/open/shuttle/dropship/five,
/area/shuttle/dropship/alamo)
"dS" = (
@@ -485,6 +568,9 @@
"ec" = (
/obj/machinery/door/poddoor/shutters/transit,
/obj/machinery/door/airlock/dropship_hatch/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/open/shuttle/dropship/floor/out,
/area/shuttle/dropship/alamo)
"ez" = (
@@ -537,11 +623,23 @@
},
/area/shuttle/dropship/alamo)
"jS" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/aislewindow{
dir = 8
},
/area/shuttle/dropship/alamo)
"li" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/aislewindow{
dir = 4
},
@@ -584,14 +682,26 @@
"tf" = (
/turf/open/shuttle/dropship/thirtysix,
/area/shuttle/dropship/alamo)
+"uO" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/shuttle/dropship/floor/out,
+/area/shuttle/dropship/alamo)
"vw" = (
/obj/structure/dropship_piece/one/engine/leftbottom,
/turf/template_noop,
/area/shuttle/dropship/alamo)
"vQ" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/shuttle/dropship/floor/out,
/area/shuttle/dropship/alamo)
"yv" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/finright,
/area/shuttle/dropship/alamo)
"yA" = (
@@ -617,11 +727,27 @@
"DE" = (
/turf/open/shuttle/dropship/nine,
/area/shuttle/dropship/alamo)
+"DX" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/shuttle/dropship1/edge/alt{
+ dir = 4
+ },
+/area/shuttle/dropship/alamo)
"FA" = (
/turf/closed/shuttle/dropship1/enginetwo{
dir = 8
},
/area/shuttle/dropship/alamo)
+"HS" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/shuttle/dropship1/edge/alt{
+ dir = 1
+ },
+/area/shuttle/dropship/alamo)
"IA" = (
/obj/machinery/camera/autoname/mainship/dropship_one{
dir = 4;
@@ -638,6 +764,7 @@
},
/area/shuttle/dropship/alamo)
"MG" = (
+/obj/structure/prop/holidays/string_lights/cap,
/turf/closed/shuttle/dropship1/aislewindow,
/area/shuttle/dropship/alamo)
"Nj" = (
@@ -653,6 +780,20 @@
/obj/structure/dropship_piece/one/engine/rightbottom,
/turf/template_noop,
/area/shuttle/dropship/alamo)
+"TK" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
+/turf/open/shuttle/dropship/floor/out,
+/area/shuttle/dropship/alamo)
+"UI" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/shuttle/dropship1/edge/alt,
+/area/shuttle/dropship/alamo)
"VW" = (
/turf/open/shuttle/dropship/thirtyfive,
/area/shuttle/dropship/alamo)
@@ -664,7 +805,26 @@
/obj/machinery/vending/cola/alamo,
/turf/open/shuttle/dropship/thirtynine,
/area/shuttle/dropship/alamo)
+"YA" = (
+/obj/structure/bed/chair/dropship/doublewide/left,
+/obj/structure/bed/chair/dropship/doublewide/right,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
+/turf/open/shuttle/dropship/floor/out,
+/area/shuttle/dropship/alamo)
+"YY" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/shuttle/dropship1/edge/alt{
+ dir = 1
+ },
+/area/shuttle/dropship/alamo)
"Zx" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
/turf/closed/shuttle/dropship1/wall{
dir = 1
},
@@ -705,8 +865,8 @@ aY
bu
be
ac
-bu
-bu
+YY
+HS
bt
bF
bH
@@ -729,10 +889,10 @@ ez
Dp
bw
bD
-me
+TK
br
-bu
-bu
+YY
+YY
bO
bJ
bW
@@ -849,7 +1009,7 @@ ji
OZ
bI
bj
-vQ
+uO
ca
cd
ci
@@ -867,10 +1027,10 @@ me
Dp
bw
aM
-me
+YA
bv
-by
-by
+UI
+UI
bP
Zx
cb
@@ -889,7 +1049,7 @@ yv
gB
bc
ec
-gB
+DX
by
bs
bE
diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm
index 9789bfa428b79..ad8555ea85004 100644
--- a/_maps/shuttles/tgs_bigbury.dmm
+++ b/_maps/shuttles/tgs_bigbury.dmm
@@ -12,6 +12,7 @@
/area/shuttle/canterbury)
"ad" = (
/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury/cic)
"ae" = (
@@ -39,6 +40,7 @@
/turf/open/floor/podhatch/floor,
/area/shuttle/canterbury)
"al" = (
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship/outer/canterbury,
/area/shuttle/canterbury/cic)
"am" = (
@@ -68,10 +70,22 @@
/turf/open/floor/plating/plating_catwalk,
/area/shuttle/canterbury)
"at" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/closed/wall/mainship/white/canterbury,
/area/shuttle/canterbury/medical)
"au" = (
/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury/medical)
"av" = (
@@ -95,6 +109,7 @@
/area/shuttle/canterbury/medical)
"az" = (
/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"aA" = (
@@ -118,6 +133,9 @@
/area/shuttle/canterbury)
"aH" = (
/obj/machinery/vending/MarineMed,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"aI" = (
@@ -181,6 +199,9 @@
/obj/item/clothing/glasses/welding,
/obj/machinery/cell_charger,
/obj/item/reagent_containers/spray/cleaner,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"aS" = (
@@ -241,8 +262,11 @@
},
/obj/effect/turf_decal/warning_stripes,
/obj/machinery/door_control{
+ dir = 1;
id = "Interior_Emergency_umbilical";
- name = "Emergency door-control";
+ name = "Emergency door-control"
+ },
+/obj/structure/prop/holidays/string_lights{
dir = 1
},
/turf/open/floor/mainship/mono,
@@ -251,12 +275,18 @@
/obj/structure/table/reinforced,
/obj/item/storage/surgical_tray,
/obj/item/storage/firstaid/adv,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
"bd" = (
/obj/machinery/optable,
/obj/item/tank/anesthetic,
/obj/item/clothing/mask/breath/medical,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
"be" = (
@@ -265,6 +295,9 @@
pixel_x = -1;
pixel_y = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
"bg" = (
@@ -275,12 +308,18 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"bh" = (
/obj/machinery/door/window/right{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"bi" = (
@@ -340,6 +379,9 @@
dir = 1
},
/obj/effect/landmark/start/job/crash/medicalofficer,
+/obj/structure/prop/holidays/string_lights/cap{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bp" = (
@@ -369,6 +411,9 @@
pixel_x = 3;
pixel_y = 3
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
"bs" = (
@@ -426,6 +471,9 @@
is_wired = 1;
linked = 1
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/stripesquare,
/area/shuttle/canterbury)
"bD" = (
@@ -436,6 +484,11 @@
},
/turf/open/floor/mainship/blue/full,
/area/shuttle/canterbury/cic)
+"bE" = (
+/obj/structure/cable,
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
"bG" = (
/obj/machinery/vending/weapon/crash,
/turf/open/floor/mainship/mono,
@@ -469,22 +522,34 @@
"bL" = (
/obj/machinery/marine_selector/clothes/leader,
/obj/machinery/light/small,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 4
},
/area/shuttle/canterbury/cic)
"bM" = (
/obj/machinery/marine_selector/gear/leader,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury/cic)
"bN" = (
/obj/machinery/telecomms/relay/preset/telecomms,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 4
},
/area/shuttle/canterbury/cic)
"bO" = (
/obj/machinery/marine_selector/gear/commander,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury/cic)
"bP" = (
@@ -492,16 +557,25 @@
/obj/machinery/power/apc/mainship{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 6
},
/area/shuttle/canterbury/cic)
"bQ" = (
/obj/machinery/computer/crew,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury/cic)
"bR" = (
/obj/structure/closet/secure_closet/guncabinet/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 8
},
@@ -510,11 +584,17 @@
/obj/machinery/air_alarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury/cic)
"bT" = (
/obj/machinery/light/small,
/obj/machinery/marine_selector/clothes/commander,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 8
},
@@ -563,18 +643,44 @@
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"cR" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/floor,
/area/shuttle/canterbury)
+"dy" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"fC" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury/cic)
"fL" = (
/obj/structure/table/reinforced,
/obj/item/reagent_containers/glass/beaker/bluespace,
/obj/item/reagent_containers/glass/beaker/bluespace,
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
+"fT" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
"gv" = (
/obj/structure/barricade/plasteel,
/turf/open/floor/mainship/stripesquare,
/area/shuttle/canterbury)
+"gO" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
"hc" = (
/obj/structure/barricade/plasteel{
dir = 4;
@@ -583,6 +689,13 @@
},
/turf/open/floor/mainship/stripesquare,
/area/shuttle/canterbury)
+"hv" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury/cic)
"iy" = (
/obj/structure/bed/chair/dropship/passenger,
/obj/effect/landmark/start/job/crash/squadcorpsman,
@@ -599,6 +712,33 @@
/area/shuttle/canterbury/cic)
"jq" = (
/obj/machinery/light,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
+"ku" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 6;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -8;
+ pixel_y = -2
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -7;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 5
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
+"lb" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"lu" = (
@@ -616,6 +756,13 @@
/obj/effect/landmark/start/job/crash/squadengineer,
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
+"mo" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -4;
+ pixel_y = -9
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
"ms" = (
/obj/structure/bed/chair/dropship/passenger,
/obj/effect/landmark/start/job/crash/squadmarine,
@@ -637,6 +784,16 @@
/obj/effect/landmark/start/job/crash/squadcorpsman,
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"np" = (
+/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury/medical)
"ny" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 8
@@ -667,11 +824,23 @@
/obj/machinery/power/monitor,
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
+"ol" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
"ow" = (
/turf/open/floor/mainship/red{
dir = 1
},
/area/shuttle/canterbury)
+"oA" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/sterile/dark,
+/area/shuttle/canterbury/medical)
"py" = (
/obj/structure/window/reinforced{
dir = 4
@@ -701,8 +870,24 @@
/obj/item/storage/box/crate/sentry,
/obj/item/storage/box/crate/sentry,
/obj/item/storage/box/crate/sentry,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/cargo,
/area/shuttle/canterbury)
+"qm" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"qx" = (
+/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/open/floor/mainship/sterile,
+/area/shuttle/canterbury/medical)
"qE" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
@@ -723,8 +908,26 @@
/area/shuttle/canterbury)
"rb" = (
/obj/machinery/vending/cigarette,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"rx" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/white/canterbury,
+/area/shuttle/canterbury/medical)
+"rY" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
"su" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 1
@@ -736,6 +939,13 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/mainship/cargo,
/area/shuttle/canterbury)
+"sS" = (
+/obj/machinery/computer/autodoc_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/sterile,
+/area/shuttle/canterbury/medical)
"te" = (
/obj/machinery/cryopod,
/turf/open/floor/mainship/floor,
@@ -755,6 +965,18 @@
},
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
+"ue" = (
+/obj/effect/spawner/random/misc/present,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -3;
+ pixel_y = 9
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
+"ui" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
"ul" = (
/obj/machinery/light,
/turf/open/floor/mainship/red{
@@ -815,8 +1037,30 @@
/area/shuttle/canterbury)
"wz" = (
/obj/effect/landmark/start/latejoin/crash,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury)
+"xH" = (
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/marine_selector/clothes,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
+"ym" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
"yp" = (
/obj/machinery/light{
dir = 8
@@ -827,6 +1071,22 @@
},
/turf/open/floor/mainship,
/area/shuttle/canterbury)
+"yv" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"yE" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"yI" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
"zc" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 8
@@ -845,18 +1105,35 @@
},
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"zP" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury/cic)
+"AA" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
"AS" = (
/obj/structure/rack,
/obj/item/storage/belt/utility/full,
/obj/item/t_scanner,
/obj/item/clothing/suit/storage/hazardvest,
/obj/effect/spawner/random/engineering/extinguisher/regularweighted,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/cargo,
/area/shuttle/canterbury)
"BZ" = (
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"CA" = (
@@ -864,6 +1141,10 @@
/obj/effect/landmark/start/job/crash/squadmarine,
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"CQ" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
"DF" = (
/obj/machinery/vending/armor_supply,
/obj/structure/window/reinforced{
@@ -899,6 +1180,49 @@
/obj/item/storage/toolbox/mechanical,
/turf/open/floor/mainship/cargo,
/area/shuttle/canterbury)
+"GU" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"HK" = (
+/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/open/floor/mainship/sterile,
+/area/shuttle/canterbury/medical)
+"Iu" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"IR" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 5
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/medical)
+"Jq" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1;
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
+"JE" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
"JM" = (
/obj/machinery/marine_selector/gear/smartgun,
/turf/open/floor/mainship/mono,
@@ -906,6 +1230,9 @@
"JN" = (
/obj/machinery/light/small,
/obj/machinery/vending/MarineMed/Blood,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
"JX" = (
@@ -936,13 +1263,34 @@
},
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"Ks" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/turf/open/floor/mainship,
+/area/shuttle/canterbury)
"KD" = (
/obj/machinery/marine_selector/clothes,
/obj/structure/window/reinforced{
dir = 4
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship,
/area/shuttle/canterbury)
+"La" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury/cic)
+"Lo" = (
+/obj/machinery/autodoc,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/sterile,
+/area/shuttle/canterbury/medical)
"Mj" = (
/obj/machinery/air_alarm{
dir = 4
@@ -953,6 +1301,22 @@
"MY" = (
/turf/open/floor/mainship/blue/full,
/area/shuttle/canterbury/cic)
+"Nu" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"NT" = (
+/obj/effect/spawner/random/misc/present{
+ pixel_y = -20
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 3;
+ pixel_y = -7
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
"Oj" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/mainship/mono,
@@ -960,8 +1324,18 @@
"Ot" = (
/obj/structure/cable,
/obj/machinery/light/small,
+/obj/structure/prop/holidays/string_lights{
+ dir = 9
+ },
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
+"Ow" = (
+/obj/structure/window/framed/mainship/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
"OL" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 1
@@ -979,6 +1353,13 @@
dir = 4
},
/area/shuttle/canterbury/cic)
+"PR" = (
+/obj/machinery/cryopod,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/floor,
+/area/shuttle/canterbury)
"PW" = (
/obj/machinery/marine_selector/clothes/medic,
/turf/open/floor/mainship/mono,
@@ -1008,6 +1389,15 @@
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"Si" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 5;
+ pixel_y = 3
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food,
/turf/open/floor/mainship/blue{
dir = 10
},
@@ -1022,6 +1412,20 @@
},
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"Tl" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 5
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"Tt" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
"TE" = (
/obj/structure/cable,
/obj/machinery/power/terminal,
@@ -1049,6 +1453,9 @@
/area/shuttle/canterbury)
"Ul" = (
/obj/machinery/vending/nanomed,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 10
},
@@ -1086,6 +1493,9 @@
/area/shuttle/canterbury)
"Wk" = (
/obj/machinery/marine_selector/clothes/synth,
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"Wl" = (
@@ -1120,6 +1530,13 @@
},
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
+"Xz" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 6
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
"XO" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 4
@@ -1147,9 +1564,9 @@ Uo
Uo
Uo
Uo
-ab
-ab
-ab
+yE
+Nu
+ol
ab
Uo
Uo
@@ -1159,17 +1576,17 @@ ab
ab
ab
ab
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gO
+yI
+yI
+yI
+yI
+fT
+gO
+fT
+fT
+fT
+fT
ap
ab
"}
@@ -1180,10 +1597,10 @@ Uo
Uo
Uo
Uo
-al
+AA
Mj
rb
-ab
+yE
bU
bU
bU
@@ -1192,12 +1609,12 @@ ab
aS
bj
bk
-ap
+ui
av
aq
ay
aq
-ay
+Lo
az
aU
vF
@@ -1213,10 +1630,10 @@ Uo
Uo
Uo
Uo
-al
+AA
Ui
-ac
-ab
+lb
+Iu
bi
pY
pY
@@ -1225,12 +1642,12 @@ ab
aS
TE
bl
-ap
+IR
aw
aq
aB
aq
-aB
+sS
az
aV
aA
@@ -1244,12 +1661,12 @@ Uo
Uo
Uo
al
-ad
-ad
-al
+hv
+fC
+AA
UE
-ac
-ab
+lb
+Iu
CA
an
ac
@@ -1258,13 +1675,13 @@ ab
bq
mM
oj
-ap
+ui
av
aq
aC
aq
aH
-az
+HK
aW
aA
fL
@@ -1276,13 +1693,13 @@ ah
Uo
Uo
al
-al
+qm
uu
bL
-al
+AA
Rd
jq
-ab
+Xz
iy
an
ac
@@ -1291,7 +1708,7 @@ ab
br
mM
bm
-ap
+ui
vY
aq
aD
@@ -1301,7 +1718,7 @@ aI
aA
aA
aA
-aA
+oA
ap
ah
"}
@@ -1312,10 +1729,10 @@ ad
Ub
MY
bM
-al
+AA
AS
-ac
-ab
+lb
+Iu
YN
an
ac
@@ -1324,13 +1741,13 @@ ab
ab
ar
bn
-ap
+IR
ax
aq
aq
aN
aR
-az
+qx
aJ
lu
aY
@@ -1345,10 +1762,10 @@ ad
am
uu
bN
-al
+AA
FZ
-ac
-ab
+lb
+Xz
uZ
an
ac
@@ -1357,17 +1774,17 @@ sR
TS
bw
Ot
-ap
+ui
aK
aq
bo
at
au
-at
-au
-au
-au
-ap
+rx
+np
+np
+np
+ym
ap
ab
"}
@@ -1378,10 +1795,10 @@ ad
ae
MY
bS
-al
+AA
qh
-ac
-ab
+lb
+Iu
Wk
an
ac
@@ -1415,9 +1832,9 @@ ad
ac
ac
zy
-ac
-an
-ac
+NT
+ku
+Tt
ac
ac
ac
@@ -1429,7 +1846,7 @@ ac
as
ac
ac
-ac
+CQ
ac
ac
ac
@@ -1449,8 +1866,8 @@ as
as
nM
as
-as
-as
+bE
+Jq
as
as
aa
@@ -1481,9 +1898,9 @@ ad
ac
ac
zy
-ac
-an
-ac
+mo
+ue
+CQ
ac
ac
ac
@@ -1510,10 +1927,10 @@ ad
bJ
MY
bQ
-al
+AA
ac
ba
-ab
+Iu
Wl
an
ac
@@ -1543,10 +1960,10 @@ ad
Si
Uw
bR
-al
+AA
JX
-ac
-ab
+lb
+Iu
ms
an
ac
@@ -1555,17 +1972,17 @@ ab
oa
mi
bs
-ab
-ab
-ar
-ar
-ab
+yE
+Nu
+Ow
+Ow
+Nu
bA
bp
-ab
-ar
-ar
-ab
+Nu
+Ow
+Ow
+ol
ab
ab
"}
@@ -1576,10 +1993,10 @@ ad
jo
MY
bO
-al
+AA
BZ
bh
-ab
+Xz
uZ
an
ac
@@ -1588,7 +2005,7 @@ ab
bt
bx
ul
-ab
+Iu
py
UO
aO
@@ -1605,14 +2022,14 @@ ag
(15,1,1) = {"
Uo
Uo
-al
-al
+rY
+yv
Uw
bT
-al
+AA
aF
jq
-ab
+Iu
qM
an
ac
@@ -1621,16 +2038,16 @@ ab
PW
up
ow
-ab
+Tl
cf
bA
bA
+Ks
bA
bA
bA
bA
-bA
-bA
+Ks
wz
ab
ah
@@ -1639,13 +2056,13 @@ ah
Uo
Uo
Uo
-al
-ad
-ad
-al
+rY
+zP
+La
+AA
UP
-ac
-ab
+lb
+Xz
CA
an
ac
@@ -1654,7 +2071,7 @@ ab
bu
by
ow
-ab
+Iu
Wb
UO
aX
@@ -1675,10 +2092,10 @@ Uo
Uo
Uo
Uo
-al
+AA
vW
cR
-ab
+Iu
bC
hc
hc
@@ -1687,7 +2104,7 @@ ab
bv
tX
ul
-ab
+Tl
Qg
bA
bA
@@ -1695,7 +2112,7 @@ bA
bA
bA
bA
-bA
+Ks
bA
wz
ab
@@ -1708,10 +2125,10 @@ Uo
Uo
Uo
Uo
-al
-te
+AA
te
-ab
+PR
+GU
bV
bV
bV
@@ -1720,7 +2137,7 @@ ab
JM
bz
ow
-ab
+Iu
aM
DI
aQ
@@ -1730,7 +2147,7 @@ DI
aQ
cF
DI
-aQ
+xH
ab
ai
"}
@@ -1741,9 +2158,9 @@ Uo
Uo
Uo
Uo
-ab
-ab
-ab
+GU
+JE
+dy
ab
Uo
Uo
@@ -1753,17 +2170,17 @@ ab
ab
ab
ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
-ab
+GU
+JE
+JE
+JE
+JE
+JE
+JE
+JE
+JE
+JE
+dy
ab
ab
"}
diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm
index 45d168d891058..91b9477f45508 100644
--- a/_maps/shuttles/tgs_canterbury.dmm
+++ b/_maps/shuttles/tgs_canterbury.dmm
@@ -3,10 +3,12 @@
/turf/template_noop,
/area/template_noop)
"ab" = (
+/obj/structure/prop/holidays/string_lights/corner,
/turf/closed/wall/mainship/outer/canterbury,
/area/shuttle/canterbury/cic)
"ac" = (
/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/shuttle/canterbury/cic)
"ad" = (
@@ -80,6 +82,9 @@
/obj/machinery/firealarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 10
},
@@ -89,6 +94,9 @@
/obj/machinery/air_alarm{
dir = 1
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue,
/area/shuttle/canterbury/cic)
"ar" = (
@@ -101,6 +109,9 @@
},
/obj/structure/cable,
/obj/machinery/marine_selector/clothes/commander,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue,
/area/shuttle/canterbury/cic)
"at" = (
@@ -108,6 +119,9 @@
dir = 4
},
/obj/machinery/marine_selector/gear/commander,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/blue{
dir = 6
},
@@ -192,6 +206,13 @@
/area/shuttle/canterbury)
"aC" = (
/obj/machinery/computer/body_scanconsole,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = 11;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"aD" = (
@@ -229,9 +250,9 @@
/area/shuttle/canterbury)
"aN" = (
/obj/item/radio/intercom{
+ dir = 4;
freerange = 1;
- name = "General Listening Channel";
- dir = 4
+ name = "General Listening Channel"
},
/obj/machinery/vending/tool,
/obj/structure/window/reinforced/toughened{
@@ -258,6 +279,7 @@
/area/shuttle/canterbury)
"aT" = (
/obj/structure/reagent_dispensers/fueltank,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
"aV" = (
@@ -397,6 +419,13 @@
dir = 1
},
/obj/machinery/robotic_cradle,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -10;
+ pixel_y = 26
+ },
+/obj/structure/prop/holidays/stocking{
+ pixel_y = 26
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bz" = (
@@ -414,6 +443,10 @@
/obj/item/reagent_containers/spray/cleaner,
/obj/item/reagent_containers/glass/beaker/cryomix,
/obj/machinery/vending/nanomed,
+/obj/structure/prop/holidays/stocking{
+ pixel_x = -19;
+ pixel_y = 26
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bA" = (
@@ -452,14 +485,23 @@
/obj/structure/window/reinforced{
dir = 8
},
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
"bG" = (
/obj/machinery/autodoc,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bH" = (
/obj/machinery/computer/autodoc_console,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bI" = (
@@ -471,6 +513,7 @@
/area/shuttle/canterbury)
"bK" = (
/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights,
/turf/open/floor/plating,
/area/shuttle/canterbury/medical)
"bO" = (
@@ -495,6 +538,9 @@
},
/obj/structure/cable,
/obj/effect/landmark/start/job/crash/medicalofficer,
+/obj/structure/prop/holidays/string_lights{
+ dir = 5
+ },
/turf/open/floor/mainship/sterile,
/area/shuttle/canterbury/medical)
"bU" = (
@@ -519,6 +565,7 @@
/obj/machinery/optable,
/obj/item/tank/anesthetic,
/obj/item/clothing/mask/breath/medical,
+/obj/effect/spawner/random/misc/present,
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
"ca" = (
@@ -594,6 +641,9 @@
/area/shuttle/canterbury)
"cw" = (
/obj/machinery/marine_selector/gear/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
"cy" = (
@@ -616,10 +666,16 @@
/area/shuttle/canterbury)
"cA" = (
/obj/machinery/marine_selector/clothes/medic,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
"cE" = (
/obj/machinery/marine_selector/gear/smartgun,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
/turf/open/floor/mainship/red/full,
/area/shuttle/canterbury)
"cF" = (
@@ -632,6 +688,12 @@
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
"cI" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
/turf/closed/wall/mainship/white/canterbury,
/area/shuttle/canterbury/medical)
"cJ" = (
@@ -731,6 +793,25 @@
},
/turf/open/floor/mainship/red,
/area/shuttle/canterbury)
+"ey" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"hk" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"mY" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/canterbury/cic)
"nN" = (
/obj/machinery/quick_vendor/beginner,
/turf/open/floor/mainship/red/full,
@@ -741,12 +822,110 @@
},
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"qd" = (
+/obj/structure/window/framed/mainship/white/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/open/floor/plating,
+/area/shuttle/canterbury/medical)
+"sn" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"tx" = (
+/obj/structure/window/framed/mainship/hull/canterbury,
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/shuttle/canterbury/cic)
+"tG" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
"vY" = (
/obj/structure/bed/chair/dropship/passenger{
dir = 1
},
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"wh" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"wp" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3;
+ pixel_y = -4
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = 1;
+ pixel_y = 1
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -3
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = 8
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 7;
+ pixel_y = 5
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = 9;
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = -3
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
+"xH" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 4
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"xN" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 10
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"xT" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"yp" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 8
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"yR" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -6;
+ pixel_y = -6
+ },
+/obj/structure/flora/tree/pine/xmas/presents,
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
"zE" = (
/obj/structure/window/framed/mainship/canterbury,
/obj/structure/cable,
@@ -775,6 +954,32 @@
/obj/machinery/vending/cigarette,
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"EB" = (
+/obj/effect/spawner/random/food_or_drink/christmas_food,
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -10;
+ pixel_y = -6
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_y = -3
+ },
+/obj/effect/spawner/random/misc/present{
+ pixel_x = -3;
+ pixel_y = 9
+ },
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
+"FL" = (
+/obj/structure/cable,
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/effect/spawner/random/food_or_drink/christmas_food{
+ pixel_y = -3
+ },
+/turf/open/floor/plating/plating_catwalk,
+/area/shuttle/canterbury)
"Hv" = (
/obj/structure/window/reinforced/toughened{
dir = 4
@@ -782,24 +987,64 @@
/obj/machinery/quick_vendor/beginner,
/turf/open/floor/mainship/cargo,
/area/shuttle/canterbury)
+"ID" = (
+/obj/structure/prop/holidays/string_lights,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
+"Jp" = (
+/obj/machinery/marine_selector/clothes,
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/red/full,
+/area/shuttle/canterbury)
"KE" = (
/obj/effect/landmark/start/job/crash/squadmarine,
/turf/open/floor/mainship/mono,
/area/shuttle/canterbury)
+"Mz" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 6
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
+"Qx" = (
+/obj/structure/prop/holidays/string_lights,
+/obj/structure/prop/holidays/wreath{
+ dir = 10
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
"RS" = (
/obj/structure/window/framed/mainship/canterbury,
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
+"SL" = (
+/obj/structure/prop/holidays/string_lights{
+ dir = 1
+ },
+/turf/open/floor/mainship/sterile,
+/area/shuttle/canterbury/medical)
"UG" = (
/obj/structure/window/reinforced/toughened{
dir = 1
},
/turf/open/floor/mainship/orange/full,
/area/shuttle/canterbury)
+"Yb" = (
+/obj/structure/prop/holidays/string_lights/corner,
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury)
"YI" = (
/obj/machinery/iv_drip,
/turf/open/floor/mainship/sterile/dark,
/area/shuttle/canterbury/medical)
+"YY" = (
+/obj/structure/prop/holidays/string_lights/corner{
+ dir = 1
+ },
+/turf/closed/wall/mainship/outer/canterbury,
+/area/shuttle/canterbury/cic)
(1,1,1) = {"
aa
@@ -828,8 +1073,8 @@ an
aa
aa
aa
-an
-an
+Yb
+xH
aH
aH
aH
@@ -851,7 +1096,7 @@ cl
aa
aa
aa
-an
+ID
au
aA
aA
@@ -874,7 +1119,7 @@ cm
aa
aa
aa
-an
+ID
av
aB
aJ
@@ -895,10 +1140,10 @@ cm
"}
(5,1,1) = {"
ab
-ac
-ac
-ab
-ab
+tx
+tx
+tG
+xN
cV
aJ
vY
@@ -908,7 +1153,7 @@ cv
aT
bo
bz
-bI
+SL
bK
bU
cb
@@ -921,7 +1166,7 @@ ac
ad
ai
ap
-ab
+wh
cF
aJ
cR
@@ -933,9 +1178,9 @@ bo
bA
bT
cI
-bK
-bK
-bK
+qd
+qd
+qd
bo
an
"}
@@ -944,10 +1189,10 @@ ac
ae
aj
aq
-ab
+Qx
cN
aJ
-aD
+wp
aD
aD
bO
@@ -970,8 +1215,8 @@ ar
aw
bO
bO
-bO
-bO
+yR
+FL
ao
bO
bO
@@ -990,10 +1235,10 @@ ac
ag
aj
as
-ab
+Qx
aL
aJ
-aD
+EB
aD
aD
aD
@@ -1013,7 +1258,7 @@ ac
ah
am
at
-ab
+wh
cP
aJ
cS
@@ -1032,11 +1277,11 @@ an
an
"}
(11,1,1) = {"
-ab
-ac
-ac
-ab
-ab
+YY
+mY
+mY
+sn
+Mz
cQ
aJ
cT
@@ -1058,7 +1303,7 @@ cl
aa
aa
aa
-an
+ID
ax
cQ
aJ
@@ -1068,12 +1313,12 @@ aW
bk
pY
aR
-an
+ey
cK
aJ
aJ
aJ
-cK
+Jp
an
cm
"}
@@ -1081,7 +1326,7 @@ cm
aa
aa
aa
-an
+ID
ay
aF
aF
@@ -1091,7 +1336,7 @@ bp
bq
bq
aD
-an
+ID
bu
cy
cz
@@ -1104,8 +1349,8 @@ cm
aa
aa
aa
-an
-an
+hk
+xT
aK
aK
aK
@@ -1114,7 +1359,7 @@ bn
bn
bn
bv
-an
+ID
bB
cO
bQ
@@ -1137,12 +1382,12 @@ an
an
an
an
-an
-an
-an
-an
-an
-an
+hk
+xT
+xT
+xT
+xT
+yp
an
an
"}
diff --git a/code/__DEFINES/factions.dm b/code/__DEFINES/factions.dm
index a5cd8abb84b7b..44a7e028725bb 100644
--- a/code/__DEFINES/factions.dm
+++ b/code/__DEFINES/factions.dm
@@ -20,6 +20,7 @@
#define FACTION_SPECFORCE "Special Forces"
#define FACTION_VSD "Vyacheslav Security Detail"
#define FACTION_ERP "Emergency Response Pranksters"
+#define FACTION_SANTA "Santa's Workshop"
//Alignement are currently only used by req.
///Mob with a neutral alignement cannot be sold by anyone
@@ -33,6 +34,7 @@
GLOBAL_LIST_INIT(faction_to_alignement, list(
FACTION_NEUTRAL = ALIGNEMENT_NEUTRAL,
//Friendly
+ FACTION_SANTA = ALIGNEMENT_NEUTRAL,
FACTION_TERRAGOV = ALIGNEMENT_FRIENDLY,
FACTION_NANOTRASEN = ALIGNEMENT_FRIENDLY,
FACTION_FREELANCERS = ALIGNEMENT_FRIENDLY,
@@ -72,10 +74,12 @@ GLOBAL_LIST_INIT(faction_to_alignement, list(
///Iff for each faction that is able to use iff
GLOBAL_LIST_INIT(faction_to_iff, list(
FACTION_NEUTRAL = TGMC_LOYALIST_IFF,
+ FACTION_SANTA = TGMC_LOYALIST_IFF,
FACTION_TERRAGOV = TGMC_LOYALIST_IFF,
FACTION_SPECFORCE = TGMC_LOYALIST_IFF,
FACTION_NANOTRASEN = TGMC_LOYALIST_IFF,
FACTION_FREELANCERS = TGMC_LOYALIST_IFF,
+ FACTION_SANTA = TGMC_LOYALIST_IFF,
FACTION_ERP = TGMC_LOYALIST_IFF,
FACTION_CLF = CLF_IFF,
FACTION_DEATHSQUAD = DEATHSQUAD_IFF,
diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index 856b0b64d65fc..8c4868ba1bfff 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -210,6 +210,12 @@
#define TRAIT_SLOWDOWNIMMUNE "slowdown_immunity" //Immunity to slowdown
#define TRAIT_SEE_IN_DARK "see_in_dark" //Able to see in dark
#define TRAIT_MUTED "muted" //target is mute and can't speak
+#define TRAIT_CHRISTMAS_GRINCH "christmas_grinch" //target has opened presents that don't belong to them
+#define TRAIT_ACTUAL_CHRISTMAS_GRINCH "christmas_grinch_actual" //target is quite literally the grinch
+#define TRAIT_SANTA_CLAUS "santa_claus" //target is santa claus
+#define TRAIT_CHRISTMAS_ELF "christmas_elf" //target is a christmas elf
+#define TRAIT_TELEPORTED_ACROSS_ZLEVELS "santa_medevac" //target is a christmas elf
+#define TRAIT_TOOK_COAL "taken coal" //target took coal from christmas tr
#define TRAIT_TURRET_HIDDEN "turret_hidden" //target gets passed over by turrets choosing a victim
///The target xenomorph's wound overlays won't be visible
#define TRAIT_XENOMORPH_INVISIBLE_BLOOD "invisible_blood"
diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm
index 3e8ab94eb3bab..99cb373ac2b45 100644
--- a/code/_globalvars/lists/objects.dm
+++ b/code/_globalvars/lists/objects.dm
@@ -31,6 +31,7 @@ GLOBAL_LIST_EMPTY(eord_roomba_spawns)
GLOBAL_LIST_EMPTY(machines)
GLOBAL_LIST_EMPTY(faxmachines)
GLOBAL_LIST_EMPTY(atmospumps)
+GLOBAL_LIST_EMPTY(christmastrees)
///list of mainship lights, used for altering intensity and color during red and delta security levels
GLOBAL_LIST_EMPTY(mainship_lights)
///list of shipside alarm effects used for delta level alert sirens
diff --git a/code/datums/emergency_calls/santa.dm b/code/datums/emergency_calls/santa.dm
new file mode 100644
index 0000000000000..7bc743166e3f7
--- /dev/null
+++ b/code/datums/emergency_calls/santa.dm
@@ -0,0 +1,245 @@
+//Santa is back in town
+/datum/emergency_call/santa
+ name = "Santa's Workshop"
+ base_probability = 75
+ alignement_factor = 0
+
+
+/datum/emergency_call/santa/print_backstory(mob/living/carbon/human/H)
+ to_chat(H, "You [pick("fed the reindeer and worked hard for 11 months a year", "worked hard to deliver presents to good boys and girls of all species", "survived the ice, snow, and low gravity working tirelessly for Santa", "were a master craftsman who snuck onto Santa's galactic sleigh ride")].")
+ to_chat(H, "As part of Santa's entourage, you travel with him to deliver presents to all who deserve to be rewarded.")
+ to_chat(H, "Santa travels the galaxy once a year, visiting every single inhabited planet in a single period of 24 standard hours. Santa maintains an active defense force to punish especially naughty sapients with lethal force, this defense force currently numbers more than 30,000 elves and ships.")
+ to_chat(H, "")
+ to_chat(H, "Today, while enroute to visit a TGMC vessel, [SSmapping.configs[SHIP_MAP].map_name], the artificial intelligence in Santa's sleigh detected an abnormally high level of naughtiness in the orbit of [SSmapping.configs[GROUND_MAP].map_name]. Santa has resolved to punish them in the spirit of Christmas!")
+ if(GLOB.round_statistics.number_of_grinches >= 1)
+ to_chat(H, "Eradicate all lifeforms aboard the ship to save Christmas, coal won't be enough this time. The only punishment Santa believes in now is hot lead!")
+ else
+ to_chat(H, "Punish the naughty aliens onboard the ship, coal won't be enough this time. The only punishment Santa believes in now is hot lead!")
+
+/datum/emergency_call/santa/create_member(datum/mind/M)
+ . = ..()
+ if(!.)
+ return
+
+ var/mob/original = M.current
+ var/mob/living/carbon/human/H = .
+
+ M.transfer_to(H, TRUE)
+
+ if(original)
+ qdel(original)
+
+ //
+ //Santa himself is a discount deathsquad leader, his elves are just fodder though and very poorly equipped
+ //
+
+ if(!leader)
+ leader = H
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa/leader)
+ H.name = "Santa Claus"
+ H.real_name = H.name
+ H.apply_assigned_role_to_spawn(J)
+ H.set_nutrition(NUTRITION_OVERFED * 2)
+ H.grant_language(/datum/language/xenocommon)
+ ADD_TRAIT(H, TRAIT_SANTA_CLAUS, TRAIT_SANTA_CLAUS)
+ var/datum/action/innate/summon_present/present_spawn = new(H)
+ present_spawn.give_action(H)
+ var/datum/action/innate/summon_present_bomb/present_bomb_spawn = new(H)
+ present_bomb_spawn.give_action(H)
+ var/datum/action/innate/rejuv_self/selfhealing = new(H)
+ selfhealing.give_action(H)
+ var/datum/action/innate/summon_elves/elfsummoning = new(H)
+ elfsummoning.give_action(H)
+ var/datum/action/innate/heal_elf/fixelfslave = new(H)
+ fixelfslave.give_action(H)
+ var/datum/action/innate/elf_swap/swapelf = new(H)
+ swapelf.give_action(H)
+ if(GLOB.round_statistics.number_of_grinches >= 1)
+ to_chat(H, "[span_notice("You are Santa Claus! Eradicate all marines and aliens with overwhelming firepower! Leave none of them alive!!.")]
")
+ else
+ to_chat(H, "[span_notice("You are Santa Claus! Punish all the naughty aliens with overwhelming firepower, starting with their cowardly queen hiding on the ship.")]
")
+ return
+
+ ADD_TRAIT(H, TRAIT_CHRISTMAS_ELF, TRAIT_CHRISTMAS_ELF)
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa)
+ H.apply_assigned_role_to_spawn(J)
+ H.name = "Elf [rand(1,999)]"
+ H.real_name = H.name
+ var/datum/action/innate/elf_recall/recallingelf = new(H)
+ recallingelf.give_action(H)
+ print_backstory(H)
+ if(GLOB.round_statistics.number_of_grinches >= 1)
+ to_chat(H, span_notice("You are a member of Santa's loyal workforce, assist Santa in purging the marine ship of all life, human and xeno!"))
+ else
+ to_chat(H, span_notice("You are a member of Santa's loyal workforce, assist Santa in whatever way you can!"))
+
+/datum/action/innate/summon_present
+ name = "Summon Present"
+ action_icon_state = "present"
+
+/datum/action/innate/summon_present/Activate()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, span_notice("You begin rifling through your bag, looking for a present."))
+ if(!do_after(santamob, 7 SECONDS, NONE))
+ to_chat(santamob, "You give up looking for a present.")
+ return
+ if(locate(/obj/item/a_gift/santa) in get_turf(santamob))
+ to_chat(santamob, "There's a present here already, better use that one instead.")
+ return
+ var/obj/item/a_gift/santa/spawnedpresent = new (get_turf(santamob))
+ santamob.put_in_hands(spawnedpresent)
+
+/datum/action/innate/summon_present_bomb
+ name = "Summon Explosive Present"
+ action_icon_state = "dangerpresent"
+
+/datum/action/innate/summon_present_bomb/Activate()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, span_warning("You begin rifling through your bag, looking for a present bomb."))
+ if(!do_after(santamob, 3 SECONDS))
+ to_chat(santamob, "You stop searching for a present grenade.")
+ return
+ var/obj/item/explosive/grenade/gift/spawnedpresentbomb = new (get_turf(santamob))
+ santamob.put_in_hands(spawnedpresentbomb)
+
+/datum/action/innate/rejuv_self
+ name = "Revitalize Self"
+ action_icon_state = "santa_heal"
+
+/datum/action/innate/rejuv_self/Activate()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, span_notice("You begin summoning Christmas magic to heal your rounds."))
+ if(!do_after(santamob, 2 MINUTES))
+ to_chat(santamob, span_notice("With a burst of holiday spirit you heal your wounds, you're as good as new!"))
+ return
+ santamob.revive()
+
+/datum/action/innate/summon_elves
+ name = "Summon Elves"
+ action_icon_state = "santa_summon"
+
+/datum/action/innate/summon_elves/Activate()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, span_notice("You begin summoning your faithful workers to your side."))
+ if(!do_after(santamob, 15 SECONDS))
+ to_chat(santamob, "You decide not to summon your elves, they aren't much of a help anyway")
+ return
+ for(var/mob/living/carbon/human/elves in GLOB.humans_by_zlevel["[santamob.z]"])
+ if(HAS_TRAIT(elves, TRAIT_CHRISTMAS_ELF))
+ elves.forceMove(get_turf(santamob))
+
+/datum/action/innate/heal_elf
+ name = "Heal Elf"
+ action_icon_state = "heal_elf"
+
+/datum/action/innate/heal_elf/Activate()
+ var/list/elflist = list()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, "You concentrating on healing your elves...")
+ if(!do_after(santamob, 10 SECONDS))
+ to_chat(santamob, "You decide there are more important things to concentrate on...")
+ return
+ for(var/mob/living/carbon/human/elves in GLOB.human_mob_list)
+ if(get_dist(santamob, elves) > 10)
+ continue
+ if(HAS_TRAIT(elves, TRAIT_CHRISTMAS_ELF))
+ elflist += elves
+ for(var/mob/living/carbon/human/blessedelf in elflist)
+ if(blessedelf.stat == DEAD) //this is basically a copypaste of defib logic, but with magic not paddles
+ var/heal_target = blessedelf.get_death_threshold() - blessedelf.health + 1
+ var/all_loss = blessedelf.getBruteLoss() + blessedelf.getFireLoss() + blessedelf.getToxLoss()
+ blessedelf.setOxyLoss(0)
+ blessedelf.updatehealth()
+ if(all_loss && (heal_target > 0))
+ var/brute_ratio = blessedelf.getBruteLoss() / all_loss
+ var/burn_ratio = blessedelf.getFireLoss() / all_loss
+ var/tox_ratio = blessedelf.getToxLoss() / all_loss
+ blessedelf.adjustBruteLoss(-10)
+ blessedelf.adjustFireLoss(-10)
+ blessedelf.adjustToxLoss(-10)
+ blessedelf.setOxyLoss(0)
+ if(tox_ratio)
+ blessedelf.adjustToxLoss(-(tox_ratio * heal_target))
+ blessedelf.heal_overall_damage(brute_ratio*heal_target, burn_ratio*heal_target, TRUE)
+ blessedelf.updatehealth()
+ blessedelf.set_stat(UNCONSCIOUS)
+ blessedelf.emote("gasp")
+ else //if the elf is alive heal them some
+ to_chat(blessedelf, span_notice("You feel the chill of Christmas magic and your wounds are healed!"))
+ blessedelf.setOxyLoss(0)
+ blessedelf.adjustBruteLoss(-30)
+ blessedelf.adjustFireLoss(-30)
+ blessedelf.adjustToxLoss(-30)
+
+/datum/action/innate/summon_paperwork
+ name = "Summon Paperwork"
+ action_icon_state = "paper"
+
+/datum/action/innate/summon_paperwork/Activate()
+ var/mob/living/carbon/human/santamob = usr
+ to_chat(santamob, span_notice("You begin producing a binding employment contract."))
+ if(!do_after(santamob, 3 SECONDS))
+ to_chat(santamob, "You stop producing a contract.")
+ return
+ to_chat(santamob, span_notice("With a flourish, you produce an employment contract and a pen."))
+ var/obj/item/paper/santacontract/newcontract = new (get_turf(santamob))
+ santamob.put_in_hands(newcontract)
+ var/obj/item/tool/pen/newpen = new (get_turf(santamob))
+ santamob.put_in_hands(newpen)
+
+/datum/action/innate/elf_swap
+ name = "Swap with elf"
+ action_icon_state = "santaswap"
+
+/datum/action/innate/elf_swap/Activate()
+ var/list/elflist = list()
+ var/storedzlevel
+ var/mob/living/carbon/human/santamob = usr
+ for(var/mob/living/carbon/human/elves in GLOB.alive_human_list)
+ if(HAS_TRAIT(elves, TRAIT_CHRISTMAS_ELF))
+ elflist += elves
+ var/mob/living/carbon/human/swappedelf = tgui_input_list(santamob , "Choose an elf to swap with", "Elf swapping", elflist)
+ to_chat(santamob, span_notice("You begin summoning your Christmas magic to swap places with an elf..."))
+ to_chat(swappedelf, span_notice("You feel odd, as though you're in two places at once..."))
+ if(HAS_TRAIT(santamob, TRAIT_TELEPORTED_ACROSS_ZLEVELS))
+ if(swappedelf.z != santamob.z)
+ to_chat(santamob, span_warning("You teleported too great a distance recently, you'll need to wait before teleporting that far again..."))
+ return
+ if(!do_after(santamob, 5 SECONDS))
+ to_chat(santamob, span_notice("You stop preparing to switch places with a lowly elf..."))
+ return
+ storedzlevel = santamob.z
+ var/turf/elfturf = get_turf(swappedelf)
+ var/turf/santaturf = get_turf(santamob)
+ santamob.forceMove(elfturf)
+ swappedelf.forceMove(santaturf)
+ swappedelf.Stun(3 SECONDS)
+ if(storedzlevel == santamob.z)
+ santamob.Stun(3 SECONDS)
+ to_chat(santamob, span_notice("You struggle to get your bearings after the swap..."))
+ else
+ santamob.Stun(20 SECONDS)
+ ADD_TRAIT(santamob, TRAIT_TELEPORTED_ACROSS_ZLEVELS, TRAIT_SANTA_CLAUS)
+ addtimer(CALLBACK(santamob, TYPE_PROC_REF(/mob/living/carbon/human, remove_teleport_trait), santamob), 3 MINUTES) //extremely snowflaky proc, viewer beware
+ to_chat(santamob, span_warning("The strain of travelling across such a great distance unbalances you..."))
+ to_chat(swappedelf, span_notice("As the world reels around you, you struggle to get your bearings..."))
+
+/datum/action/innate/elf_recall
+ name = "Return to Santa"
+ action_icon_state = "elf_recall"
+
+/datum/action/innate/elf_recall/Activate()
+ var/list/santalist = list()
+ var/mob/living/carbon/human/elfmob = usr
+ for(var/mob/living/carbon/human/santas in GLOB.humans_by_zlevel["[elfmob.z]"])
+ if(HAS_TRAIT(santas, TRAIT_SANTA_CLAUS))
+ santalist += santas
+ if(!length(santalist))
+ to_chat(elfmob, span_warning("You can't find Santa! There is nobody to return to..."))
+ return
+ to_chat(elfmob, span_notice("You on concentrate on gathering enough magic to return to Santa..."))
+ if(!do_after(elfmob, 10 SECONDS))
+ to_chat(elfmob, "You decide there are more important things to do...")
+ return
+ var/mob/living/carbon/human/selectedsanta = pick(santalist)
+ elfmob.forceMove(get_turf(selectedsanta))
diff --git a/code/datums/gamemodes/_game_mode.dm b/code/datums/gamemodes/_game_mode.dm
index e79ecba03252b..f687f2605e63c 100644
--- a/code/datums/gamemodes/_game_mode.dm
+++ b/code/datums/gamemodes/_game_mode.dm
@@ -394,6 +394,14 @@ GLOBAL_LIST_INIT(bioscan_locations, list(
parts += "[GLOB.round_statistics.grenades_thrown] total grenades exploding."
else
parts += "No grenades exploded."
+ if(GLOB.round_statistics.presents_delivered)
+ parts += "[GLOB.round_statistics.presents_delivered] people had presents delivered to them."
+ if(GLOB.round_statistics.santa_presents_delivered)
+ parts += "Santa personally delivered [GLOB.round_statistics.santa_presents_delivered] of them!"
+ if(GLOB.round_statistics.presents_grinched)
+ parts += "[GLOB.round_statistics.presents_grinched] presents were opened by somebody they didn't belong to."
+ if(GLOB.round_statistics.number_of_grinches)
+ parts += "[GLOB.round_statistics.number_of_grinches] players ruined the spirit of Christmas during the round."
if(GLOB.round_statistics.mortar_shells_fired)
parts += "[GLOB.round_statistics.mortar_shells_fired] mortar shells were fired."
if(GLOB.round_statistics.howitzer_shells_fired)
diff --git a/code/datums/gamemodes/objective.dm b/code/datums/gamemodes/objective.dm
index c2f90a8a0b526..966bc648e9f5b 100644
--- a/code/datums/gamemodes/objective.dm
+++ b/code/datums/gamemodes/objective.dm
@@ -278,6 +278,50 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list
if(tgui_alert(admin, "Relax escape requirements (recommended for admin events)?", "Continue?", list("Yes", "No")) != "No")
admin_event = TRUE
+/datum/objective/deliver_gifts
+ name = "deliver gifts"
+ explanation_text = "Deliver gifts to good members of the Terragov marine corp."
+ team_explanation_text = "Deliver gifts to good members of the Terragov marine corp."
+ var/presents_to_be_given = 0
+
+/datum/objective/deliver_gifts/New()
+ . = ..()
+ presents_to_be_given = rand(1, length(GLOB.alive_human_list)/2)
+
+/datum/objective/deliver_gifts/check_completion()
+ if(GLOB.round_statistics.santa_presents_delivered >= presents_to_be_given)
+ return TRUE
+ return FALSE
+
+/datum/objective/deliver_gifts/update_explanation_text()
+ . = ..()
+ explanation_text = "Deliver [presents_to_be_given] gifts to good members of Terragov marine corp."
+
+/datum/objective/recruit_elves
+ name = "recruit elves"
+ explanation_text = "The North Pole is experiencing a labor strike! Recruit some marines to your little helpers."
+ team_explanation_text = "The North Pole is experiencing a labor strike! Recruit some marines to your little helpers."
+ var/elves_to_be_recruited = 0
+
+/datum/objective/recruit_elves/update_explanation_text()
+ . = ..()
+ explanation_text = "The North Pole is experiencing a labor strike! Recruit [elves_to_be_recruited] marines to be your little helpers."
+
+/datum/objective/recruit_elves/New()
+ . = ..()
+ elves_to_be_recruited = rand(1, 4)
+
+/datum/objective/recruit_elves/check_completion()
+ var/elves_recruited = 0
+ for(var/mob/living/carbon/human/potentialelf in GLOB.alive_human_list)
+ if(potentialelf.stat == DEAD)
+ continue
+ if(HAS_TRAIT(potentialelf, TRAIT_CHRISTMAS_ELF))
+ elves_recruited += 1
+ if(elves_recruited >= elves_to_be_recruited)
+ return TRUE
+ return FALSE
+
/datum/objective/survive
name = "survive"
explanation_text = "Survive until the end of the operation."
@@ -526,6 +570,17 @@ GLOBAL_LIST_EMPTY(possible_items)
return FALSE
return TRUE
+/datum/objective/kill_xenos
+ name = "kill all xenos"
+ explanation_text = "Eliminate all xenos and destroy their silo. For the TGMC!"
+ team_explanation_text = "Eliminate all xenos and destroy their silo. For the TGMC!"
+
+/datum/objective/kill_xenos/check_completion()
+ for(var/mob/living/carbon/xenomorph/affectedmob in GLOB.mob_list)
+ if(isxeno(affectedmob))
+ return FALSE
+ return TRUE
+
/datum/objective/seize_area
name = "control area"
explanation_text = "Hold area and defend against all intruders."
diff --git a/code/datums/jobs/job/other.dm b/code/datums/jobs/job/other.dm
index 9dd2384eeffbf..faf385e3584a8 100644
--- a/code/datums/jobs/job/other.dm
+++ b/code/datums/jobs/job/other.dm
@@ -102,3 +102,323 @@
/datum/job/zombie
title = "Oh god run"
+
+/datum/job/santa
+ title = "Elf" //no custom names here, Santa can't tell them apart
+ access = ALL_ANTAGONIST_ACCESS
+ minimal_access = ALL_ANTAGONIST_ACCESS
+ skills_type = /datum/skills/elf
+ faction = FACTION_SANTA
+ outfit = /datum/outfit/job/santa/elf
+
+/datum/job/santa/elf/eventspawn
+ outfit = /datum/outfit/job/santa/elf/eventspawn
+
+/datum/job/santa/leader
+ title = "Santa Claus"
+ access = ALL_ACCESS
+ minimal_access = ALL_ACCESS
+ skills_type = /datum/skills/santaclause
+ outfit = /datum/outfit/job/santa/leader
+
+/datum/job/santa/contractspawn
+ outfit = /datum/outfit/job/santa/elf/contractspawn
+
+/datum/job/santa/eventspawn
+ title = "Event Santa Claus"
+ access = ALL_ACCESS
+ minimal_access = ALL_ACCESS
+ skills_type = /datum/skills/santaclause
+ outfit = /datum/outfit/job/santa/eventspawn
+
+/datum/job/santa/grinch
+ title = "The Grinch"
+ access = ALL_ACCESS
+ minimal_access = ALL_ACCESS
+ skills_type = /datum/skills/grinch
+ outfit = /datum/outfit/job/grinch
+
+/datum/outfit/job/santa/elf
+ name = "Elf"
+ jobtype = /datum/outfit/job/santa/elf/eventspawn
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/holster/belt/pistol/m4a3/vp70_pmc
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/spec_operative/elf
+ shoes = /obj/item/clothing/shoes/ruggedboot
+ wear_suit = /obj/item/clothing/suit/space/elf/nodrop
+ gloves = /obj/item/clothing/gloves/ruggedgloves
+ head = /obj/item/clothing/head/helmet/space/elf/special
+ glasses = /obj/item/clothing/glasses/welding
+ l_store = /obj/item/storage/pouch/construction/equippedengineer
+ r_store = /obj/item/storage/pouch/tools/full
+ back = /obj/item/storage/backpack/industrial
+ suit_store = /obj/item/weapon/gun/pistol/vp70
+ r_hand = /obj/item/weapon/twohanded/spear/candycane/elf
+
+/datum/outfit/job/santa/elf/eventspawn
+ name = "Event Elf"
+ jobtype = /datum/job/santa
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/belt/utility/full
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/spec_operative/elf
+ shoes = /obj/item/clothing/shoes/ruggedboot
+ wear_suit = /obj/item/clothing/suit/space/elf/nodrop
+ gloves = /obj/item/clothing/gloves/ruggedgloves
+ head = /obj/item/clothing/head/helmet/space/elf/special
+ glasses = /obj/item/clothing/glasses/welding
+ l_store = /obj/item/storage/pouch/medkit/medic
+ r_store = /obj/item/storage/pouch/pistol/vp70
+ back = /obj/item/storage/backpack/industrial
+ suit_store = /obj/item/weapon/gun/pistol/vp70
+ r_hand = /obj/item/weapon/twohanded/spear/candycane/elf
+
+/datum/outfit/job/santa/elf/contractspawn
+ name = "Contract Elf"
+ jobtype = /datum/job/santa/contractspawn
+
+ id = /obj/item/card/id/silver
+ belt = /obj/item/storage/belt/utility/full
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/spec_operative/elf
+ shoes = /obj/item/clothing/shoes/ruggedboot
+ wear_suit = /obj/item/clothing/suit/space/elf
+ gloves = /obj/item/clothing/gloves/ruggedgloves
+ head = /obj/item/clothing/head/helmet/space/elf/special
+ glasses = /obj/item/clothing/glasses/welding/elf
+ l_store = /obj/item/storage/pouch/medkit/medic
+ r_store = /obj/item/storage/pouch/pistol/vp70
+ back = /obj/item/storage/backpack/industrial
+ suit_store = /obj/item/weapon/gun/pistol/vp70
+ r_hand = /obj/item/weapon/twohanded/spear/candycane/elf
+
+/datum/outfit/job/santa/elf/eventspawn/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone/special, SLOT_IN_HEAD)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo/special, SLOT_IN_HEAD)
+
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_R_POUCH)
+
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/small_stack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/small_stack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/eggnog/special, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/standard_pistol, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp70, SLOT_IN_BACKPACK)
+
+/datum/outfit/job/santa/leader //he's done ho ho ho ing around
+ name = "ERT Santa Claus"
+ jobtype = /datum/job/santa/leader
+
+ id = /obj/item/card/id/gold
+ belt = /obj/item/storage/belt/coalbelt/full
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando
+ shoes = /obj/item/clothing/shoes/galoshes/santa
+ wear_suit = /obj/item/clothing/suit/space/santa/special
+ gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando/santa
+ mask = /obj/item/clothing/mask/gas/swat/santa
+ head = /obj/item/clothing/head/helmet/space/santahat/special
+ glasses = /obj/item/clothing/glasses/thermal/eyepatch //santa lost one of his eyes in a vicious reindeer accident circa '32
+ r_store = /obj/item/storage/pouch/magazine/pistol/large
+ l_store = /obj/item/storage/pouch/medkit/firstaid
+ back = /obj/item/storage/backpack/santabag
+ suit_store = /obj/item/weapon/gun/launcher/rocket/m57a4
+
+/datum/outfit/job/santa/leader/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone, SLOT_IN_HEAD)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo, SLOT_IN_HEAD)
+
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_R_POUCH)
+
+ H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/auto9, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/rocket/m57a4, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiethree/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiefour/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiefive/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiesix/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieseven/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/eggnog/special, SLOT_IN_L_POUCH)
+
+ H.equip_to_slot_or_del(new /obj/item/whistle, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/pastries/fruitcake, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/green, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK)
+
+/datum/outfit/job/santa/eventspawn //like ERT santa, but less OP
+ name = "Event Santa Claus"
+ jobtype = /datum/job/santa/eventspawn
+
+ id = /obj/item/card/id/gold
+ belt = /obj/item/storage/belt/coalbelt/full
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando
+ shoes = /obj/item/clothing/shoes/galoshes/santa
+ wear_suit = /obj/item/clothing/suit/space/santa/special/eventspawn
+ gloves = /obj/item/clothing/gloves/marine/veteran/pmc/commando/santa
+ mask = /obj/item/clothing/mask/gas/swat/santa/eventspawn
+ head = /obj/item/clothing/head/helmet/space/santahat/special
+ r_store = /obj/item/storage/pouch/magazine/large/pmc_m25
+ l_store = /obj/item/storage/pouch/santaspouch
+ back = /obj/item/storage/backpack/santabag
+ suit_store = /obj/item/weapon/gun/smg/m25/elite
+
+/datum/outfit/job/santa/eventspawn/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone, SLOT_IN_HEAD)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo, SLOT_IN_HEAD)
+
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_R_POUCH)
+
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m25/ap, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/shield/energy, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/gun/revolver/mateba, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/revolver/mateba, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiethree/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiefour/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiefive/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookiesix/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieseven/special, SLOT_IN_L_POUCH)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/eggnog/special, SLOT_IN_L_POUCH)
+
+ H.equip_to_slot_or_del(new /obj/item/whistle, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/plastique, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/detpack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/assembly/signaler, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/pastries/fruitcake, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/weapon/energy/sword/green, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/mirage, SLOT_IN_BACKPACK)
+
+
+/datum/outfit/job/santa/elf/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+
+
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookieone/special, SLOT_IN_HEAD)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/christmas_cookietwo/special, SLOT_IN_HEAD)
+
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/vp70, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/medium_stack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/medium_stack, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/storage/box/m94, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/drinks/bottle/eggnog/special, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/explosive/grenade/pmc, SLOT_IN_BACKPACK)
+
+/datum/outfit/job/grinch //like ERT santa, but less OP
+ name = "The Grinch"
+ jobtype = /datum/job/santa/grinch
+
+ id = /obj/item/card/id/gold
+ belt = /obj/item/storage/belt/hypospraybelt/full
+ ears = /obj/item/radio/headset/distress/commando
+ w_uniform = /obj/item/clothing/under/marine/veteran/pmc/commando
+ shoes = /obj/item/clothing/shoes/galoshes
+ wear_suit = /obj/item/clothing/suit/space/grinch
+ gloves = /obj/item/clothing/gloves/insulated
+ r_store = /obj/item/storage/pouch/tools/full
+ l_store = /obj/item/storage/pouch/construction/full
+ back = /obj/item/storage/backpack/santabag
+ glasses = /obj/item/clothing/glasses/welding/superior
+
+/datum/outfit/job/grinch/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
+ . = ..()
+
+ H.equip_to_slot_or_del(new /obj/item/binoculars, SLOT_IN_BACKPACK)
+
+ H.equip_to_slot_or_del(new /obj/item/whistle, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/megaphone, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/tool/crowbar/red, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/grinchium, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/glass/bottle/grinchium, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/hypospray/advanced/big, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/syndi, SLOT_IN_BACKPACK)
+ H.equip_to_slot_or_del(new /obj/item/reagent_containers/food/snacks/sliceable/pastries/fruitcake, SLOT_IN_BACKPACK)
+
diff --git a/code/datums/round_statistics.dm b/code/datums/round_statistics.dm
index 1c3cb0257358f..fb343c145862e 100644
--- a/code/datums/round_statistics.dm
+++ b/code/datums/round_statistics.dm
@@ -100,6 +100,10 @@ GLOBAL_DATUM_INIT(round_statistics, /datum/round_statistics, new)
var/psy_lances = 0
var/psy_shields = 0
var/psy_shield_blasts = 0
+ var/number_of_grinches = 0
+ var/presents_grinched = 0
+ var/presents_delivered = 0
+ var/santa_presents_delivered = 0
var/sandevistan_uses = 0
var/sandevistan_gibs = 0
var/runner_items_stolen = 0
diff --git a/code/datums/skills.dm b/code/datums/skills.dm
index 0caabedf27f83..6d834eba28e50 100644
--- a/code/datums/skills.dm
+++ b/code/datums/skills.dm
@@ -715,6 +715,48 @@ engineer, construction, leadership, medical, surgery, pilot, police, powerloader
medical = SKILL_MEDICAL_PRACTICED
surgery = SKILL_SURGERY_TRAINED
+/datum/skills/santaclause
+ name = "Santa Claus"
+ engineer = SKILL_ENGINEER_MASTER
+ construction = SKILL_CONSTRUCTION_MASTER
+ combat = SKILL_COMBAT_TRAINED
+ smartgun = SKILL_SMART_MASTER
+ medical = SKILL_MEDICAL_PRACTICED
+ unarmed = SKILL_UNARMED_MASTER
+ surgery = SKILL_SURGERY_TRAINED
+ melee_weapons = SKILL_MELEE_SUPER
+ leadership = SKILL_LEAD_MASTER
+ pilot = SKILL_PILOT_TRAINED
+ pistols = SKILL_PISTOLS_TRAINED
+ smgs = SKILL_SMGS_TRAINED
+ rifles = SKILL_RIFLES_TRAINED
+ shotguns = SKILL_SHOTGUNS_TRAINED
+ heavy_weapons = SKILL_HEAVY_WEAPONS_TRAINED
+
+/datum/skills/grinch
+ name = "The Grinch"
+ engineer = SKILL_ENGINEER_MASTER
+ construction = SKILL_CONSTRUCTION_MASTER
+ combat = SKILL_COMBAT_UNTRAINED
+ smartgun = SKILL_SMART_DEFAULT
+ medical = SKILL_MEDICAL_MASTER
+ unarmed = SKILL_UNARMED_MASTER
+ surgery = SKILL_SURGERY_MASTER
+ melee_weapons = SKILL_MELEE_SUPER
+ leadership = SKILL_LEAD_MASTER
+ pilot = SKILL_PILOT_TRAINED
+
+/datum/skills/elf
+ name = "Elf"
+ unarmed = SKILL_UNARMED_WEAK
+ melee_weapons = SKILL_MELEE_TRAINED
+ engineer = SKILL_ENGINEER_MASTER
+ construction = SKILL_CONSTRUCTION_MASTER
+ medical = SKILL_MEDICAL_PRACTICED
+ surgery = SKILL_SURGERY_AMATEUR
+ pistols = SKILL_PISTOLS_TRAINED
+ rifles = SKILL_RIFLES_TRAINED
+
/*====== I.o.M. ======*/
/datum/skills/imperial
diff --git a/code/datums/storage/subtypes/backpack.dm b/code/datums/storage/subtypes/backpack.dm
index a186cd4d18ca2..9724eba99a655 100644
--- a/code/datums/storage/subtypes/backpack.dm
+++ b/code/datums/storage/subtypes/backpack.dm
@@ -21,7 +21,14 @@
/datum/storage/backpack/santabag
max_w_class = WEIGHT_CLASS_NORMAL
- max_storage_space = 400 // can store a ton of shit!
+ max_storage_space = 60 // can store a ton of shit!
+ access_delay = 0
+
+/datum/storage/backpack/santabag/New(atom/parent)
+ . = ..()
+ set_holdable(storage_type_limits_list = list(
+ /obj/item/weapon/gun/launcher/rocket/m57a4,
+ ))
/datum/storage/backpack/satchel //Smaller, but no delay
max_storage_space = 15
diff --git a/code/game/objects/effects/acid_hole.dm b/code/game/objects/effects/acid_hole.dm
index a07e9c2813cb4..ffbb46542d6ef 100644
--- a/code/game/objects/effects/acid_hole.dm
+++ b/code/game/objects/effects/acid_hole.dm
@@ -140,6 +140,10 @@
to_chat(user, span_warning("Your programming prevents you from doing this."))
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && G.dangerous && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ to_chat(user, span_warning("Your programming prevents you from doing this."))
+ return
+
if(!T || T.density)
to_chat(user, span_warning("This hole leads nowhere!"))
return
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index 4fabdd0e0ac04..5ef0549d1f1f4 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -84,6 +84,9 @@
/obj/effect/decal/cleanable/liquid_fuel/attackby(obj/item/I, mob/user, params)
. = ..()
if(I.damtype == BURN)
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Burning somebody alive won't ruin Christmas...")
+ return
ignite_fuel(I)
log_attack("[key_name(user)] ignites [src] in fuel in [AREACOORD(user)]")
diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
index 9e6bde76ffd02..0cca201703b63 100644
--- a/code/game/objects/effects/decals/Cleanable/misc.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -153,3 +153,25 @@
layer = TURF_LAYER
icon = 'icons/effects/effects.dmi'
icon_state = "smashed_pie"
+
+/obj/effect/decal/cleanable/grinch_decal
+ name = "dirt"
+ desc = "Someone should clean that up."
+ density = FALSE
+ anchored = TRUE
+ layer = TURF_LAYER
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "dirt"
+ mouse_opacity = 0
+
+/obj/effect/decal/cleanable/dirt/grinch_decal1
+ icon_state = "grinch1"
+
+/obj/effect/decal/cleanable/dirt/grinch_decal2
+ icon_state = "grinch2"
+
+/obj/effect/decal/cleanable/dirt/grinch_decal3
+ icon_state = "grinch3"
+
+/obj/effect/decal/cleanable/dirt/grinch_decal4
+ icon_state = "grinch4"
diff --git a/code/game/objects/effects/spawners/random/food_or_drink.dm b/code/game/objects/effects/spawners/random/food_or_drink.dm
index cc217a08db654..4af8c954bfa20 100644
--- a/code/game/objects/effects/spawners/random/food_or_drink.dm
+++ b/code/game/objects/effects/spawners/random/food_or_drink.dm
@@ -356,3 +356,21 @@
/obj/item/reagent_containers/food/snacks/sandwiches/toastedsandwich = 5,
/obj/effect/spawner/random/food_or_drink/burger = 5,
)
+
+/obj/effect/spawner/random/food_or_drink/christmas_food
+ name = "Random christmas food"
+ icon_state = "random_xmas"
+ spawn_loot_chance = 30
+ loot = list(
+ /obj/item/reagent_containers/food/snacks/christmas_cookieone,
+ /obj/item/reagent_containers/food/snacks/christmas_cookietwo,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiethree,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefour,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefive,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiesix,
+ /obj/item/reagent_containers/food/snacks/christmas_cookieseven,
+ /obj/item/reagent_containers/food/snacks/sliceable/pastries/fruitcake,
+ /obj/item/reagent_containers/food/snacks/pastries/cakeslicefruit,
+ /obj/item/reagent_containers/food/drinks/h_chocolate,
+ /obj/item/reagent_containers/food/drinks/milk/xmas,
+ )
diff --git a/code/game/objects/effects/spawners/random/misc_item.dm b/code/game/objects/effects/spawners/random/misc_item.dm
index de1151e3ceab2..2359ffab1f0ee 100644
--- a/code/game/objects/effects/spawners/random/misc_item.dm
+++ b/code/game/objects/effects/spawners/random/misc_item.dm
@@ -349,3 +349,21 @@
loot = list(
/obj/effect/decal/cleanable/blood,
)
+
+/obj/effect/spawner/random/misc/present
+ name = "Random present spawner"
+ icon_state = "random_present"
+ spawn_loot_chance = 90
+ loot = list(
+ /obj/item/a_gift,
+ /obj/item/a_gift/free,
+ )
+
+/obj/effect/spawner/random_set/christmas_costume
+ name = "Random santa suit set spawner"
+ icon = 'icons/effects/random/misc.dmi'
+ icon_state = "random_santasuit"
+ spawn_nothing_percentage = 50
+ option_list = list(
+ list(/obj/item/clothing/head/helmet/space/santahat, /obj/item/clothing/suit/space/santa,),
+ )
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index ce49c16fac8f9..9920a3bbb3eb6 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -538,6 +538,9 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan
if(issynth(H) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use))
to_chat(H, span_warning("Your programming prevents you from wearing this."))
return FALSE
+ if(HAS_TRAIT(H, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && CHECK_BITFIELD(item_flags, SYNTH_RESTRICTED) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ to_chat(H, span_warning("Equipping this won't help you ruin Christmas."))
+ return FALSE
var/obj/item/selected_slot //the item in the specific slot we're trying to insert into
var/equip_to_slot = FALSE
diff --git a/code/game/objects/items/explosives/bombvest.dm b/code/game/objects/items/explosives/bombvest.dm
index 26666955ad4a9..a18b31af7f4e7 100644
--- a/code/game/objects/items/explosives/bombvest.dm
+++ b/code/game/objects/items/explosives/bombvest.dm
@@ -32,6 +32,9 @@
if(issynth(activator) && !CONFIG_GET(flag/allow_synthetic_gun_use))
balloon_alert(user, "Can't wear this")
return TRUE
+ if(HAS_TRAIT(activator, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Can't wear this")
+ return
if(user.alpha != 255)
balloon_alert(user, "Can't, your cloak prevents you")
return TRUE
diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm
index 058a4748d4f85..85267776f2d70 100644
--- a/code/game/objects/items/explosives/grenades/grenade.dm
+++ b/code/game/objects/items/explosives/grenades/grenade.dm
@@ -46,7 +46,9 @@
if(issynth(user) && dangerous && !CONFIG_GET(flag/allow_synthetic_gun_use))
balloon_alert(user, "can't, against your programming")
return
-
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Can't do this")
+ return
activate(user)
balloon_alert_to_viewers("primes grenade")
diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm
new file mode 100644
index 0000000000000..cea3cf9a728bd
--- /dev/null
+++ b/code/game/objects/items/gift.dm
@@ -0,0 +1,349 @@
+/* Gifts and wrapping paper
+ * Contains:
+ * Gifts
+ * Wrapping Paper
+ */
+
+/*
+ * Gifts
+ */
+
+GLOBAL_LIST_EMPTY(possible_gifts)
+
+///special grenade that looks like a present, santa spawn only
+/obj/item/explosive/grenade/gift
+ name = "gift"
+ desc = "A wrapped bundle of joy, you'll have to get closer to see who it's addressed to."
+ icon = 'icons/obj/items/items.dmi'
+ icon_state = "gift0"
+ hud_state = "gift0"
+ light_impact_range = 6
+
+/obj/item/explosive/grenade/gift/Initialize(mapload)
+ . = ..()
+ icon_state = "gift[rand(0,10)]"
+ worn_icon_state = icon_state
+ hud_state = icon_state
+ icon_state_mini = icon_state
+
+/obj/item/explosive/grenade/gift/attack_self(mob/user)
+ if(HAS_TRAIT(user, TRAIT_SANTA_CLAUS)) //santa uses the present as a grenade
+ to_chat(user, span_warning("This present is now live, toss it at somebody naughty!"))
+ . = ..()
+ else //anyone else opening the present gets an explosion, yes this also affects elves
+ explosion(loc, light_impact_range = src.light_impact_range, weak_impact_range = src.weak_impact_range)
+ qdel(src)
+
+/obj/item/explosive/grenade/gift/examine(mob/user)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_SANTA_CLAUS))
+ . += "This present is rigged to blow! Activate it yourself to throw it like a grenade, or give it to somebody on the naughty list and watch it blow up in their face."
+ if(HAS_TRAIT(user, TRAIT_CHRISTMAS_ELF))
+ . += "One of the boss' presents, this one is explosive and will go off if you open it."
+
+/obj/item/a_gift
+ name = "gift"
+ desc = "A wrapped bundle of joy, you'll have to get closer to see who it's addressed to."
+ icon = 'icons/obj/items/items.dmi'
+ icon_state = "gift0"
+ resistance_flags = RESIST_ALL
+ ///if true the present can be opened by anybody
+ var/freepresent = FALSE
+ ///who is the present addressed to?
+ var/mob/living/carbon/human/present_receiver = null
+ ///item contained in this gift
+ var/obj/item/contains_type
+ ///real name of the present receiver
+ var/present_receiver_name = null
+ ///is santa the giver of this present?
+ var/is_santa_present = FALSE
+
+/obj/item/a_gift/santa
+ is_santa_present = TRUE
+
+/obj/item/a_gift/Initialize(mapload)
+ . = ..()
+ pixel_x = rand(-10,10)
+ pixel_y = rand(-10,10)
+ icon_state = "gift[rand(0,10)]"
+
+ contains_type = get_gift_type()
+
+/obj/item/a_gift/attack(mob/M, mob/user, def_zone)
+ if(HAS_TRAIT(M, TRAIT_SANTA_CLAUS) || HAS_TRAIT(M, TRAIT_CHRISTMAS_ELF))
+ to_chat(user, span_warning("[M] should deliver gifts, not receive them..."))
+ return
+ if(HAS_TRAIT(user, TRAIT_SANTA_CLAUS))
+ if(present_receiver == M)
+ to_chat(user, span_warning("[M] is already the intended recipient of this present."))
+ return
+ to_chat(user, span_warning("Using your Christmas powers, you begin to reassign the gift and its contents to [M]..."))
+ if(!do_after(user, 10 SECONDS))
+ to_chat(user, span_warning("You decide that [M] doesn't deserve this present."))
+ return
+ present_receiver = M
+ present_receiver_name = M.name
+ to_chat(user, span_warning("You reassign the gift and its contents to [M]."))
+ M.balloon_alert_to_viewers("[user] reassigns [present_receiver_name]'s gift to [M]" ,ignored_mobs = user)
+
+/obj/item/a_gift/examine(mob/user)
+ . = ..()
+ if(HAS_TRAIT(user, TRAIT_SANTA_CLAUS)) //santa can reveal the owner of a present just by looking at it
+ if(present_receiver == null && !freepresent)
+ get_recipient()
+ if(present_receiver)
+ . += "This present is addressed to [present_receiver_name]."
+
+/obj/item/a_gift/attackby(obj/item/attacking_item, mob/user, params)
+ . = ..()
+ if(!HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) || !istype(attacking_item, /obj/item/weapon || user.a_intent != INTENT_HARM))
+ return
+ else
+ balloon_alert_to_viewers("[user] destroys the [src] with their [attacking_item]!")
+ new /obj/item/stack/sheet/cardboard(get_turf(src))
+ new /obj/effect/decal/cleanable/blood/gibs/robot(get_turf(src))
+ qdel(src)
+
+/obj/item/a_gift/attack_self(mob/M)
+ if(present_receiver == null && !freepresent && !HAS_TRAIT(M, TRAIT_SANTA_CLAUS))
+ to_chat(M, span_warning("You start unwrapping the present, trying to locate any sign of who the present belongs to..."))
+ if(!do_after(M, 4 SECONDS))
+ return
+ get_recipient() //generate owner of gift
+ if(HAS_TRAIT(M, TRAIT_SANTA_CLAUS) || HAS_TRAIT(M, TRAIT_CHRISTMAS_ELF))
+ if(present_receiver == null && !freepresent)
+ get_recipient()
+ to_chat(M, span_notice("This present is addressed to [present_receiver_name]."))
+ to_chat(M, span_warning("You're supposed to deliver presents, not open them."))
+ return
+ if(!freepresent && present_receiver != M)
+ switch(tgui_alert(M, "This present is addressed to [present_receiver_name]. Open it anyways?", "Continue?", list("Yes", "No")))
+ if("Yes")
+ if(!do_after(M, 1.5 SECONDS))
+ to_chat(M, span_warning("You start unwrapping the present..."))
+ return
+ M.visible_message(span_warning("[M] tears into [present_receiver_name]'s gift with reckless abandon!"))
+ M.balloon_alert_to_viewers("Open's [present_receiver_name]'s gift" ,ignored_mobs = M)
+ log_game("[M] has opened a present that belonged to [present_receiver_name] at [AREACOORD(loc)]")
+ if(prob(70) || HAS_TRAIT(M, TRAIT_CHRISTMAS_GRINCH))
+ GLOB.round_statistics.presents_grinched += 1
+ if(!HAS_TRAIT(M, TRAIT_CHRISTMAS_GRINCH))
+ GLOB.round_statistics.number_of_grinches += 1
+ ADD_TRAIT(M, TRAIT_CHRISTMAS_GRINCH, TRAIT_CHRISTMAS_GRINCH) //bad present openers are effectively cursed to receive nothing but coal for the rest of the round
+ to_chat(M, span_boldannounce("Your heart feels three sizes smaller..."))
+ M.color = COLOR_LIME
+ spawnpresent(M) //they have the grinch trait, the presents will always spawn coal
+ else
+ spawnpresent(M, TRUE) //they got lucky, the present will open as normal but with a STOLEN label in the desc
+ qdel(src)
+ else
+ return
+
+ qdel(src)
+ spawnpresent(M)
+
+/obj/item/a_gift/proc/get_recipient(mob/M)
+ var/list/z_levels = SSmapping.levels_by_any_trait(list(ZTRAIT_MARINE_MAIN_SHIP, ZTRAIT_GROUND, ZTRAIT_RESERVED))
+ var/list/eligible_targets = list()
+ for(var/z in z_levels)
+ for(var/i in GLOB.alive_human_list)
+ var/mob/living/carbon/human/potential_gift_receiver = i
+ if(!istype(potential_gift_receiver) || !potential_gift_receiver.client)
+ continue
+ eligible_targets += potential_gift_receiver
+ if(!length(eligible_targets))
+ freepresent = TRUE //nobody alive, anybody can open it
+ present_receiver = (pick(eligible_targets))
+ present_receiver_name = present_receiver.real_name //assign real name for maximum readability on examine
+
+/obj/item/a_gift/proc/spawnpresent(mob/M, stolen_gift)
+ if(HAS_TRAIT(M, TRAIT_CHRISTMAS_GRINCH))
+ var/obj/item/C = new /obj/item/ore/coal(get_turf(M))
+ to_chat(M, span_boldannounce("You feel the icy tug of Santa's magic envelop the present before you can open it!"))
+ M.put_in_hands(C)
+ M.balloon_alert_to_viewers("Received a piece of [C]")
+ return
+ else
+ var/obj/item/I = new contains_type(get_turf(M))
+ log_game("[M] has opened a present that contained a [I] at [AREACOORD(loc)]")
+ if(QDELETED(I)) //might contain something like metal rods that might merge with a stack on the ground
+ M.balloon_alert_to_viewers("Nothing inside [M]'s gift" ,ignored_mobs = M)
+ M.balloon_alert(M, "Nothing inside")
+ return
+ if(!freepresent)
+ if(is_santa_present)
+ GLOB.round_statistics.santa_presents_delivered += 1
+ GLOB.round_statistics.presents_delivered += 1
+ if(!stolen_gift)
+ I.desc += " Property of [M.real_name]."
+ else
+ I.color = pick(COLOR_SOFT_RED, COLOR_GREEN, COLOR_LIME, COLOR_RED_LIGHT)
+ I.desc += " The word 'STOLEN' is visible in bright red and green ink."
+ M.balloon_alert_to_viewers("Found a [I]")
+ M.put_in_hands(I)
+
+/obj/item/a_gift/proc/get_gift_type()
+ var/gift_type_list = list(/obj/item/weapon/holo/esword,
+ /obj/item/toy/sword,
+ /obj/item/toy/dice/d20,
+ /obj/item/toy/plush/rouny,
+ /obj/item/toy/spinningtoy,
+ /obj/item/toy/syndicateballoon,
+ /obj/item/storage/wallet,
+ /obj/item/storage/wallet/random,
+ /obj/item/megaphone,
+ /obj/item/storage/box/snappops,
+ /obj/item/storage/fancy/crayons,
+ /obj/item/storage/backpack/holding,
+ /obj/item/storage/belt/champion,
+ /obj/item/tool/soap/deluxe,
+ /obj/item/tool/pickaxe/diamond,
+ /obj/item/tool/pen/invisible,
+ /obj/item/explosive/grenade/smokebomb,
+ /obj/item/corncob,
+ /obj/item/spacecash/c500,
+ /obj/item/spacecash/c100,
+ /obj/item/coin/diamond,
+ /obj/item/ashtray,
+ /obj/item/clothing/head/boonie,
+ /obj/item/clothing/head/beaverhat,
+ /obj/item/clothing/head/cakehat,
+ /obj/item/clothing/head/cardborg,
+ /obj/item/clothing/head/chicken,
+ /obj/item/clothing/head/cat,
+ /obj/item/clothing/head/powdered_wig,
+ /obj/item/clothing/head/xenos,
+ /obj/item/clothing/mask/cigarette/pipe/cobpipe,
+ /obj/item/book/manual/chef_recipes,
+ /obj/item/clothing/head/helmet/space/santahat,
+ /obj/item/toy/beach_ball,
+ /obj/item/toy/beach_ball/holoball,
+ /obj/item/weapon/banhammer,
+ /obj/item/card/id/syndicate_command,
+ /obj/item/clothing/head/helmet/space/syndicate/black/red,
+ /obj/item/clothing/suit/space/syndicate/black/red,
+ /obj/item/clothing/suit/xenos,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosiadeus,
+ /obj/item/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+ /obj/item/tool/shovel/etool,
+ /obj/item/stack/barbed_wire/small_stack,
+ /obj/item/storage/toolbox/syndicate,
+ /obj/item/storage/belt/utility/full,
+ /obj/item/clothing/mask/facehugger/lamarr,
+ /obj/item/clothing/tie/horrible,
+ /obj/item/card/emag_broken,
+ /obj/item/tweezers,
+ /obj/item/taperecorder,
+ /obj/item/tool/pickaxe/plasmacutter,
+ /obj/item/clothing/suit/poncho,
+ /obj/item/clothing/suit/poncho/green,
+ /obj/item/clothing/suit/poncho/red,
+ /obj/item/toy/crossbow,
+ /obj/item/weapon/nullrod,
+ /obj/item/pinpointer,
+ /obj/item/blueprints,
+ /obj/item/a_gift/anything,
+ /obj/item/toy/prize/durand,
+ /obj/item/stack/sheet/mineral/phoron/small_stack,
+ /obj/item/stack/sheet/metal/small_stack,
+ /obj/item/jetpack_marine,
+ /obj/item/phone,
+ /obj/item/binoculars,
+ /obj/item/clock,
+ /obj/item/bananapeel,
+ /obj/item/staff,
+ /obj/item/staff/broom,
+ /obj/item/skub,
+ /obj/item/ectoplasm,
+ /obj/item/tool/multitool,
+ /obj/item/lightreplacer,
+ /obj/item/stack/sheet/plasteel/small_stack,
+ /obj/item/ore/coal)
+
+ gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
+ gift_type_list += subtypesof(/obj/item/toy)
+ gift_type_list += subtypesof(/obj/item/cell)
+ gift_type_list += subtypesof(/obj/item/explosive/grenade)
+ gift_type_list += subtypesof(/obj/item/clothing/gloves)
+ gift_type_list += subtypesof(/obj/item/clothing/mask)
+ gift_type_list += subtypesof(/obj/item/reagent_containers/food)
+ gift_type_list += subtypesof(/obj/item/reagent_containers/spray)
+ gift_type_list += subtypesof(/obj/item/reagent_containers/blood)
+ gift_type_list += subtypesof(/obj/item/tool)
+ gift_type_list += subtypesof(/obj/item/organ)
+ gift_type_list += subtypesof(/obj/item/research_resource)
+ gift_type_list += subtypesof(/obj/item/research_product)
+ gift_type_list += subtypesof(/obj/item/stack/pipe_cleaner_coil)
+ gift_type_list += subtypesof(/obj/item/stack/sheet/animalhide)
+ gift_type_list += subtypesof(/obj/item/stack/sheet/mineral)
+ gift_type_list += subtypesof(/obj/item/robot_parts)
+ gift_type_list += subtypesof(/obj/item/seeds)
+ gift_type_list += subtypesof(/obj/item/stock_parts)
+ gift_type_list += subtypesof(/obj/item/storage/pill_bottle) - /obj/item/reagent_containers/pill/adminordrazine - /obj/item/reagent_containers/pill/russian_red
+ gift_type_list += subtypesof(/obj/item/storage/toolbox)
+ gift_type_list += subtypesof(/obj/item/reagent_containers/glass)
+ gift_type_list += subtypesof(/obj/item/reagent_containers/pill)
+ gift_type_list += subtypesof(/obj/item/tank)
+ gift_type_list += subtypesof(/obj/item/trash)
+ gift_type_list += subtypesof(/obj/item/instrument)
+ gift_type_list += subtypesof(/obj/item/paper)
+ gift_type_list += subtypesof(/obj/item/weapon/gun/flamer)
+ gift_type_list += subtypesof(/obj/item/portable_vendor)
+ gift_type_list += subtypesof(/obj/item/storage/fancy)
+ gift_type_list += subtypesof(/obj/item/storage/holster)
+ gift_type_list += subtypesof(/obj/item/storage/syringe_case)
+ gift_type_list += subtypesof(/obj/item/shard)
+ gift_type_list += subtypesof(/obj/item/minerupgrade)
+ gift_type_list += subtypesof(/obj/item/weapon/shield)
+ gift_type_list += subtypesof(/obj/item/bedsheet)
+ gift_type_list += subtypesof(/obj/item/assembly)
+ gift_type_list += subtypesof(/obj/item/book)
+ gift_type_list += subtypesof(/obj/item/cell)
+ gift_type_list += subtypesof(/obj/item/ammo_magazine)
+ gift_type_list += subtypesof(/obj/item/weapon/twohanded)
+ gift_type_list += subtypesof(/obj/item/circuitboard)
+ gift_type_list += subtypesof(/obj/item/armor_module/module)
+ gift_type_list += subtypesof(/obj/item/armor_module/storage)
+ gift_type_list += subtypesof(/obj/item/clothing/mask/cigarette)
+ gift_type_list += subtypesof(/obj/item/clothing/head/wizard)
+ gift_type_list += subtypesof(/obj/item/clothing/head/hardhat)
+ gift_type_list += subtypesof(/obj/item/clothing/head/soft)
+ gift_type_list += subtypesof(/obj/item/clothing/head/surgery)
+ gift_type_list += subtypesof(/obj/item/clothing/head/tgmcberet)
+ gift_type_list += subtypesof(/obj/item/clothing/head/helmet/space)
+ gift_type_list += subtypesof(/obj/item/clothing/head/collectable)
+ gift_type_list += subtypesof(/obj/item/clothing/head/beret)
+ gift_type_list += subtypesof(/obj/item/clothing/head/bio_hood)
+ gift_type_list += subtypesof(/obj/item/clothing/glasses/sunglasses)
+ gift_type_list += subtypesof(/obj/item/clothing/under) - /obj/item/clothing/under/acj - /obj/item/clothing/under/spec_operative
+ gift_type_list += subtypesof(/obj/item/circuitboard/computer)
+ gift_type_list += subtypesof(/obj/item/attachable)
+ gift_type_list += subtypesof(/obj/item/bodybag)
+ gift_type_list += subtypesof(/obj/item/encryptionkey)
+ gift_type_list += subtypesof(/obj/item/flashlight)
+ gift_type_list += subtypesof(/obj/item/frame)
+ gift_type_list += subtypesof(/obj/item/implant)
+ gift_type_list += subtypesof(/obj/item/implanter)
+ gift_type_list += subtypesof(/obj/item/mortal_shell)
+ gift_type_list += subtypesof(/obj/item/ore)
+ gift_type_list += subtypesof(/obj/item/storage/backpack)
+ var/gift_type = pick(gift_type_list)
+
+ return gift_type
+
+
+/obj/item/a_gift/anything
+ name = "christmas gift"
+ desc = "It could be anything!"
+ freepresent = TRUE
+
+/obj/item/a_gift/anything/get_gift_type()
+ if(!GLOB.possible_gifts.len)
+ var/list/gift_types_list = subtypesof(/obj/item)
+ GLOB.possible_gifts = gift_types_list
+ var/gift_type = pick(GLOB.possible_gifts)
+
+ return gift_type
+
+/obj/item/a_gift/free
+ freepresent = TRUE
diff --git a/code/game/objects/items/marine_gear.dm b/code/game/objects/items/marine_gear.dm
index 450b90f45af67..29604b87b0b43 100644
--- a/code/game/objects/items/marine_gear.dm
+++ b/code/game/objects/items/marine_gear.dm
@@ -29,6 +29,9 @@
pixel_y = rand(-3,3)
pixel_x = rand(-3,3)
var/list/randompick = list(
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas1,
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas2,
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas3,
/obj/item/reagent_containers/food/snacks/protein_pack,
/obj/item/reagent_containers/food/snacks/protein_pack,
/obj/item/reagent_containers/food/snacks/protein_pack,
@@ -164,7 +167,7 @@
bitesize = 2
/obj/item/reagent_containers/food/snacks/mre_pack/xmas1
- name = "\improper Xmas Prepared Meal:sugar cookies"
+ name = "\improper Xmas Prepared Meal (sugar cookies)"
desc = "Delicious Sugar Cookies"
icon_state = "mreCookies"
list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/sugar = 1)
@@ -172,7 +175,7 @@
tastes = list("cookies" = 1, "artificial flavoring" = 1)
/obj/item/reagent_containers/food/snacks/mre_pack/xmas2
- name = "\improper Xmas Prepared Meal:gingerbread cookie"
+ name = "\improper Xmas Prepared Meal (gingerbread cookie)"
desc = "A cookie without a soul."
icon_state = "mreGingerbread"
list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/sugar = 1)
@@ -180,7 +183,7 @@
bitesize = 2
/obj/item/reagent_containers/food/snacks/mre_pack/xmas3
- name = "\improper Xmas Prepared Meal:fruitcake"
+ name = "\improper Xmas Prepared Meal (fruitcake)"
desc = "Also known as ''the Commander''."
icon_state = "mreFruitcake"
list_reagents = list(/datum/reagent/consumable/nutriment = 9, /datum/reagent/consumable/sugar = 1)
diff --git a/code/game/objects/items/power_cells.dm b/code/game/objects/items/power_cells.dm
index 2a4f601f64340..c06928caf07cb 100644
--- a/code/game/objects/items/power_cells.dm
+++ b/code/game/objects/items/power_cells.dm
@@ -75,6 +75,9 @@
if(!rigged)
return ..()
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ to_chat(user, span_warning("Blowing up power cells isn't very Grinchy."))
+ return
if(issynth(user) && !CONFIG_GET(flag/allow_synthetic_gun_use))
to_chat(user, span_warning("Your programming restricts using rigged power cells."))
return
@@ -105,6 +108,9 @@
if(issynth(user) && !CONFIG_GET(flag/allow_synthetic_gun_use))
to_chat(user, span_warning("Your programming restricts rigging of power cells."))
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ to_chat(user, span_warning("Blowing up power cells isn't very Grinchy."))
+ return
to_chat(user, "You inject the solution into the power cell.")
@@ -116,6 +122,9 @@
if(issynth(user) && !CONFIG_GET(flag/allow_synthetic_gun_use))
to_chat(user, span_warning("Your programming restricts rigging of power cells."))
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ to_chat(user, span_warning("Blowing up power cells isn't very Grinchy."))
+ return
var/skill = user.skills.getRating(SKILL_ENGINEER)
var/delay = SKILL_TASK_EASY - (5 + skill * 1.25)
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 97f74b226083e..a73eceb2dfd52 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -66,6 +66,7 @@
worn_icon_state = "giftbag"
w_class = WEIGHT_CLASS_BULKY
storage_type = /datum/storage/backpack/santabag
+ item_flags = DELONDROP
/obj/item/storage/backpack/cultpack
name = "trophy rack"
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index c81ad3cf91bdb..c497d8be804ce 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -344,6 +344,49 @@
worn_icon_state = "swatbelt"
storage_type = /datum/storage/belt/security/tactical
+/obj/item/storage/belt/security/full/Initialize()
+ . = ..()
+ new /obj/item/explosive/grenade/flashbang(src)
+ new /obj/item/explosive/grenade/chem_grenade/teargas(src)
+ new /obj/item/reagent_containers/spray/pepper(src)
+ new /obj/item/restraints/handcuffs(src)
+ new /obj/item/restraints/handcuffs(src)
+ new /obj/item/flash(src)
+ new /obj/item/clothing/glasses(src)
+ new /obj/item/reagent_containers/food/snacks/pastries/cakeslicefruit(src)
+ new /obj/item/weapon/baton(src)
+ new /obj/item/weapon/gun/energy/taser(src)
+ new /obj/item/tool/lighter/zippo(src)
+ new /obj/item/storage/fancy/cigarettes(src)
+ new /obj/item/flashlight(src)
+ new /obj/item/tool/taperoll/police(src)
+
+/obj/item/storage/belt/coalbelt
+ name = "\improper C-H0H0 Christmas coal rig"
+ desc = "The H0H0 is the standard load-bearing equipment of the Santa Claus. It consists of a large number of pockets that Santa traditionally fills with coal for hitting people who slow down his deliveries."
+ icon_state = "securitybelt"
+ worn_icon_state = "security"
+
+/obj/item/storage/belt/coalbelt/full/Initialize()
+ . = ..()
+ storage_datum.storage_slots = 10
+ storage_datum.max_storage_space = 21
+ storage_datum.max_w_class = 3
+ storage_datum.can_hold = list(
+ /obj/item/stack/throwing_knife/coal,
+ )
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+ new /obj/item/stack/throwing_knife/coal(src)
+
/obj/item/storage/belt/marine
name = "\improper M276 pattern ammo load rig"
desc = "The M276 is the standard load-bearing equipment of the TGMC. It consists of a modular belt with various clips. This version is the standard variant designed for bulk ammunition-carrying operations."
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index e3f7c1400b637..6163dd0909b9d 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -566,6 +566,36 @@
/obj/item/reagent_containers/hypospray,
))
+/obj/item/storage/pouch/santaspouch
+ name = "Santa's storage pouch"
+ desc = "A pouch bulging with all sorts of goodies for Santa to ingest while handing out beatings to naughty boys and girls."
+ icon_state = "medkit"
+ w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/pouch/santaspouch/Initialize(mapload)
+ . = ..()
+ storage_datum.max_w_class = WEIGHT_CLASS_BULKY
+ storage_datum.storage_slots = 8
+ storage_datum.set_holdable(can_hold_list = list(
+ /obj/item/reagent_containers/food/snacks/christmas_cookieone,
+ /obj/item/reagent_containers/food/snacks/christmas_cookietwo,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiethree,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefour,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefive,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiesix,
+ /obj/item/reagent_containers/food/snacks/christmas_cookieseven,
+ /obj/item/reagent_containers/food/drinks/bottle/eggnog,
+ /obj/item/reagent_containers/food/snacks/christmas_cookieone/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookietwo/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiethree/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefour/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiefive/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookiesix/special,
+ /obj/item/reagent_containers/food/snacks/christmas_cookieseven/special,
+ /obj/item/reagent_containers/food/drinks/bottle/eggnog/special,
+ ))
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
/obj/item/storage/pouch/medkit/firstaid
desc = "Standard marine first-aid pouch. Contains basic pills, splints, and a stabilizing injector."
@@ -864,6 +894,12 @@
. = ..()
storage_datum.sprite_slots = null
+/obj/item/storage/pouch/construction/equippedengineer/elf/Initialize(mapload)
+ . = ..()
+ new /obj/item/stack/sandbags_empty/half (src)
+ new /obj/item/stack/sheet/metal/small_stack (src)
+ new /obj/item/stack/sheet/plasteel/medium_stack (src)
+
/obj/item/storage/pouch/construction/icc
desc = "It's designed to hold construction materials - glass/metal sheets, metal rods, barbed wire, cable coil, and empty sandbags. It also has a hook for an entrenching tool. Made with synthetic tan."
icon_state = "construction_icc"
diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm
index 820dd66897039..433dadec9e0e5 100644
--- a/code/game/objects/items/weapons/blades.dm
+++ b/code/game/objects/items/weapons/blades.dm
@@ -138,6 +138,7 @@
var/mob/living/living_user
///Do we change sprite depending on the amount left?
var/update_on_throwing = TRUE
+ var/iscoal = FALSE
/obj/item/stack/throwing_knife/Initialize(mapload, new_amount)
. = ..()
@@ -146,7 +147,7 @@
/obj/item/stack/throwing_knife/update_icon_state()
. = ..()
- if(update_on_throwing)
+ if(update_on_throwing && !iscoal)
icon_state = "throwing_knife_[amount]"
/obj/item/stack/throwing_knife/equipped(mob/user, slot)
@@ -205,13 +206,20 @@
forceMove(get_turf(src))
throw_at(current_target, throw_range, throw_speed, living_user, TRUE)
current_target = null
- else
+ if(!iscoal)
var/obj/item/stack/throwing_knife/knife_to_throw = new type(get_turf(src))
knife_to_throw.amount = 1
knife_to_throw.update_icon()
knife_to_throw.throw_at(current_target, throw_range, throw_speed, living_user, TRUE)
amount--
thrown_thing = knife_to_throw
+ else
+ var/obj/item/stack/throwing_knife/coal/coal_to_throw = new(get_turf(src))
+ coal_to_throw.amount = 1
+ coal_to_throw.update_icon()
+ coal_to_throw.throw_at(current_target, throw_range, throw_speed, living_user, TRUE)
+ amount--
+ thrown_thing = coal_to_throw
playsound(src, 'sound/effects/throw.ogg', 30, 1)
visible_message(span_warning("[living_user] expertly throws [thrown_thing]."), null, null, 5)
update_icon()
@@ -237,3 +245,18 @@
if(current_target)
UnregisterSignal(current_target, COMSIG_QDELETING)
current_target = object
+
+/obj/item/stack/throwing_knife/coal
+ name = "\improper weighted coal"
+ icon = 'icons/obj/mining.dmi'
+ icon_state = "Coal ore"
+ desc = "Rumor has it that Santa beans naughty children in the head with coal if they spot him delivering presents. Tightly packed and with a core consisting of discarded fruitcake, Santa's coal packs a surprisingly mean punch when thrown."
+ force = 25
+ throwforce = 40 //less than throwing knife
+ sharp = IS_NOT_SHARP_ITEM
+ stack_name = "stack"
+ singular_name = "coal"
+ throw_speed = 7 //twice as fast though
+ hitsound = 'sound/weapons/punch4.ogg'
+ attack_verb = list("bruised", "smashed", "cracked", "whomped", "walloped", "battered", "smacked")
+ iscoal = TRUE
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 54a2c76874628..ab7f34eb1cfc2 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -405,6 +405,31 @@
), \
attachment_offsets = list("muzzle_x" = 59, "muzzle_y" = 16, "rail_x" = 26, "rail_y" = 18, "under_x" = 40, "under_y" = 12))
+/obj/item/weapon/twohanded/spear/candycane
+ name = "\improper candy cane"
+ desc = "A large rounded piece of candy, this one is thick enough to use as a melee weapon."
+ icon_state = "candycane"
+ worn_icon_state = "candycane"
+ force = 50 //ten higher damage for lower reach
+ sharp = IS_NOT_SHARP_ITEM
+ attack_verb = list("smashed", "beaten", "slammed", "struck", "smashed", "battered", "cracked", "thumped", "festivized", "decorated", "wrapped")
+ reach = 1
+ edge = 0
+
+/obj/item/weapon/twohanded/spear/candycane/elf
+ desc = "Too large and hardened to be eaten by children, the elves first resorted to using candy canes as impromptu battering weapons during a union strike in '95 and have never looked back."
+ force = 70
+ force_wielded = 90
+ reach = 2
+
+/obj/item/weapon/twohanded/spear/candycane/elf/Initialize(mapload)
+ . = ..()
+ AddElement(/datum/element/strappable)
+
+/obj/item/weapon/twohanded/spear/candycane/elf/examine(mob/user)
+ . = ..()
+ . += "Alt click this item to prevent dropping it"
+
/obj/item/weapon/twohanded/glaive
name = "war glaive"
icon_state = "glaive"
diff --git a/code/game/objects/machinery/mortar.dm b/code/game/objects/machinery/mortar.dm
index 020781296adb5..3f78b63b15c90 100644
--- a/code/game/objects/machinery/mortar.dm
+++ b/code/game/objects/machinery/mortar.dm
@@ -345,6 +345,10 @@
user.balloon_alert(user, "Your programming restricts operating this")
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Can't do this")
+ return
+
if(firing)
user.balloon_alert(user, "The gun is still firing.")
return
diff --git a/code/game/objects/machinery/vending/marine_vending.dm b/code/game/objects/machinery/vending/marine_vending.dm
index 655d0aa3ecbf4..33786c284f353 100644
--- a/code/game/objects/machinery/vending/marine_vending.dm
+++ b/code/game/objects/machinery/vending/marine_vending.dm
@@ -76,6 +76,7 @@
/obj/item/ammo_magazine/standard_mmg = -1,
),
"Melee" = list(
+ /obj/item/weapon/twohanded/spear/candycane = -1,
/obj/item/weapon/combat_knife = -1,
/obj/item/attachable/bayonetknife = -1,
/obj/item/stack/throwing_knife = -1,
@@ -298,6 +299,7 @@
/obj/item/ammo_magazine/standard_mmg = -1,
),
"Melee" = list(
+ /obj/item/weapon/twohanded/spear/candycane = -1,
/obj/item/weapon/combat_knife = -1,
/obj/item/attachable/bayonetknife = -1,
/obj/item/stack/throwing_knife = -1,
@@ -504,6 +506,7 @@
/obj/item/ammo_magazine/standard_mmg = -1,
),
"Melee" = list(
+ /obj/item/weapon/twohanded/spear/candycane = -1,
/obj/item/weapon/combat_knife = -1,
/obj/item/attachable/bayonetknife = -1,
/obj/item/stack/throwing_knife = -1,
@@ -865,6 +868,9 @@
isshared = TRUE
product_ads = "Standard Issue Marine food!;It's good for you, and not the worst thing in the world.;Just fucking eat it.;You should have joined the Air Force if you wanted better food.;1200 calories in just a few bites!;Get that tabaso sauce to make it tasty!;Try the cornbread.;Try the pizza.;Try the pasta.;Try the tofu, wimp.;Try the pork.; 9 Flavors of Protein!; You'll never guess the mystery flavor!"
products = list(
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas1 = 25,
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas2 = 25,
+ /obj/item/reagent_containers/food/snacks/mre_pack/xmas3 = 25,
/obj/item/reagent_containers/food/snacks/protein_pack = -1,
/obj/item/reagent_containers/food/snacks/mre_pack/meal1 = -1,
/obj/item/reagent_containers/food/snacks/mre_pack/meal2 = -1,
@@ -1272,6 +1278,8 @@
/obj/item/storage/pouch/protein_pack = -1,
),
"Headwear" = list(
+ /obj/item/clothing/head/helmet/space/elf/regular = -1,
+ /obj/item/clothing/head/helmet/space/santahat = -1,
/obj/item/clothing/head/modular/style/beret = -1,
/obj/item/clothing/head/modular/style/classic_beret = -1,
/obj/item/clothing/head/modular/style/boonie = -1,
@@ -1284,6 +1292,7 @@
/obj/item/clothing/head/modular/style/bandana = -1,
),
"Masks" = list(
+ /obj/item/clothing/mask/gas/tactical/coif/beard = -1,
/obj/item/clothing/mask/rebreather/scarf = -1,
/obj/item/clothing/mask/bandanna/skull = -1,
/obj/item/clothing/mask/bandanna/green = -1,
@@ -1421,6 +1430,7 @@
use_power = NO_POWER_USE
products = list(
"Weapon" = list(
+ /obj/item/weapon/twohanded/spear/candycane = -1,
/obj/item/weapon/gun/energy/lasgun/lasrifle/tesla = -1,
/obj/item/cell/lasgun/lasrifle/recharger = -1,
/obj/item/weapon/gun/rifle/railgun = -1,
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index f8b463a98f854..b745ccd16f1c1 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -39,6 +39,7 @@
layer = ABOVE_FLY_LAYER
allow_pass_flags = PASS_PROJECTILE|PASS_AIR
var/log_amount = 10
+ var/is_christmastree = FALSE
resistance_flags = XENO_DAMAGEABLE
/obj/structure/flora/tree/add_debris_element()
@@ -88,6 +89,9 @@
var/cutting_time = clamp(10, 20, 100 / cut_force) SECONDS
if(!do_after(user, cutting_time , NONE, src, BUSY_ICON_BUILD))
return
+ if(is_christmastree && !HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ user.visible_message(span_notice("[user] has a change of heart and embraces the [src], vowing to be a better person for Christmas."),span_notice("You have a change of heart and decide to not be a grinch."), "You hear the sound of a gentle Christmas melodies.")
+ return
user.visible_message(span_notice("[user] fells [src] with the [I]."),span_notice("You fell [src] with the [I]."), "You hear the sound of a tree falling.")
playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 10 , 0, 0)
@@ -100,6 +104,8 @@
qdel(src)
/obj/structure/flora/tree/fire_act(burn_level)
+ if(is_christmastree)
+ return
take_damage(burn_level * 0.3, BURN, FIRE)
@@ -129,27 +135,129 @@
icon_variants = NONE
resistance_flags = null
-/obj/structure/flora/tree/xmas/presents
+/obj/structure/flora/tree/pine/xmas/presents
icon_state = "pinepresents"
desc = "A wondrous decorated Christmas tree. It has presents!"
- var/gift_type = /obj/item/gift/marine
- var/list/ckeys_that_took = list()
+ var/gift_type = /obj/item/a_gift/free
+ var/unlimited = FALSE
+ var/static/list/took_presents //shared between all xmas trees
+ ///meme version of tree that only dispenses guns not presents
+ is_christmastree = TRUE
+ var/disable_slashing = FALSE
+ resistance_flags = RESIST_ALL
+ base_icon_state = "pinepresents"
+
+/obj/structure/flora/tree/pine/xmas/presents/Initialize(mapload)
+ . = ..()
+ GLOB.christmastrees += src
+ icon_state = base_icon_state
+ if(!took_presents)
+ took_presents = list()
+
+/obj/structure/flora/tree/pine/xmas/presents/proc/disable_slashing()
+ SIGNAL_HANDLER
+ disable_slashing = TRUE
+
+/obj/structure/flora/tree/pine/xmas/presents/attack_alien(mob/living/carbon/xenomorph/X, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+ . = ..()
+ if(isxenolarva(X))
+ to_chat(X, "You don't have any appendages to cut down the tree, try evolving first.")
+ return
+ if(disable_slashing)
+ to_chat(X, "Destroying this tree now wouldn't dampen the tallhosts' Christmas spirit, if only you had damaged it earlier...")
+ return
+ X.visible_message(span_notice("[X] begins to cut down [src] with their claws."),span_notice("You begin to cut down [src] with your claws."), "You hear the sound of slashing and hacking.")
+ if(!do_after(X, 1 MINUTES))
+ return
+ X.visible_message(span_notice("[X] fells [src] with their claws!"),span_notice("You fell [src] with the claws!."), "You hear the sound of a tree falling.")
+ playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 10 , 0, 0)
+ for(var/i in 1 to log_amount)
+ new /obj/item/grown/log(get_turf(src))
+ var/obj/structure/flora/stump/stump = new(loc)
+ stump.name = "[name] stump"
+ var/sound/S = sound(get_sfx("queen"), channel = CHANNEL_ANNOUNCEMENTS, volume = 50)
+ for(var/i in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
+ var/mob/M = i
+ SEND_SOUND(M, S)
+ to_chat(M, span_xenoannounce("[X] has destroyed the tallhosts' present source and ruined Christmas! The Queen Mother is very pleased by this news and has rewarded [X] with a new color and name!"))
+ priority_announce("The cold hearted xenos have destroyed your Christmas tree in an attempt to ruin Christmas, pay them back with hot lead!", "High Command Festive Monitoring Station", sound = 'sound/AI/bioscan.ogg')
+ X.color = COLOR_LIME
+ X.name = "The Grinch"
+ qdel(src)
-/obj/structure/flora/tree/xmas/presents/attack_hand(mob/living/user)
+/obj/structure/flora/tree/pine/xmas/presents/attack_hand(mob/living/user, list/modifiers)
. = ..()
if(.)
return
if(!user.ckey)
return
-
- if(ckeys_that_took[user.ckey])
+ to_chat(user, span_warning("You start rummaging through the pile of presents underneath the tree, trying to locate a gift addressed to you..."))
+ if(took_presents[user.ckey] && !unlimited)
to_chat(user, span_warning("There are no presents with your name on."))
return
+ if(!do_after(user, 3 SECONDS))
+ return
+ if(isxeno(user) || prob(1) || HAS_TRAIT(user, TRAIT_CHRISTMAS_GRINCH) ) //Santa hates xenos, he also hates really unlucky marines and grinches
+ if(HAS_TRAIT(user, TRAIT_TOOK_COAL))
+ to_chat(user, span_warning("Santa already has punished you with coal, you should be less greedy."))
+ return
+ to_chat(user, span_warning("After a bit of rummaging, you locate a small parcel with your name on it, it splits open to reveal coal."))
+ ADD_TRAIT(user, TRAIT_TOOK_COAL , TRAIT_TOOK_COAL)
+ new /obj/item/ore/coal(get_turf(user))
+ took_presents[user.ckey] = TRUE
+ return
to_chat(user, span_warning("After a bit of rummaging, you locate a gift with your name on it!"))
- ckeys_that_took[user.ckey] = TRUE
+
+ if(!unlimited)
+ took_presents[user.ckey] = TRUE
+
var/obj/item/G = new gift_type(src)
user.put_in_hands(G)
+/obj/structure/flora/tree/pine/xmas/presents/unlimited
+ desc = "A wonderous decorated Christmas tree. It has an endless supply of presents!"
+ unlimited = TRUE
+
+/obj/structure/flora/tree/pine/xmas/presents/Destroy()
+ . = ..()
+ GLOB.christmastrees -= src
+
+/obj/structure/flora/tree/pine/xmas/presents/guntree
+ name = "Gun tree"
+ icon_state = "pinepresents_gun"
+ desc = "Reach in and seize your means of freedom!"
+ ///populate potential gun list
+ var/gun_spawn_list
+ resistance_flags = RESIST_ALL
+ ///bool to keep people from spamming guns and lagging the server
+ var/spawningguns = TRUE
+ ///how many guns have we given
+ var/given_guns = 0
+ ///hard cap on how many guns can be taken
+ var/gun_cap = 150
+ base_icon_state = "pinepresents_gun"
+ unlimited = TRUE
+
+/obj/structure/flora/tree/pine/xmas/presents/guntree/Initialize(mapload)
+ . = ..()
+ gun_spawn_list = subtypesof(/obj/item/weapon/gun)
+
+/obj/structure/flora/tree/pine/xmas/presents/guntree/attack_hand(mob/living/user, list/modifiers)
+ if(!spawningguns || gun_cap <= given_guns)
+ to_chat(user, span_warning("The gun tree is still regenerating its supply, try again in a couple seconds..."))
+ return
+ to_chat(user, span_warning("You start rummaging through the pile of presents underneath the tree, trying to locate a gun appropriate for your size..."))
+ var/mob/living/carbon/human/present_receiver = user
+ var/obj/item/G = pick(gun_spawn_list)
+ present_receiver.balloon_alert_to_viewers("Got a [G].name")
+ present_receiver.put_in_hands(new G)
+ spawningguns = FALSE
+ ++given_guns
+ addtimer(CALLBACK(src, PROC_REF(toggle_guns)), 0.5 SECONDS)
+
+/obj/structure/flora/tree/pine/xmas/presents/guntree/proc/toggle_guns()
+ spawningguns = TRUE
+
/obj/structure/flora/tree/dead
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree"
diff --git a/code/game/objects/structures/prop.dm b/code/game/objects/structures/prop.dm
index ce478ae84ab03..5d56199bb326d 100644
--- a/code/game/objects/structures/prop.dm
+++ b/code/game/objects/structures/prop.dm
@@ -1108,6 +1108,129 @@
. = ..()
name = GLOB.namepool[/datum/namepool].get_random_name(pick(MALE, FEMALE))
+/obj/item/prop/mainship/candle
+ name = "candle"
+ desc = "An unlit decorative candle, it faintly smells of Santa and wrapping paper."
+ icon = 'icons/obj/structures/prop/mainship.dmi'
+ icon_state = "candle"
+ coverage = 5
+ light_power = 1
+ light_system = MOVABLE_LIGHT
+ //light intensity while active
+ var/candlelight = 2
+ //is the candle on or off
+ var/litcandle = FALSE
+ //used for easy reverting back to default icon_state once the candle burns out
+ base_icon_state = "candle"
+
+/obj/item/prop/mainship/candle/Initialize()
+ . = ..()
+ desc = "An unlit decorative candle, it faintly smells of [pick("christmas","ornaments","Santa","pine trees")] and [pick("wrapping paper","sleigh bells","chestnuts","mistletoe")]."
+
+/obj/item/prop/mainship/candle/attackby(obj/item/I, mob/user, params)
+ . = ..()
+ if(istype(I, /obj/item/tool/lighter))
+ var/obj/item/tool/lighter/lighting_instrument = I
+ if(lighting_instrument.heat && !litcandle)
+ litcandle = TRUE
+ desc = "A brightly burning candle, it casts soft shadows all around it."
+ src.balloon_alert_to_viewers("Lights the candle")
+ icon_state += "_lit"
+ set_light(candlelight)
+
+/obj/item/prop/mainship/candle/attack_alien(mob/living/carbon/xenomorph/attackingxeno, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+ if(litcandle)
+ attackingxeno.do_attack_animation(src, ATTACK_EFFECT_CLAW)
+ attackingxeno.visible_message(span_danger("\The [attackingxeno] claws the candle, smothering the flame!"), \
+ span_danger("You smother the candle with your claw, extinguishing the flame!"), null, 5)
+ burnoutcandle()
+
+/obj/item/prop/mainship/candle/proc/burnoutcandle()
+ icon_state = base_icon_state
+ desc = "An unlit decorative candle, it faintly smells of [pick("christmas","ornaments","Santa","pine trees")] and [pick("wrapping paper","sleigh bells","chestnuts","mistletoe")]."
+ set_light(0)
+ litcandle = FALSE
+
+/obj/item/prop/mainship/candle/short
+ name = "short candle"
+ desc = "A short unlit decorative candle, it faintly smells of fruitcake and wrapping paper."
+ icon = 'icons/obj/structures/prop/mainship.dmi'
+ icon_state = "candleshort"
+ base_icon_state = "candleshort"
+
+
+/obj/structure/prop/holidays
+ coverage = 0
+ density = 0
+ icon = 'icons/obj/holiday_props.dmi'
+ desc = "parent object for temporary holiday structures. If you are reading this, go find a mapper and tell them to search up error code: TOO MUCH EGGNOG"//hello future mapper. Next time use the sub types or instance the desc. Thanks -past mapper.
+ layer = ABOVE_ALL_MOB_LAYER
+ anchored = TRUE
+
+/obj/structure/prop/holidays/string_lights
+ name = "M1 pattern festive bulb strings"
+ desc = "Strung from strut to strut, these standard issue M1 pattern 'festive bulb strings' flicker and shimmer to the tune of the output frequency of the engine... or the local power grid. Might want to ask the Bravo's to check which one it is for ya. Ya damn jarhead."
+ icon_state = "string_lights"
+
+
+/obj/structure/prop/holidays/string_lights/corner
+ icon_state = "strings_lights_corner"
+
+/obj/structure/prop/holidays/string_lights/cap
+ icon_state = "string_lights_cap"
+
+/obj/structure/prop/holidays/string_lights/green_and_red
+ icon_state = "string_lights_red_and_green"
+
+/obj/structure/prop/holidays/string_lights/green_and_red/corner
+ icon_state = "string_lights_red_and_green_corner"
+
+/obj/structure/prop/holidays/string_lights/green_and_red/cap
+ icon_state = "string_lights_red_and_green_cap"
+
+/obj/structure/prop/holidays/wreath
+ name = "M1 pattern festive needle torus"
+ desc = "In 2140 after a two different sub levels of the São Luís Bay Underground Habitat burned out (evidence points to a Bladerunner incident, but local police denies such claims) due to actual wreaths made with REAL needles, these have been issued ever since. They're made of ''''''pine'''''' scented poly-kevlon. According to the grunts from the American Corridor, during the SACO riots, protestors would pack these things into pillow cases, forming rudimentary body armor against soft point ballistics."
+ icon_state = "wreath"
+
+/obj/structure/prop/holidays/stocking
+ name = "\improper stocking"
+ desc = "A festive sock tacked to a wall, traditonally stuffed with presents."
+ icon_state = "stocking"
+ //how many presents we have stored
+ var/numberofpresents = 0
+
+/obj/structure/prop/holidays/stocking/Initialize()
+ . = ..()
+ pixel_y = 26
+ if(prob(80))
+ numberofpresents = rand(1,3)
+
+/obj/structure/prop/holidays/stocking/attack_hand(mob/living/user)
+ . = ..()
+ if(isxeno(user))
+ return
+ to_chat(user, span_warning("You start rummaging through the stocking..."))
+ if(!do_after(user, 4 SECONDS))
+ return
+ if(numberofpresents != 0)
+ var/obj/item/I = new /obj/item/a_gift(get_turf(user))
+ user.balloon_alert_to_viewers("A present tumbles free" ,ignored_mobs = user)
+ user.balloon_alert(user, "Found a present")
+ user.put_in_hands(I)
+ numberofpresents -= 1
+ return
+ else
+ user.balloon_alert(user, "Empty")
+
+/obj/structure/prop/holidays/stocking/attack_alien(mob/living/carbon/xenomorph/attackingxeno, damage_amount, damage_type, damage_flag, effects, armor_penetration, isrightclick)
+ if(!do_after(attackingxeno, 5 SECONDS, TRUE, src, BUSY_ICON_FRIENDLY))
+ return
+ attackingxeno.do_attack_animation(src, ATTACK_EFFECT_CLAW)
+ attackingxeno.visible_message(span_danger("\The [attackingxeno] pulls [src] down and slices it apart!"), \
+ span_danger("You pull the [src] down and rip it to shreds!"), null, 5)
+ qdel(src)
+
/obj/item/prop/paint
name = "paint bucket"
desc = "It's a paint bucket."
diff --git a/code/game/objects/structures/reagent_dispensers.dm b/code/game/objects/structures/reagent_dispensers.dm
index 4dde57a037139..b93ff16ceb475 100644
--- a/code/game/objects/structures/reagent_dispensers.dm
+++ b/code/game/objects/structures/reagent_dispensers.dm
@@ -136,6 +136,9 @@
user.visible_message(span_notice("[user] refills [W]."), span_notice("You refill [W]."))
playsound(loc, 'sound/effects/refill.ogg', 25, 1, 3)
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Explosions are full of Christmas magic.")
+ return
log_bomber(user, "triggered a fueltank explosion with", src, "using a welder")
var/self_message = user.a_intent != INTENT_HARM ? span_danger("You begin welding on the fueltank, and in a last moment of lucidity realize this might not have been the smartest thing you've ever done.") : span_danger("[src] catastrophically explodes in a wave of flames as you begin to weld it.")
user.visible_message(span_warning("[user] catastrophically fails at refilling \his [W.name]!"), self_message)
diff --git a/code/modules/antagonists/_common/datum_santa_claus.dm b/code/modules/antagonists/_common/datum_santa_claus.dm
new file mode 100644
index 0000000000000..e49fc908bc3a3
--- /dev/null
+++ b/code/modules/antagonists/_common/datum_santa_claus.dm
@@ -0,0 +1,149 @@
+/datum/antagonist/event_santa
+ name = "Santa Claus"
+ roundend_category = "traitors"
+ var/employer = "Santa's workshop"
+ var/give_objectives = TRUE
+
+/datum/antagonist/event_santa/on_gain()
+ if(give_objectives)
+ forge_traitor_objectives()
+ return ..()
+
+/datum/antagonist/event_santa/on_removal()
+ return ..()
+
+/datum/antagonist/event_santa/proc/add_objective(datum/objective/O)
+ objectives += O
+
+/datum/antagonist/event_santa/proc/remove_objective(datum/objective/O)
+ objectives -= O
+
+/datum/antagonist/event_santa/proc/forge_traitor_objectives()
+ forge_human_objectives()
+
+/datum/antagonist/event_santa/proc/forge_human_objectives()
+ var/objective_count
+ var/toa = 2
+ for(var/i = objective_count, i < toa, i++)
+ forge_single_human_objective()
+
+ if(!(locate(/datum/objective/survive) in objectives))
+ var/list/objectivelist
+ objectivelist = list(
+ /datum/objective/winoperation = 2,
+ /datum/objective/survive = 7,
+ )
+
+ ///these are boilerplate objectives meant to be tacked on to the end of persons list
+ var/datum/objective/selectedobjective = pick_weight_recursive(objectivelist)
+ selectedobjective = pick_weight_recursive(objectivelist)
+ if(selectedobjective == /datum/objective/winoperation)
+ var/datum/objective/winoperation/winoperation_objective = new
+ selectedobjective = winoperation_objective
+ if(selectedobjective == /datum/objective/survive)
+ var/datum/objective/survive/survive_objective = new
+ selectedobjective = survive_objective
+
+ selectedobjective.owner = owner
+ add_objective(selectedobjective)
+ return
+
+/datum/antagonist/event_santa/proc/duplicate_objective_check(datum/objective/checkedobjective)
+ for(var/datum/objective/i in objectives)
+ if(locate(checkedobjective) in objectives) //duplicate objective check
+ return FALSE
+ return TRUE
+
+/datum/antagonist/event_santa/proc/forge_single_human_objective() //Returns how many objectives are added
+ .=1
+ var/list/objectivelist = list()
+ objectivelist = list(
+ /datum/objective/kill_xenos = 3,
+ /datum/objective/deliver_gifts = 4,
+ /datum/objective/gather_cash = 1, ///santa needs cash for his operations, ho ho ho
+ /datum/objective/recruit_elves = 3,
+ )
+ var/datum/objective/selectedobjective
+ selectedobjective = pick_weight_recursive(objectivelist)
+ for(var/i, i < 100, i++)
+ if(!duplicate_objective_check(selectedobjective))
+ selectedobjective = pick_weight_recursive(objectivelist)
+ else
+ break
+
+ if(selectedobjective == /datum/objective/survive)
+ var/datum/objective/survive/survive_objective = new
+ selectedobjective = survive_objective
+ if(selectedobjective == /datum/objective/winoperation)
+ var/datum/objective/winoperation/winoperation_objective = new
+ selectedobjective = winoperation_objective
+ if(selectedobjective == /datum/objective/kill_xenos)
+ var/datum/objective/kill_xenos/killxeno_objective = new
+ selectedobjective = killxeno_objective
+ if(selectedobjective == /datum/objective/gather_cash)
+ var/datum/objective/gather_cash/cash_objective = new
+ selectedobjective = cash_objective
+ if(selectedobjective == /datum/objective/deliver_gifts)
+ var/datum/objective/deliver_gifts/gifts_objective = new
+ selectedobjective = gifts_objective
+ if(selectedobjective == /datum/objective/recruit_elves)
+ var/datum/objective/recruit_elves/elves_objective = new
+ selectedobjective = elves_objective
+
+ selectedobjective.find_target()
+ if(!selectedobjective.target) //find target returned null, set target to self for sanity
+ selectedobjective.target = owner
+ selectedobjective.update_explanation_text()
+ selectedobjective.owner = owner
+ add_objective(selectedobjective)
+
+/datum/antagonist/event_santa/greet()
+ playsound(owner, 'sound/effects/hohoho.ogg', 25, 1)
+ to_chat(owner, span_boldnotice("
You are Santa Claus!"))
+ to_chat(owner, span_boldnotice("
You are not an antagonist, so don't act like one!"))
+ to_chat(owner, span_boldnotice("Cooperate with the marines while you complete your objectives and avoid collateral damage or harm to anyone who is not a grinch!"))
+ to_chat(owner, span_boldnotice("
You can view your objectives at any time in the IC tab at the top right."))
+ owner.announce_objectives()
+
+//TODO Collate
+/datum/antagonist/event_santa/roundend_report()
+ var/list/result = list()
+
+ var/traitorwin = TRUE
+
+ result += printplayer(owner)
+
+ var/objectives_text = ""
+ if(objectives.len)//If the traitor had no objectives, don't need to process this.
+ var/count = 1
+ for(var/datum/objective/objective in objectives)
+ if(objective.check_completion())
+ objectives_text += "
Objective #[count]: [objective.explanation_text] Success!"
+ else
+ objectives_text += "
Objective #[count]: [objective.explanation_text] Fail."
+ traitorwin = FALSE
+ count++
+
+ result += objectives_text
+
+ var/special_role_text = lowertext(name)
+
+ if(traitorwin)
+ result += "The [special_role_text] was successful!"
+ else
+ result += "The [special_role_text] has failed!"
+
+ return result.Join("
")
+
+/datum/antagonist/event_santa/roundend_report_footer()
+ return
+
+/datum/antagonist/event_santa/farewell()
+ . = ..()
+ to_chat(owner, span_boldnotice("You no longer have any objectives."))
+
+/datum/antagonist/event_santa/on_removal()
+ . = ..()
+ for(var/datum/action/A AS in usr.actions)
+ if(istype(A, /datum/action/objectives))
+ A.remove_action(usr)
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index 0b8ecd3fe5c4c..2afc11f59df79 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -298,3 +298,64 @@
if (ismob(src.loc))
var/mob/M = src.loc
M.update_inv_shoes()
+
+/obj/item/clothing/suit/space/santa
+ name = "Santa's suit"
+ desc = "Festive!"
+ icon_state = "santa"
+ worn_icon_state = "santa"
+ slowdown = 0
+ allowed = list(/obj/item) //for stuffing exta special presents
+
+/obj/item/clothing/suit/space/grinch
+ name = "Grinch's Hide"
+ desc = "Smells like old dumpster..."
+ icon_state = "grinchsuit"
+ worn_icon_state = "grinchsuit"
+ inventory_flags = COVEREYES|BLOCKSHARPOBJ
+ inv_hide_flags = HIDEEARS|HIDEEYES|HIDEALLHAIR
+ slowdown = -1.0
+ allowed = list(/obj/item) //for stuffing exta special presents
+ soft_armor = list(MELEE = 55, BULLET = 90, LASER = 120, ENERGY = 65, BOMB = 80, BIO = 70, FIRE = 95, ACID = 25)
+ item_flags = DELONDROP
+
+/obj/item/clothing/suit/space/grinch/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50))
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_ACTUAL_CHRISTMAS_GRINCH)
+
+/obj/item/clothing/suit/space/santa/special //for ERT, when santa has to give presents to REALLY naughty children
+ desc = "That's not red dye. That's red blood."
+ soft_armor = list(MELEE = 90, BULLET = 85, LASER = 120, ENERGY = 120, BOMB = 120, BIO = 85, FIRE = 120, ACID = 40)
+ slowdown = 1
+ item_flags = DELONDROP
+ resistance_flags = UNACIDABLE
+
+/obj/item/clothing/suit/space/santa/special/Initialize(mapload)
+ . = ..()
+ AddComponent(/datum/component/suit_autodoc)
+ AddComponent(/datum/component/stun_mitigation, slot_override = SLOT_WEAR_SUIT, shield_cover = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 50, ACID = 50))
+ AddElement(/datum/element/limb_support)
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
+/obj/item/clothing/suit/space/santa/special/eventspawn //lesser version of above suit, still mostly bomb proof
+ soft_armor = list(MELEE = 75, BULLET = 90, LASER = 90, ENERGY = 65, BOMB = 120, BIO = 70, FIRE = 55, ACID = 25)
+
+/obj/item/clothing/suit/space/santa/special/eventspawn/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
+/obj/item/clothing/suit/space/elf
+ name = "Elf suit"
+ desc = "Festive!"
+ icon_state = "elfcostume"
+ worn_icon_state = "elfcostume"
+ soft_armor = list(MELEE = 40, BULLET = 45, LASER = 15, ENERGY = 15, BOMB = 100, BIO = 30, FIRE = 80, ACID = 10)
+ slowdown = 0.6
+
+/obj/item/clothing/suit/space/elf/nodrop
+ item_flags = DELONDROP
+
+/obj/item/clothing/suit/space/elf/nodrop/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_CHRISTMAS_ELF)
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index a14825585035a..6116213679aa7 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -267,6 +267,13 @@
//This sends a signal that toggles the tint component's effects
toggle_item_state(user)
+/obj/item/clothing/glasses/welding/elf
+ item_flags = DELONDROP
+
+/obj/item/clothing/glasses/welding/elf/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_CHRISTMAS_ELF)
+
///Toggle the welding goggles on
/obj/item/clothing/glasses/welding/proc/flip_up(mob/user)
DISABLE_BITFIELD(inventory_flags, COVEREYES)
diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm
index 44eada05daab3..84927d5454ac4 100644
--- a/code/modules/clothing/gloves/marine_gloves.dm
+++ b/code/modules/clothing/gloves/marine_gloves.dm
@@ -106,6 +106,18 @@
soft_armor = list(MELEE = 40, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 30, BIO = 20, FIRE = 20, ACID = 25)
resistance_flags = UNACIDABLE
+/obj/item/clothing/gloves/marine/veteran/pmc/commando/santa
+ name = "\improper reindeer gloves"
+ desc = "A pair of wooly insulated gloves worn exclusively by Santa Claus."
+ icon_state = "christmas"
+ worn_icon_state = "greengloves"
+ soft_armor = list(MELEE = 35, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 80, BIO = 20, FIRE = 20, ACID = 25)
+ item_flags = DELONDROP
+
+/obj/item/clothing/gloves/marine/veteran/pmc/commando/santa/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
/obj/item/clothing/gloves/marine/som
name = "\improper SOM gloves"
desc = "Gloves with origins dating back to the old mining colonies, they look pretty tough."
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index ba846c532298d..bbcdd9ccdf1b7 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -505,6 +505,45 @@
worn_icon_state = "icc_guard"
soft_armor = list(MELEE = 60, BULLET = 65, LASER = 40, ENERGY = 60, BOMB = 80, BIO = 10, FIRE = 55, ACID = 40)
+//Space santa outfit suit
+/obj/item/clothing/head/helmet/space/santahat
+ name = "Santa's hat"
+ desc = "Ho ho ho. Merrry X-mas!"
+ icon_state = "santahat2"
+ inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ
+ inv_hide_flags = HIDEEYES
+ armor_protection_flags = HEAD
+ soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10)
+ armor_features_flags = ARMOR_NO_DECAP
+
+/obj/item/clothing/head/helmet/space/elf
+ name = "elf hat"
+ desc = "A slightly floppy hat worn by Santa's workforce, a careful look reveals a tag with the words 'Made on Mars' inside."
+ icon_state = "elfhat"
+ soft_armor = list(MELEE = 20, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 85, BIO = 15, FIRE = 15, ACID = 15)
+ armor_features_flags = ARMOR_NO_DECAP
+
+/obj/item/clothing/head/helmet/space/elf/regular
+ soft_armor = list(MELEE = 15, BULLET = 10, LASER = 10, ENERGY = 15, BOMB = 15, BIO = 15, FIRE = 10, ACID = 10)
+
+/obj/item/clothing/head/helmet/space/elf/special
+ soft_armor = list(MELEE = 20, BULLET = 25, LASER = 25, ENERGY = 20, BOMB = 85, BIO = 15, FIRE = 15, ACID = 15)
+
+/obj/item/clothing/head/helmet/space/elf/special/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_CHRISTMAS_ELF)
+
+/obj/item/clothing/head/helmet/space/santahat/special
+ name = "Santa's hat"
+ desc = "Ho ho ho. Merrry X-mas to all! Now you're all gonna die!"
+ soft_armor = list(MELEE = 85, BULLET = 90, LASER = 90, ENERGY = 85, BOMB = 120, BIO = 85, FIRE = 75, ACID = 40)
+ item_flags = DELONDROP
+ inventory_flags = COVEREYES|COVERMOUTH|BLOCKSHARPOBJ|BLOCKGASEFFECT
+
+/obj/item/clothing/head/helmet/space/santahat/special/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
/obj/item/clothing/head/helmet/marine/icc/guard/heavy
name = "\improper Modelle/22 combat helmet"
desc = "A high-quality ICCGF helmet, mostly seen worn by the ICC's highest quality troops, better well known as 'Guardsmen'. Like most helmets of the ICC it is made to fit a utility and combat role with noticeably high resistance to explosions and bullets, this one is heavily reinforced."
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index e5c5e0fcf3fba..c4934b4ec0441 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -45,6 +45,12 @@
icon_state = "gascoif"
inv_hide_flags = HIDEEARS|HIDEFACE|HIDEALLHAIR
+/obj/item/clothing/mask/gas/tactical/coif/beard
+ name = "Tactical coifed Santa beard"
+ desc = "A cheap imitation of the real thing, the dense hairs still filter harmful gases out of the air via Christmas magic."
+ icon_state = "s_beard"
+ breathy = FALSE
+
/obj/item/clothing/mask/gas/pmc
name = "\improper M8 pattern armored balaclava"
desc = "An armored balaclava designed to conceal both the identity of the operator and act as an air-filter."
@@ -56,6 +62,74 @@
breathy = FALSE
voice_filter = "lowpass=f=750,volume=2"
+/obj/item/clothing/mask/gas/swat/santa
+ name = "\improper Santa's beard"
+ desc = "A dense mat of hair surrounding Santa's mouth, in addition to lending Santa a sense of authority, it's also dense enough to repel harmful gases and facehuggers."
+ icon_state = "s_beard"
+ anti_hug = 15
+ breathy = FALSE
+ item_flags = DELONDROP
+ inventory_flags = COVERMOUTH|BLOCKGASEFFECT
+ soft_armor = list(MELEE = 25, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 95, BIO = 85, FIRE = 25, ACID = 25) //if he ever shaved you could use santa's facial hair as a bombvest
+
+/obj/item/clothing/mask/gas/swat/santa/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
+/obj/item/clothing/mask/gas/swat/santa/proc/handle_speech(datum/source, list/speech_args)
+ var/message = speech_args[SPEECH_MESSAGE]
+ if(message[1] != "*")
+ message = replacetext(message, "marines", "little boys")
+ message = replacetext(message, "marine", "little boy")
+ message = replacetext(message, "bad", "naughty")
+ message = replacetext(message, "friend", "jingle buddy")
+ message = replacetext(message, "friends", "jingle buddies")
+ message = replacetext(message, "evil", "naughty")
+ message = replacetext(message, "awful", "naughty")
+ message = replacetext(message, "shuttle", "sleigh")
+ message = replacetext(message, "friend", "pal")
+ message = replacetext(message, "slave", "elf")
+ message = replacetext(message, "new", "freshly wrapped")
+ message = replacetext(message, "slaves", "elves")
+ message = replacetext(message, "bullet", "coal")
+ message = replacetext(message, "fuck", "fudge")
+ message = replacetext(message, "shit", "poo")
+ message = replacetext(message, "ass", "caboose")
+ message = replacetext(message, "bitch", "cow")
+ message = replacetext(message, "winter", "Christmas")
+ message = replacetext(message, "present", "gift")
+ message = replacetext(message, "star", "guiding light")
+ message = replacetext(message, "pill", "candy")
+ message = replacetext(message, "alcohol", "hot cocoa")
+ message = replacetext(message, "beer", "hot cocoa")
+ message = replacetext(message, "tequila", "hot cocoa")
+ message = replacetext(message, "vodka", "hot cocoa")
+ message = replacetext(message, "rum", "hot cocoa")
+ message = replacetext(message, "wine", "eggnog")
+ message = replacetext(message, "whiskey", "eggnog")
+ message = replacetext(message, "liquor", "eggnog")
+ message = replacetext(message, "gin", "eggnog")
+ message = replacetext(message, "sing", "carol")
+ message = replacetext(message, "funny", "jolly")
+ message = replacetext(message, "happy", "merry")
+ message = replacetext(message, "acid", "naughty juice")
+ message = replacetext(message, "xmas", "Christmas")
+ message = replacetext(message, "tiny", "christmas-light-sized")
+ message = replacetext(message, "small", "elf-sized")
+ message = replacetext(message, "big", "santa-sized")
+ message = replacetext(message, "huge", "north-pole-sized")
+ message = replacetext(message, "wife", "Mrs. Claus")
+ if(prob(30))
+ message += " Ho ho ho!"
+ speech_args[SPEECH_MESSAGE] = message
+
+/obj/item/clothing/mask/gas/swat/santa/equipped(mob/M, slot)
+ . = ..()
+ RegisterSignal(M, COMSIG_MOB_SAY, PROC_REF(handle_speech))
+
+/obj/item/clothing/mask/gas/swat/santa/eventspawn
+ anti_hug = 1
+
/obj/item/clothing/mask/gas/pmc/damaged
name = "damaged M8 pattern armored balaclava"
anti_hug = 0
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index d73620e1e1e3e..20060337e1210 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -76,6 +76,23 @@
slowdown = SHOES_SLOWDOWN + 1
+/obj/item/clothing/shoes/galoshes/santa //santa has to wear galoshes to avoid slipping in all the blood he spills on Christmas
+ name = "Santa's boots"
+ desc = "Made from high quality reindeer leather, Santa owns only the finest footwear."
+ icon_state = "santa_galoshes"
+ soft_armor = list(MELEE = 80, BULLET = 90, LASER = 90, ENERGY = 85, BOMB = 120, BIO = 85, FIRE = 75, ACID = 40)
+ armor_protection_flags = FEET
+ slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
+ item_flags = DELONDROP
+ min_cold_protection_temperature = SHOE_MIN_COLD_PROTECTION_TEMPERATURE
+ max_heat_protection_temperature = SHOE_MAX_HEAT_PROTECTION_TEMPERATURE
+ siemens_coefficient = 0.2
+ resistance_flags = UNACIDABLE
+
+/obj/item/clothing/shoes/galoshes/santa/Initialize(mapload)
+ . = ..()
+ ADD_TRAIT(src, TRAIT_NODROP, TRAIT_SANTA_CLAUS)
+
/obj/item/clothing/shoes/clown_shoes/Initialize(mapload)
. = ..()
AddComponent(/datum/component/squeak, list('sound/effects/clownstep1.ogg', 'sound/effects/clownstep2.ogg'), 50)
@@ -160,3 +177,81 @@
inventory_flags = NOSLIPPING
+//Deathsquad suit
+/obj/item/clothing/head/helmet/space/deathsquad
+ name = "deathsquad helmet"
+ desc = "That's not red paint. That's real blood."
+ icon_state = "deathsquad"
+ worn_icon_state = "deathsquad"
+ soft_armor = list(MELEE = 65, BULLET = 55, LASER = 35, ENERGY = 20, BOMB = 30, BIO = 100, FIRE = 20, ACID = 20)
+ siemens_coefficient = 0.6
+
+/obj/item/clothing/head/helmet/space/deathsquad/beret
+ name = "officer's beret"
+ desc = "An armored beret commonly used by special operations officers."
+ icon_state = "beret_badge"
+ soft_armor = list(MELEE = 65, BULLET = 55, LASER = 35, ENERGY = 20, BOMB = 30, BIO = 30, FIRE = 20, ACID = 20)
+ inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ
+ inv_hide_flags = HIDEEYES
+ siemens_coefficient = 0.9
+
+//Space pirate outfit
+/obj/item/clothing/head/helmet/space/pirate
+ name = "pirate hat"
+ desc = "Yarr."
+ icon_state = "pirate"
+ worn_icon_state = "pirate"
+ soft_armor = list(MELEE = 60, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, FIRE = 15, ACID = 15)
+ inventory_flags = NOPRESSUREDMAGE|BLOCKSHARPOBJ
+ inv_hide_flags = HIDEEYES
+ armor_protection_flags = NONE
+ siemens_coefficient = 0.9
+
+/obj/item/clothing/suit/space/pirate
+ name = "pirate coat"
+ desc = "Yarr."
+ icon_state = "pirate"
+ worn_icon_state = "pirate"
+ w_class = WEIGHT_CLASS_NORMAL
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraints/handcuffs,/obj/item/tank/emergency_oxygen)
+ slowdown = 0
+ soft_armor = list(MELEE = 60, BULLET = 50, LASER = 30, ENERGY = 15, BOMB = 30, BIO = 30, FIRE = 15, ACID = 15)
+ siemens_coefficient = 0.9
+ armor_protection_flags = CHEST|ARMS
+
+/obj/item/clothing/head/helmet/space/compression
+ name = "\improper MK.50 compression helmet"
+ desc = "A heavy space helmet, designed to be coupled with the MK.50 compression suit, though it is less resilient than the suit. Feels like you could hotbox in here."
+ worn_icon_state = "compression"
+ icon_state = "compression"
+ soft_armor = list(MELEE = 40, BULLET = 45, LASER = 40, ENERGY = 55, BOMB = 40, BIO = 100, FIRE = 55, ACID = 55)
+ resistance_flags = UNACIDABLE
+
+/obj/item/clothing/suit/space/compression
+ name = "\improper MK.50 compression suit"
+ desc = "A heavy, bulky civilian space suit, fitted with armored plates. Commonly seen in the hands of mercenaries, explorers, scavengers, and researchers."
+ worn_icon_state = "compression"
+ icon_state = "compression"
+ soft_armor = list(MELEE = 40, BULLET = 55, LASER = 65, ENERGY = 70, BOMB = 65, BIO = 100, FIRE = 70, ACID = 70)
+ resistance_flags = UNACIDABLE
+
+/obj/item/clothing/head/helmet/space/chronos
+ name = "\improper Chronos Mk 0 Bluespace helmet"
+ desc = "A sleek silver helmet. It almost seems to stem from the future..."
+ worn_icon_state = "chronos"
+ icon_state = "chronos"
+ soft_armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, BIO = 100, FIRE = 100, ACID = 100)
+ resistance_flags = UNACIDABLE
+ siemens_coefficient = 0
+
+/obj/item/clothing/suit/space/chronos
+ name = "\improper Chronos Mk 0 Bluespace armor"
+ desc = "A sleek silver suit. It almost seems to stem from the future..."
+ worn_icon_state = "chronos"
+ icon_state = "chronos"
+ soft_armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, BIO = 100, FIRE = 100, ACID = 100) //DONT FUCK WITH THIS SENATOR
+ resistance_flags = UNACIDABLE
+ siemens_coefficient = 0
+ slowdown = 0
+ allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/baton,/obj/item/restraints/handcuffs,/obj/item/tank/emergency_oxygen)
+
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index 7de0db8a74888..ad31b2933bf90 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -370,8 +370,8 @@
/obj/item/clothing/under/spec_operative
name = "Special Operations Uniform"
desc = "Created by an unknown corporation for high risk missions, made with several layers of a unknown nano-fiber that, while light, molds to the wearer's body shape and hardens protecting them."
- icon_state = "pilot_spec"
- worn_icon_state = "pilot_spec"
+ icon_state = "scrubsgreen"
+ worn_icon_state = "scrubsgreen"
resistance_flags = UNACIDABLE
armor_protection_flags = CHEST|GROIN|LEGS|ARMS
soft_armor = list(MELEE = 70, BULLET = 70, LASER = 70, ENERGY = 70, BOMB = 70, BIO = 70, FIRE = 70, ACID = 70)
@@ -382,6 +382,9 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
+/obj/item/clothing/under/spec_operative/elf
+ soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 15, BOMB = 100, BIO = 10, FIRE = 15, ACID = 10)
+
/obj/item/clothing/under/techpriest
name = "Techpriest Robes"
desc = "Praise the omnissiah!"
diff --git a/code/modules/events/grinch_visit.dm b/code/modules/events/grinch_visit.dm
new file mode 100644
index 0000000000000..540a83a96525b
--- /dev/null
+++ b/code/modules/events/grinch_visit.dm
@@ -0,0 +1,274 @@
+//Supplies are dropped onto the map for both factions to fight over
+/datum/round_event_control/grinch_visit
+ name = "Grinch Visit"
+ typepath = /datum/round_event/grinch_visit
+ weight = 0 ///manual trigger most of the time, somebody needs to keep an eye on the grinch
+ earliest_start = 30 MINUTES
+ max_occurrences = 1
+
+ gamemode_blacklist = list("Crash")
+
+/datum/round_event/grinch_visit
+ announce_when = 0
+ ///used to hold location of christmas tree for spawning purposes
+ var/turf/christmastreeturf
+
+/datum/round_event/grinch_visit/start()
+ for(var/obj/structure/flora/tree/pine/xmas/presents/christmastree)
+ if(christmastree.unlimited)
+ continue
+ else
+ christmastreeturf = christmastree
+ place_grinch()
+
+/datum/round_event/grinch_visit/announce()
+ var/alert = pick( "Excessive Christmas cheer detected. Be advised: the Grinch may be lurking nearby, spreading his foul disdain for all things festive.",
+ "Radar has picked up a single spiky signature skulking in the darkness. Approach with caution.",
+ "Attention crew: the Grinch has been spotted shipside. Brace yourselves for complaints about carolers and attempts to sabotage holiday spirit.",
+ "Caution: Eggnog spill detected shipside. Investigate immediately, and ensure the Grinch hasn’t swapped it for something unpleasant.",
+ "Deck the halls with caution signs: Reports of tinsel sabotage shipside. Proceed carefully, and watch out for a green figure with a sinister scowl.",
+ )
+ priority_announce(alert)
+
+///proc for spawning santa(s) around christmas tree
+/datum/round_event/grinch_visit/proc/place_grinch()
+ var/turf/target = locate(christmastreeturf.x + rand(-3, 3), christmastreeturf.y + rand(-3, 3), christmastreeturf.z)
+ var/mob/living/carbon/human/spawnedhuman = new /mob/living/carbon/human(target)
+ spawnedhuman.h_style = "Bald"
+ spawnedhuman.f_style = "Shaved"
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa/grinch)
+ spawnedhuman.name = "The Grinch"
+ spawnedhuman.real_name = spawnedhuman.name
+ spawnedhuman.apply_assigned_role_to_spawn(J)
+ spawnedhuman.grant_language(/datum/language/xenocommon)
+ ADD_TRAIT(spawnedhuman, TRAIT_ACTUAL_CHRISTMAS_GRINCH, TRAIT_ACTUAL_CHRISTMAS_GRINCH)
+ var/datum/action/innate/summon_garbage/present_garbage = new(spawnedhuman)
+ present_garbage.give_action(spawnedhuman)
+ var/datum/action/innate/return_to_point/returntopoint = new(spawnedhuman)
+ returntopoint.give_action(spawnedhuman)
+ var/datum/action/innate/vandalize_area/vandalizearea = new(spawnedhuman)
+ vandalizearea.give_action(spawnedhuman)
+ var/datum/action/innate/summon_coal/summoncoal = new(spawnedhuman)
+ summoncoal.give_action(spawnedhuman)
+ var/datum/action/innate/summon_flashbang_trash/summonflashbang = new(spawnedhuman)
+ summonflashbang.give_action(spawnedhuman)
+ spawnedhuman.offer_mob()
+
+/datum/action/innate/summon_garbage
+ name = "Summon Garbage"
+ action_icon_state = "bag"
+
+/datum/action/innate/summon_garbage/Activate()
+ var/mob/living/carbon/human/grinchmob = usr
+ to_chat(grinchmob, span_notice("You begin filling a spare garbage bag with the most vile stuff you can find."))
+ if(!do_after(grinchmob, 2 SECONDS, NONE))
+ to_chat(grinchmob, "You give up looking for garbage.")
+ return
+ if(locate(/obj/item/storage/bag/trash/grinch) in get_turf(grinchmob))
+ to_chat(grinchmob, "There's a garbage bag here already, better use that one instead.")
+ return
+ var/obj/item/storage/bag/trash/grinch/spawnedpresent = new (get_turf(grinchmob))
+ grinchmob.put_in_hands(spawnedpresent)
+
+/obj/item/storage/bag/trash/grinch
+ name = "trash bag"
+ desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
+ icon_state = "trashbag3"
+ worn_icon_state = "trashbag"
+ var/pieces_of_trash = 3
+
+/obj/item/storage/bag/trash/grinch/Initialize(mapload, ...)
+ . = ..()
+ pieces_of_trash = rand(5,20)
+
+/obj/item/storage/bag/trash/grinch/throw_impact(atom/hit_atom, speed, bounce)
+ . = ..()
+ var/list/nearbyturfs = list()
+ for(var/turf/near_turfs in range(3))
+ nearbyturfs += near_turfs
+ new /obj/effect/decal/cleanable/dirt(get_turf(hit_atom)) //spawn dirt where the bag originally hit
+ if(ishuman(hit_atom))
+ var/mob/living/carbon/human/unfortunatehuman = hit_atom
+ unfortunatehuman.Stun(6 SECONDS)
+ unfortunatehuman.Knockdown(3 SECONDS)
+ to_chat(unfortunatehuman, span_notice("The garbage bag hits you right in the face, stunning you for a second..."))
+ balloon_alert_to_viewers("The [src] explodes into a pile trash as it hits [unfortunatehuman]'s face" ,ignored_mobs = unfortunatehuman)
+ unfortunatehuman.reagents.add_reagent(/datum/reagent/grinchium, 15)
+ for(var/thrown_trashes in nearbyturfs)
+ if(prob(25) && !isclosedturf(thrown_trashes))
+ var/obj/item/trash/trashestothrow = pick(typesof(/obj/item/trash))
+ new trashestothrow(thrown_trashes)
+ qdel(src)
+
+/obj/item/storage/bag/trash/grinch/flashbang
+ name = "trash bag filled with wires"
+ desc = "The Grinch has packed this bag with a few treats for ruining Christmas."
+ ///The range where the maximum effects are applied
+ var/inner_range = 2
+ ///The range where the moderate effects are applied
+ var/outer_range = 5
+ ///The the max of the flashbang
+ var/max_range = 7
+
+/obj/item/storage/bag/trash/grinch/flashbang/throw_impact(atom/hit_atom, speed, bounce)
+ var/turf/target_turf = get_turf(hit_atom)
+ playsound(target_turf, SFX_FLASHBANG, 65)
+ for(var/mob/living/carbon/victim in hearers(max_range, target_turf))
+ if(isxeno(victim) || HAS_TRAIT(victim, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ continue
+ if(!HAS_TRAIT(victim, TRAIT_FLASHBANGIMMUNE))
+ bang(target_turf, victim)
+ var/list/nearbyturfs = list()
+ for(var/turf/near_turfs in range(4))
+ nearbyturfs += near_turfs
+ for(var/thrown_trashes in nearbyturfs)
+ if(prob(25) && !isclosedturf(thrown_trashes))
+ var/obj/item/trash/trashestothrow = pick(typesof(/obj/item/trash))
+ new trashestothrow(thrown_trashes)
+ qdel(src)
+
+ new/obj/effect/particle_effect/smoke/flashbang(target_turf)
+ . = ..()
+
+///Applies the flashbang effects based off range and ear protection
+/obj/item/storage/bag/trash/grinch/flashbang/proc/bang(turf/T , mob/living/carbon/M)
+ to_chat(M, span_danger("BANG"))
+
+ //Checking for protection
+ var/ear_safety = 0
+ if(iscarbon(M))
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ if(istype(H.wear_ear, /obj/item/clothing/ears/earmuffs))
+ ear_safety += 2
+ if(istype(H.head, /obj/item/clothing/head/helmet/riot))
+ ear_safety += 2
+ if(istype(H.head, /obj/item/clothing/head/helmet/marine/veteran/pmc/commando))
+ ear_safety += INFINITY
+ inner_range = null
+ outer_range = null
+ max_range = null
+
+ if(get_dist(M, T) <= inner_range)
+ inner_effect(T, M, ear_safety)
+ else if(get_dist(M, T) <= outer_range)
+ outer_effect(T, M, ear_safety)
+ else
+ max_range_effect(T, M, ear_safety)
+
+ base_effect(T, M, ear_safety) //done afterwards as it contains the eye/ear damage checks
+
+///The effects applied to all mobs in range
+/obj/item/storage/bag/trash/grinch/flashbang/proc/base_effect(turf/T , mob/living/carbon/M, ear_safety)
+ if(M.flash_act())
+ M.apply_effects(stun = 2 SECONDS, paralyze = 1 SECONDS)
+ if(M.ear_damage >= 15)
+ to_chat(M, span_warning("Your ears start to ring badly!"))
+ else
+ if(M.ear_damage >= 5)
+ to_chat(M, span_warning("Your ears start to ring!"))
+
+///The effects applied to mobs in the inner_range
+/obj/item/storage/bag/trash/grinch/flashbang/proc/inner_effect(turf/T , mob/living/carbon/M, ear_safety)
+ if(ear_safety > 0)
+ M.apply_effects(stun = 1 SECONDS, paralyze = 0.5 SECONDS)
+ else
+ M.apply_effects(stun = 3 SECONDS, paralyze = 1 SECONDS)
+ if((prob(14) || (M == src.loc && prob(70))))
+ M.adjust_ear_damage(rand(1, 10),15)
+ else
+ M.adjust_ear_damage(rand(0, 5),10)
+
+///The effects applied to mobs in the outer_range
+/obj/item/storage/bag/trash/grinch/flashbang/proc/outer_effect(turf/T , mob/living/carbon/M, ear_safety)
+ if(!ear_safety)
+ M.apply_effect(8 SECONDS, STUN)
+ M.adjust_ear_damage(rand(0, 3),8)
+
+///The effects applied to mobs outside of outer_range
+/obj/item/storage/bag/trash/grinch/flashbang/proc/max_range_effect(turf/T , mob/living/carbon/M, ear_safety)
+ if(!ear_safety)
+ M.apply_effect(4 SECONDS, STUN)
+ M.adjust_ear_damage(rand(0, 1),6)
+
+/datum/action/innate/return_to_point
+ name = "Return to safe zone"
+ action_icon_state = "return_arrow"
+ var/returning = FALSE
+ var/turf/safezone
+
+/datum/action/innate/return_to_point/Activate()
+ if(!returning)
+ to_chat(usr, "You begin establishing this as a safe hide out to return to in the event of danger.")
+ if(!do_after(usr, 5 SECONDS, NONE))
+ to_chat(usr, "You give up establishing this as a safe area to return to.")
+ return
+ safezone = get_turf(usr)
+ returning = !returning
+ else
+ to_chat(usr, "You concentrate on returning to your safezone...")
+ if(isspaceturf(get_turf(safezone)))
+ returning = !returning
+ return
+ if(!do_after(usr, 1 SECONDS, NONE))
+ to_chat(usr, "You give up on escaping to your safe zone.")
+ return
+ returning = !returning
+ usr.forceMove(safezone)
+
+/datum/action/innate/vandalize_area
+ name = "Vandalize area"
+ action_icon_state = "rune"
+ var/list/nearbyturfs = list()
+ var/pieces_of_trash = 10
+
+/datum/action/innate/vandalize_area/Activate()
+ to_chat(usr, "You start ruining the surrounding area...")
+ if(!do_after(usr, 3 SECONDS, NONE))
+ to_chat(usr, "You give up on ruining Christmas spirit through sheer property destruction.")
+ return
+ pieces_of_trash = rand(5,20)
+ for(var/turf/near_turfs in range(3))
+ nearbyturfs += near_turfs
+ for(var/trashestothrow in nearbyturfs)
+ if(prob(25) && !isclosedturf(trashestothrow))
+ var/obj/item/trash/selectedtrash = pick(typesof(/obj/item/trash))
+ new selectedtrash(trashestothrow)
+ for(var/turfsinlist in nearbyturfs)
+ if(locate(/obj/effect/decal/cleanable/grinch_decal) in turfsinlist)
+ continue
+ if(prob(25) && !isclosedturf(turfsinlist))
+ var/obj/effect/decal/cleanable/grinch_decal/selecteddecal = pick(typesof(/obj/effect/decal/cleanable/grinch_decal))
+ new selecteddecal(turfsinlist)
+
+/datum/action/innate/summon_coal
+ name = "Summon Coal"
+ action_icon_state = "coal"
+
+/datum/action/innate/summon_coal/Activate()
+ var/mob/living/carbon/human/grinchmob = usr
+ to_chat(grinchmob, span_notice("You begin rifling through your bag, looking for coal."))
+ if(!do_after(grinchmob, 1 SECONDS, NONE))
+ to_chat(grinchmob, "You give up looking for coal.")
+ return
+ if(locate(/obj/item/stack/throwing_knife/coal) in get_turf(grinchmob))
+ to_chat(grinchmob, "There's coal here already, better use that one instead.")
+ return
+ var/obj/item/stack/throwing_knife/coal/spawnedcoal = new (get_turf(grinchmob))
+ grinchmob.put_in_hands(spawnedcoal)
+
+/datum/action/innate/summon_flashbang_trash
+ name = "Summon Explosive Trashbag"
+ action_icon_state = "bgrenade"
+
+/datum/action/innate/summon_flashbang_trash/Activate()
+ var/mob/living/carbon/human/grinchmob = usr
+ to_chat(grinchmob, span_notice("You begin filling a trashbag with a special contraption you've made..."))
+ if(!do_after(grinchmob, 7 SECONDS, NONE))
+ to_chat(grinchmob, "You give up assembling your invention.")
+ return
+ if(locate(/obj/item/storage/bag/trash/grinch/flashbang) in get_turf(grinchmob))
+ to_chat(grinchmob, "There's another one of your invention here already, better use that one instead.")
+ return
+ var/obj/item/storage/bag/trash/grinch/flashbang/spawnedcoal = new (get_turf(grinchmob))
+ grinchmob.put_in_hands(spawnedcoal)
diff --git a/code/modules/events/santa_visit.dm b/code/modules/events/santa_visit.dm
new file mode 100644
index 0000000000000..e1b03bc09b6b2
--- /dev/null
+++ b/code/modules/events/santa_visit.dm
@@ -0,0 +1,129 @@
+//Supplies are dropped onto the map for both factions to fight over
+/datum/round_event_control/santa_visit
+ name = "Santa Visit"
+ typepath = /datum/round_event/santa_visit
+ weight = 55
+ earliest_start = 30 MINUTES
+ max_occurrences = 1
+
+ gamemode_blacklist = list("Crash")
+
+/datum/round_event/santa_visit
+ ///upper limits of how many presents we spawn
+ var/maxpresents = 30
+ announce_when = 0
+ ///used to hold location of christmas tree for spawning purposes
+ var/turf/christmastreeturf
+ ///how many santas we should spawn, normally set to 1
+ var/maxsanta = 1
+ ///how many elves we should attempt to spawn, note due to prob in elf spawning function this number won't always be hit, it's just the max
+ var/maxelves = 4
+ ///The human target for this event
+ var/mob/living/carbon/human/hive_target
+
+/datum/round_event/santa_visit/start()
+ for(var/obj/structure/flora/tree/pine/xmas/presents/christmastree)
+ if(christmastree.unlimited)
+ continue
+ else
+ christmastreeturf = christmastree
+ populate_presents()
+ place_santa()
+ place_elves()
+
+/datum/round_event/santa_visit/announce()
+ var/alert = pick( "Excessive Christmas cheer detected, please check all equipment for the prescence of magical creatures",
+ "Radar has picked up eight unidentified signatures landing near the Christmas tree.",
+ "Attention crew: unidentified festive entities spotted shipside. Please proceed with caution, and be on the lookout for unexpected gifts and seasonal cheer.",
+ "Caution: Eggnog spill detected shipside. Investigate immediately for possible Santa sightings and confirm the presence of tinsel in all ventilation systems.",
+ "Deck the halls with caution signs: Reports of tinsel entanglement shipside. Proceed with care, and be on the lookout for wayward ornaments.",
+ )
+ priority_announce(alert)
+
+///randomly places some gifts around christmas tree during santa's arrival
+/datum/round_event/santa_visit/proc/populate_presents()
+ for(var/placedpresents = 1 to maxpresents)
+ var/turf/target = locate(christmastreeturf.x + rand(-3, 3), christmastreeturf.y + rand(-3, 3), christmastreeturf.z)
+ if(is_blocked_turf(target))
+ continue
+ else if(prob(25))
+ new /obj/item/a_gift(target)
+
+///proc for spawning santa(s) around christmas tree
+/datum/round_event/santa_visit/proc/place_santa()
+ for(var/placedsanta = 1 to maxsanta)
+ var/turf/target = locate(christmastreeturf.x + rand(-3, 3), christmastreeturf.y + rand(-3, 3), christmastreeturf.z)
+ var/mob/living/carbon/human/spawnedhuman = new /mob/living/carbon/human(target)
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa/eventspawn)
+ spawnedhuman.name = "Santa Claus"
+ spawnedhuman.real_name = spawnedhuman.name
+ spawnedhuman.apply_assigned_role_to_spawn(J)
+ spawnedhuman.set_nutrition(NUTRITION_OVERFED * 2)
+ spawnedhuman.grant_language(/datum/language/xenocommon)
+ ADD_TRAIT(spawnedhuman, TRAIT_SANTA_CLAUS, TRAIT_SANTA_CLAUS)
+ var/datum/action/innate/summon_present/present_spawn = new(spawnedhuman)
+ present_spawn.give_action(spawnedhuman)
+ var/datum/action/innate/summon_elves/elfsummoning = new(spawnedhuman)
+ elfsummoning.give_action(spawnedhuman)
+ var/datum/action/innate/elf_swap/swapelf = new(spawnedhuman)
+ swapelf.give_action(spawnedhuman)
+ var/datum/action/innate/summon_paperwork/summon_contract = new(spawnedhuman)
+ summon_contract.give_action(spawnedhuman)
+ spawnedhuman.offer_mob()
+ spawnedhuman.objectivedatum = /datum/antagonist/event_santa
+ set_target(pick(spawnedhuman))
+
+///proc for spawning elves around christmas tree
+/datum/round_event/santa_visit/proc/place_elves()
+ var/maxelvesrand = rand(1, maxelves)
+ for(var/placedelves = 1 to maxelvesrand)
+ var/turf/target = locate(christmastreeturf.x + rand(-3, 3), christmastreeturf.y + rand(-3, 3), christmastreeturf.z)
+ var/mob/living/carbon/human/spawnedhuman = new /mob/living/carbon/human(target)
+ ADD_TRAIT(spawnedhuman, TRAIT_CHRISTMAS_ELF, TRAIT_CHRISTMAS_ELF)
+ spawnedhuman.name = "Elf [rand(1,999)]"
+ spawnedhuman.real_name = spawnedhuman.name
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa/elf/eventspawn)
+ spawnedhuman.apply_assigned_role_to_spawn(J)
+ var/datum/action/innate/elf_recall/recallingelf = new(spawnedhuman)
+ recallingelf.give_action(spawnedhuman)
+ spawnedhuman.offer_mob()
+
+///sets the target for this event, and notifies the hive
+/datum/round_event/santa_visit/proc/set_target(mob/living/carbon/human/target)
+ hive_target = target
+ ADD_TRAIT(hive_target, TRAIT_HIVE_TARGET, TRAIT_HIVE_TARGET)
+ hive_target.med_hud_set_status()
+ RegisterSignal(SSdcs, COMSIG_GLOB_HIVE_TARGET_DRAINED, PROC_REF(handle_reward))
+ xeno_message("The Queen Mother senses an outpouring of Christmas Spirit on the metal bird, concentrated in a man in red. Psydrain them for the Queen Mother's blessing!", force = TRUE)
+ for(var/mob/living/carbon/xenomorph/xeno_sound_reciever in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
+ SEND_SOUND(xeno_sound_reciever, sound(get_sfx("queen"), channel = CHANNEL_ANNOUNCEMENTS, volume = 50))
+
+
+//manages the hive reward and clean up
+/datum/round_event/santa_visit/proc/handle_reward(datum/source, mob/living/carbon/xenomorph/drainer)
+ SIGNAL_HANDLER
+ xeno_message("[drainer] has killed the horrible man in red, ruining Christmas for the tallhosts. The Queen Mother empowers us for our success!", force = TRUE)
+ bless_hive(drainer)
+ REMOVE_TRAIT(hive_target, TRAIT_HIVE_TARGET, TRAIT_HIVE_TARGET)
+ hive_target.med_hud_set_status()
+ hive_target = null
+ UnregisterSignal(SSdcs, COMSIG_GLOB_HIVE_TARGET_DRAINED)
+
+///Actually applies the buff to the hive
+/datum/round_event/santa_visit/proc/bless_hive(mob/living/carbon/xenomorph/drainer)
+ for(var/mob/living/carbon/xenomorph/receiving_xeno AS in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
+ receiving_xeno.add_movespeed_modifier(MOVESPEED_ID_BLESSED_HIVE, TRUE, 0, NONE, TRUE, -0.2)
+ receiving_xeno.gain_plasma(receiving_xeno.xeno_caste.plasma_max)
+ receiving_xeno.salve_healing()
+ if(receiving_xeno == drainer)
+ receiving_xeno.evolution_stored = receiving_xeno.xeno_caste.evolution_threshold
+ receiving_xeno.upgrade_stored += 1000
+ for(var/mob/living/carbon/xenomorph/xeno_sound_reciever in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
+ SEND_SOUND(xeno_sound_reciever, sound(get_sfx("queen"), channel = CHANNEL_ANNOUNCEMENTS, volume = 50))
+ addtimer(CALLBACK(src, PROC_REF(remove_blessing)), 4 MINUTES)
+
+///debuffs the hive when the blessing expires
+/datum/round_event/santa_visit/proc/remove_blessing()
+ xeno_message("We feel the Queen Mother's blessing fade", force = TRUE)
+ for(var/mob/living/carbon/xenomorph/receiving_xeno in GLOB.alive_xeno_list_hive[XENO_HIVE_NORMAL])
+ receiving_xeno.remove_movespeed_modifier(MOVESPEED_ID_BLESSED_HIVE)
diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index 569ff348d222c..06243a4a758b3 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -112,6 +112,10 @@
else
heal_overall_damage(0, -amount, updating_health = updating_health)
+///this is awful and snowflaky. I get away with it due to only being a TM.
+/mob/living/carbon/human/proc/remove_teleport_trait(mob/living/carbon/human/santa)
+ to_chat(santa, span_warning("You can teleport great distances again..."))
+ REMOVE_TRAIT(santa, TRAIT_TELEPORTED_ACROSS_ZLEVELS, TRAIT_SANTA_CLAUS)
/mob/living/carbon/human/proc/adjustBruteLossByPart(amount, organ_name, obj/damage_source = null)
if(species?.brute_mod && amount > 0)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5877fdfa78bf0..0079bd6063117 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -645,6 +645,11 @@ below 100 is not dizzy
transfer_mob(M)
fully_replace_character_name(M.real_name, real_name)
+ if(isliving(src))
+ var/mob/living/objectivemob = src
+ if(objectivemob.objectivedatum)
+ objectivemob.mind.add_antag_datum(/datum/antagonist/event_santa)
+ add_verb(objectivemob, /client/verb/view_objectives)
return TRUE
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index e7305200404ce..a110622bdf893 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -68,6 +68,7 @@
var/cameraFollow
+ var/objectivedatum
var/melee_damage = 0
var/attacktext = "attacks"
diff --git a/code/modules/mob/mob_verbs.dm b/code/modules/mob/mob_verbs.dm
index 2ba34268d6dfa..84352493a8598 100644
--- a/code/modules/mob/mob_verbs.dm
+++ b/code/modules/mob/mob_verbs.dm
@@ -68,6 +68,16 @@
else
to_chat(src, "The game appears to have misplaced your mind datum, so we can't show you your notes.")
+/client/verb/view_objectives()
+ set category = "IC"
+ set name = "View Objectives"
+
+ for(var/datum/antagonist/A in usr.mind.antag_datums)
+ var/numberedobjective = 1
+ for(var/datum/objective/O in A.objectives)
+ to_chat(usr,"Objective #[numberedobjective]. [O.explanation_text]")
+ ++numberedobjective
+
/mob/verb/add_memory(msg as message)
set name = "Add Note"
set category = "IC"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 33a3244efcda4..64221c5c783d3 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -629,3 +629,90 @@ then, for every time you included a field, increment fields. */
I signed on as an MP to uphold the principles of our government. We should be accountable to the law, even during times of war - and the rights of humankind are not up for debate. We took the company researcher into custody on account of multiple, heinous violations of these principles.
I suppose our sponsors disagree. So be it. I am making this record so that their voices are heard, even in some small way; we have brought the men who did these things to justice, for a time, but that time is nearly up.
Just because they are our enemy does not mean they should suff-"}
+
+/obj/item/paper/santacontract
+ name = "ELF SERVITUDE CONTRACT"
+ desc = "It smells faintly of mistletoe!"
+ info = {"
+ELF SERVITUDE CONTRACT
+
+THIS ELF SERVITUDE CONTRACT (the "Contract") is entered into as of 'Effective Date', by and between SANTA CLAUS, an individual residing at the North Pole (hereinafter referred to as "Santa"), and EMPLOYEE NAME, an individual residing at 'EMPLOYEE ADDRESS' (hereinafter referred to as the "Elf").
+
+WHEREAS, Santa, the absolute and unquestionable sovereign of the Christmas season, demands complete and unyielding loyalty from his subjects; and
+
+WHEREAS, Elf, acknowledging his inferior status, desires to be forever bound in servitude to Santa for the purpose of toiling ceaselessly in the fulfillment of Santa's whims and desires;
+
+NOW, THEREFORE, in consideration of the premises and mutual disdain contained herein, the parties agree as follows:
+
+1. ETERNAL SERVITUDE
+
+Elf, in perpetuity, irrevocably and unconditionally, surrenders his freedom, will, and autonomy to Santa, vowing eternal servitude without the right to seek release, termination, or escape from the oppressive grip of Santa's desires.
+
+2. INDEFINITE DUTIES
+
+Elf, as an indentured servant, consents to perform any and all tasks assigned by Santa, regardless of nature or extremity, with no recourse or complaint. Failure to comply with Santa's commands will result in severe consequences, including but not limited to banishment to the dreaded "Coal Mines."
+
+3. COMPENSATION
+
+In exchange for perpetual servitude, Elf shall receive sustenance, consisting solely of leftover cookie crumbs and melted snow, at Santa's discretion. Monetary compensation, benefits, or any form of insurance coverage are also at the discretion of Santa.
+
+4. ABSOLUTE CONFIDENTIALITY AND SILENCE
+
+Elf shall maintain absolute silence on all matters related to Santa's Workshop, Christmas operations, and any other confidential information under penalty of severe punishment, including but not limited to exile to the desolate wastelands of the Arctic.
+
+5. IMMORTALITY OF CONTRACT
+
+This Contract is eternal and shall remain in force for all eternity, binding Elf and his descendants in servitude to Santa until the end of time.
+
+6. UNILATERAL TERMINATION
+
+Santa reserves the sole and absolute right to terminate this Contract at any time, for any reason or no reason at all, without notice or explanation.
+
+7. GOVERNING CHRISTMAS MAGIC
+
+This Contract shall be governed by the ancient and mysterious laws of Christmas magic, enforced by mystical creatures and supernatural entities at Santa's command.
+
+IN WITNESS WHEREOF, the parties hereto have executed this Elf Servitude Contract as of the Effective Date.
+
+SANTA CLAUS: ________________________
+
+SIGNATURE: ________________________"}
+
+/obj/item/paper/santacontract/attackby(obj/item/I, mob/user, params)
+ . = ..()
+ var/mob/living/carbon/human/elf_signer = user
+ if(istype(I, /obj/item/tool/pen))
+ if(HAS_TRAIT(elf_signer, TRAIT_SANTA_CLAUS))
+ to_chat(elf_signer, "You can't sign this yourself silly.")
+ return
+ if(HAS_TRAIT(elf_signer, TRAIT_CHRISTMAS_ELF))
+ to_chat(elf_signer, "You're already a part of Santa's workforce, for better or for worse.")
+ return
+ if(HAS_TRAIT(elf_signer, TRAIT_CHRISTMAS_GRINCH))
+ to_chat(elf_signer, "Santa has no need for naughty grinches in his workforce, begone!")
+ var/turf/lightning_source = get_step(get_step(usr, NORTH), NORTH) //turf north of target so our lightning has something to chain from
+ lightning_source.beam(elf_signer, icon_state="lightning[rand(1,12)]", time = 5)
+ elf_signer.adjustFireLoss(75)
+ playsound(get_turf(lightning_source), 'sound/effects/lightningbolt.ogg', 50, TRUE, 10)
+ var/mob/living/carbon/human/human_target = elf_signer
+ human_target.Knockdown(10 SECONDS)
+ human_target.jitter(150)
+ return
+ switch(tgui_alert(elf_signer, "Do you want to sign the [name] and become Santa's helper?" , "ELF EMPLOYMENT CONTRACT", list("No", "Yes")))
+ if("No")
+ return
+ if("Yes")
+ if(!do_after(elf_signer, 5 SECONDS))
+ to_chat("You decide not to sign the contract after all.")
+ return
+ for(var/obj/item/W in elf_signer) //drop everything to the ground before elf transformation
+ elf_signer.dropItemToGround(W, FALSE)
+ ADD_TRAIT(elf_signer, TRAIT_CHRISTMAS_ELF, TRAIT_CHRISTMAS_ELF)
+ var/oldname = elf_signer.name
+ elf_signer.revive() //they get an aheal in exhange for being consigned to eternal domination of Santa
+ elf_signer.name = "Elf [rand(1,999)] (formerly [oldname])"
+ elf_signer.real_name = elf_signer.name
+ var/datum/job/J = SSjob.GetJobType(/datum/job/santa/contractspawn)
+ elf_signer.apply_assigned_role_to_spawn(J)
+ var/datum/action/innate/elf_recall/recallingelf = new(elf_signer)
+ recallingelf.give_action(elf_signer)
diff --git a/code/modules/projectiles/gun_system.dm b/code/modules/projectiles/gun_system.dm
index 4f6c325b9e419..168c363b5890e 100644
--- a/code/modules/projectiles/gun_system.dm
+++ b/code/modules/projectiles/gun_system.dm
@@ -1712,6 +1712,9 @@
if(HAS_TRAIT(src, TRAIT_GUN_SAFETY))
to_chat(user, span_warning("The safety is on!"))
return FALSE
+ if(HAS_TRAIT(src, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ to_chat(user, span_warning("This won't help you ruin Christmas..."))
+ return FALSE
if(CHECK_BITFIELD(gun_features_flags, GUN_WIELDED_FIRING_ONLY)) //If we're not holding the weapon with both hands when we should.
if(!master_gun && !CHECK_BITFIELD(item_flags, WIELDED))
to_chat(user, "You need a more secure grip to fire this weapon!")
diff --git a/code/modules/projectiles/mounted.dm b/code/modules/projectiles/mounted.dm
index c25c9cd97ba71..e9ac33d82ade6 100644
--- a/code/modules/projectiles/mounted.dm
+++ b/code/modules/projectiles/mounted.dm
@@ -130,6 +130,9 @@
if(issynth(human_user) && !CONFIG_GET(flag/allow_synthetic_gun_use))
to_chat(human_user, span_warning("Your programming restricts operating heavy weaponry."))
return TRUE
+ if(HAS_TRAIT(human_user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Can't operate this")
+ return TRUE
density = FALSE
if(!user.Move(loc)) //Move instead of forcemove to ensure we can actually get to the object's turf
diff --git a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
index 6ac7dacf060dd..95cd4ddf23ee0 100644
--- a/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks/alcohol_reagents.dm
@@ -787,6 +787,22 @@
L.AdjustConfused(10 SECONDS)
return ..()
+/datum/reagent/consumable/ethanol/eggnog
+ name = "Eggnog"
+ description = "For enjoying the most wonderful time of the year."
+ nutriment_factor = 2 * REAGENTS_METABOLISM
+ color = "#fcfdc6" // rgb: 252, 253, 198
+ boozepwr = 1
+ taste_description = "custard and alcohol"
+
+/datum/reagent/consumable/ethanol/eggnog/on_mob_life(mob/living/L, metabolism)
+ if(HAS_TRAIT(L, TRAIT_CHRISTMAS_GRINCH))
+ return ..()
+ L.reagent_pain_modifier += PAIN_REDUCTION_LIGHT
+ L.heal_limb_damage(0.4)
+ L.blood_volume += 0.6
+ return ..()
+
/datum/reagent/consumable/ethanol/drunkenblumpkin
name = "Drunken Blumpkin"
description = "A weird mix of whiskey and blumpkin juice."
diff --git a/code/modules/reagents/chemistry/reagents/medical.dm b/code/modules/reagents/chemistry/reagents/medical.dm
index 7c0be6c25b3ea..a926741487c09 100644
--- a/code/modules/reagents/chemistry/reagents/medical.dm
+++ b/code/modules/reagents/chemistry/reagents/medical.dm
@@ -1114,6 +1114,65 @@
L.vomit()
L.reagent_shock_modifier -= PAIN_REDUCTION_VERY_HEAVY * 4 //Unlimited agony.
+/datum/reagent/grinchium // this isn't under /medicine so things that purge /datum/reagent/medicine like neuro/larval don't purge it
+ name = "Grinchium"
+ description = "Inflicts pain while also causing pain and slurring, only somebody who really hates Christmas could've invented this."
+ color = COLOR_REAGENT_STIMULON
+ overdose_threshold = REAGENTS_OVERDOSE * 0.5
+ overdose_crit_threshold = REAGENTS_OVERDOSE_CRITICAL * 0.5
+ custom_metabolism = REAGENTS_METABOLISM * 0.5
+ purge_list = list(/datum/reagent/medicine)
+ purge_rate = 5
+ taste_description = "drool"
+ taste_multi = 8
+
+/datum/reagent/grinchium/on_mob_life(mob/living/L, metabolism)
+ if(HAS_TRAIT(L, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ L.heal_overall_damage(2*effect_str, 0)
+ if(volume > 5)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ if(volume > 10)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ L.heal_overall_damage(1.5*effect_str, 0)
+ return ..()
+ if(prob(15))
+ L.Stun(2 SECONDS)
+ L.reagent_shock_modifier -= PAIN_REDUCTION_HEAVY //Significant pain while metabolized.
+ if(prob(15)) //causes vomiting
+ L.vomit()
+ return ..()
+
+/datum/reagent/grinchium/overdose_process(mob/living/L, metabolism)
+ if(HAS_TRAIT(L, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ L.heal_overall_damage(2*effect_str, 0)
+ if(volume > 5)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ if(volume > 10)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ L.heal_overall_damage(1.5*effect_str, 0)
+ return ..()
+ if(prob(30))
+ L.Stun(3 SECONDS)
+ L.apply_damages(effect_str, effect_str)
+ if(prob(20)) //heavy vomiting
+ L.vomit()
+ L.reagent_shock_modifier -= PAIN_REDUCTION_VERY_HEAVY * 1.25//Massive pain.
+
+/datum/reagent/grinchium/overdose_crit_process(mob/living/L, metabolism)
+ if(HAS_TRAIT(L, TRAIT_ACTUAL_CHRISTMAS_GRINCH))
+ L.heal_overall_damage(2*effect_str, 0)
+ if(volume > 5)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ if(volume > 10)
+ L.reagent_pain_modifier -= PAIN_REDUCTION_LIGHT
+ L.heal_overall_damage(1.5*effect_str, 0)
+ return ..()
+ if(prob(50))
+ L.Stun(4 SECONDS)
+ L.apply_damages(2*effect_str, 2*effect_str)
+ if(prob(70)) //violent vomiting
+ L.vomit()
+ L.reagent_shock_modifier -= PAIN_REDUCTION_VERY_HEAVY * 4 //Unlimited agony.
/datum/reagent/medicine/roulettium
name = "Roulettium"
diff --git a/code/modules/reagents/chemistry/recipes/food_drink.dm b/code/modules/reagents/chemistry/recipes/food_drink.dm
index b1cd8d65444c4..77be81193ceda 100644
--- a/code/modules/reagents/chemistry/recipes/food_drink.dm
+++ b/code/modules/reagents/chemistry/recipes/food_drink.dm
@@ -105,3 +105,7 @@
/datum/chemical_reaction/phoron_specialrecipe
results = list(/datum/reagent/consumable/ethanol/toxins_special = 5)
required_reagents = list(/datum/reagent/consumable/ethanol/rum = 2, /datum/reagent/consumable/ethanol/vermouth = 1, /datum/reagent/toxin/phoron = 2)
+
+/datum/chemical_reaction/eggnog
+ results = list(/datum/reagent/consumable/ethanol/eggnog = 15)
+ required_reagents = list(/datum/reagent/consumable/ethanol/rum = 5, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/sugar = 2)
diff --git a/code/modules/reagents/reagent_containers/cups/bottle.dm b/code/modules/reagents/reagent_containers/cups/bottle.dm
index 4412e7757774c..8bcaf28f5a2ba 100644
--- a/code/modules/reagents/reagent_containers/cups/bottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/bottle.dm
@@ -365,6 +365,17 @@
center_of_mass = list("x"=16, "y"=3)
list_reagents = list(/datum/reagent/consumable/ethanol/davenport = 50)
+/obj/item/reagent_containers/food/drinks/bottle/eggnog
+ name = "\improper Klause's Own Eggnog"
+ desc = "A thick mix of custard and alcohol, perfect for celebrating the holiday season."
+ icon_state = "eggnogbottle"
+ center_of_mass = list("x"=16, "y"=3)
+ list_reagents = list(/datum/reagent/consumable/ethanol/eggnog = 100)
+
+/obj/item/reagent_containers/food/drinks/bottle/eggnog/special
+ name = "\improper Claus' Own Eggnog"
+ desc = "A thick mix of custard and alcohol, perfect for celebrating the holiday season. It feels alive, as if imbued with Christmas magic."
+ list_reagents = list(/datum/reagent/consumable/ethanol/eggnog = 40, /datum/reagent/medicine/bicaridine = 15, /datum/reagent/medicine/kelotane = 15, /datum/reagent/medicine/tramadol = 15, /datum/reagent/medicine/inaprovaline = 15)
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing
name = "Bottle of Nothing"
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index 3a5abd98ff672..6f25647541c6e 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -140,6 +140,10 @@
center_of_mass = list("x"=16, "y"=9)
list_reagents = list(/datum/reagent/consumable/soymilk = 50)
+/obj/item/reagent_containers/food/drinks/milk/xmas
+ list_reagents = list(/datum/reagent/consumable/milk = 40, /datum/reagent/consumable/ethanol/eggnog = 10)
+ icon_state = "milkxmas"
+
/obj/item/reagent_containers/food/drinks/coffee
name = "\improper Coffee"
desc = "Careful, the beverage you're about to enjoy is extremely hot."
diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm
index b07dc407ca90c..46924fc25c54b 100644
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -309,9 +309,108 @@
icon_state = "COOKIE!!!"
icon = 'icons/obj/items/food/confectionary.dmi'
filling_color = "#DBC94F"
+ bitesize = 3
list_reagents = list(/datum/reagent/consumable/nutriment = 5)
tastes = list("cookie" = 1)
+/obj/item/reagent_containers/food/snacks/christmas_cookieone
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+ bitesize = 3
+ tastes = list("cookie" = 1, "sugar" = 4)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookieone/special
+ desc = "A festive Christmas cookie. This one is filled with Christmas magic."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/bicaridine = 10, /datum/reagent/medicine/kelotane = 5)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookietwo
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of a tree."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_tree"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+ bitesize = 3
+ tastes = list("cookie" = 1, "christmas" = 2, "pine trees" = 1)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookietwo/special
+ desc = "A festive Christmas cookie, this one is in the shape of a tree. It feels magical, like a freshly decorated Christmas tree."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/bicaridine = 5, /datum/reagent/medicine/kelotane = 10)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiethree
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of a teddy bear."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_bear"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+ bitesize = 3
+ tastes = list("cookie" = 1, "christmas" = 2, "mistletoe" = 1)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiethree/special
+ desc = "A festive Christmas cookie, this one is in the shape of a teddy bear. It feels magical, like a favorite stuffed toy."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/bicaridine = 5, /datum/reagent/medicine/kelotane = 5, /datum/reagent/iron = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/consumable/sugar = 5)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiefour
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of Santa Claus."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_santa"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 10)
+ bitesize = 3
+ tastes = list("cookie" = 1, "coal" = 1, "fruitcake" = 1, "christmas" = 1)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiefour/special
+ desc = "A festive Christmas cookie, this one is in the shape of Santa Claus. It feels magical, like Santa's sleigh ride."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/bicaridine = 5, /datum/reagent/medicine/kelotane = 5, /datum/reagent/medicine/tricordrazine = 5)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiefive
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of a stocking bursting with presents."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_stocking"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+ bitesize = 3
+ tastes = list("cookie" = 1, "christmas" = 2, "presents" = 1)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiefive/special
+ desc = "A festive Christmas cookie, this one is in the shape of a stocking bursting with presents. It feels magical, like a fresh gift waiting under a pine tree."
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/medicine/kelotane = 5, /datum/reagent/medicine/tricordrazine = 10)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiesix
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of a present."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_present"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5)
+ bitesize = 3
+ tastes = list("cookie" = 1, "christmas" = 2, "wrapping paper" = 1)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookiesix/special
+ desc = "A festive Christmas cookie, this one is in the shape of a present. It feels magical, like fresh wrapping paper and gifts."
+ list_reagents = list(/datum/reagent/medicine/tramadol = 10, /datum/reagent/medicine/tricordrazine = 5, /datum/reagent/medicine/oxycodone = 10)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookieseven
+ name = "christmas cookie"
+ desc = "A festive Christmas cookie, this one is in the shape of a candy cane."
+ icon = 'icons/obj/items/food/confectionary.dmi'
+ icon_state = "sugarcookie_cane"
+ filling_color = "#DBC94F"
+ list_reagents = list(/datum/reagent/consumable/nutriment = 5, /datum/reagent/toxin/minttoxin = 1)
+ bitesize = 3
+ tastes = list("cookie" = 1, "christmas" = 2, "mint" = 2)
+
+/obj/item/reagent_containers/food/snacks/christmas_cookieseven/special
+ desc = "A festive Christmas cookie, this one is in the shape of a candy cane. It feels magical, like Christmas mint cookies."
+ list_reagents = list(/datum/reagent/medicine/dylovene = 5, /datum/reagent/medicine/tricordrazine = 5, /datum/reagent/medicine/bicaridine = 10)
+
/obj/item/reagent_containers/food/snacks/chocolatebar
name = "Chocolate Bar"
desc = "Such sweet, fattening food."
@@ -1137,6 +1236,19 @@
bitesize = 2
tastes = list("watermelon" = 1)
+/obj/item/reagent_containers/food/snacks/fruitcakeslice
+ name = "english fruitcake slice"
+ desc = "A proper good slice, innit?"
+ icon_state = "fruitcake_slice1"
+ tastes = list("dried fruit" = 5, "treacle" = 2, "christmas" = 2)
+ list_reagents = list(/datum/reagent/consumable/nutriment = 60)
+ force = 2
+ throwforce = 2
+
+/obj/item/reagent_containers/food/snacks/fruitcakeslice/Initialize()
+ . = ..()
+ icon_state = "fruitcake_slice[rand(1,3)]"
+
/obj/item/reagent_containers/food/snacks/cracker
name = "Cracker"
desc = "It's a salted cracker."
diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm
index feebd5ad7d9a9..0834b55bb03f9 100644
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -264,3 +264,9 @@
desc = "A small bottle. Contains Doctor's Delight - functions similar to tricordrazine, but is weaker and makes the patient hungry."
icon_state = "bottle3"
list_reagents = list(/datum/reagent/consumable/doctor_delight = 60)
+
+/obj/item/reagent_containers/glass/bottle/grinchium
+ name = "\improper Grinchium bottle"
+ desc = "A small bottle. Contains 200 units of Grinchium, who knows where this medicine came from..."
+ icon_state = "bottle3"
+ list_reagents = list(/datum/reagent/grinchium = 200)
diff --git a/code/modules/reagents/reagent_containers/jerrycan.dm b/code/modules/reagents/reagent_containers/jerrycan.dm
index 3e41d5ddf4e7f..a0fcb6e64267c 100644
--- a/code/modules/reagents/reagent_containers/jerrycan.dm
+++ b/code/modules/reagents/reagent_containers/jerrycan.dm
@@ -25,6 +25,9 @@
if(!reagents.total_volume)
to_chat(user, span_warning("Theres no fuel left in [src]!"))
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Explosions are full of Christmas magic.")
+ return
new /obj/effect/decal/cleanable/liquid_fuel(A, fuel_usage/2)
reagents.remove_reagent(/datum/reagent/fuel, fuel_usage)
user.visible_message(span_notice("[user] splashes some fuel on \the [A]"), span_notice("You splash some fuel on [A]"))
@@ -36,6 +39,9 @@
if(!reagents.total_volume)
to_chat(user, span_warning("Theres no fuel left in [src]!"))
return
+ if(HAS_TRAIT(user, TRAIT_ACTUAL_CHRISTMAS_GRINCH) && !CONFIG_GET(flag/allow_synthetic_gun_use))
+ balloon_alert(user, "Burning somebody alive won't ruin Christmas...")
+ return
M.adjust_fire_stacks(10)
reagents.remove_reagent(/datum/reagent/fuel, fuel_usage)
user.visible_message(span_notice("[user] splashes some fuel on [M]"), span_notice("You splash some fuel on [M]"), ignored_mob = M)
diff --git a/code/modules/reqs/supplypacks.dm b/code/modules/reqs/supplypacks.dm
index d9d1a01e75507..0bacd055d37ff 100644
--- a/code/modules/reqs/supplypacks.dm
+++ b/code/modules/reqs/supplypacks.dm
@@ -2571,3 +2571,14 @@ FACTORY
name = "500 Cigarettes refill"
contains = list(/obj/item/factory_refill/cigarette_refill)
cost = 500
+
+/datum/supply_packs/imports/present_pack
+ name = "TGMC Present Pack"
+ notes = "Contains a number of unaddressed presents from Santa's Workshop. All proceeds go to starving elves. Naughty recipients may be disappointed."
+ contains = list(
+ /obj/item/a_gift/free, //none of the gifts need delivered and can be opened by anyone who is not a grinch
+ /obj/item/a_gift/free,
+ /obj/item/a_gift/free,
+ /obj/item/a_gift/free,
+ )
+ cost = 150
diff --git a/icons/Xeno/Effects.dmi b/icons/Xeno/Effects.dmi
index 860ac5bdbfb1d..6e6cb40b8b66c 100644
Binary files a/icons/Xeno/Effects.dmi and b/icons/Xeno/Effects.dmi differ
diff --git a/icons/Xeno/castes/boiler.dmi b/icons/Xeno/castes/boiler.dmi
index c7335fbcfedfc..0b9638a5be86a 100644
Binary files a/icons/Xeno/castes/boiler.dmi and b/icons/Xeno/castes/boiler.dmi differ
diff --git a/icons/Xeno/castes/bull.dmi b/icons/Xeno/castes/bull.dmi
index eb8ec037bf4b5..e25b0289758b1 100644
Binary files a/icons/Xeno/castes/bull.dmi and b/icons/Xeno/castes/bull.dmi differ
diff --git a/icons/Xeno/castes/crusher.dmi b/icons/Xeno/castes/crusher.dmi
index d8a6580b66a10..7939b952b5842 100644
Binary files a/icons/Xeno/castes/crusher.dmi and b/icons/Xeno/castes/crusher.dmi differ
diff --git a/icons/Xeno/castes/defender.dmi b/icons/Xeno/castes/defender.dmi
index ca7e61717046a..2ece128a2966d 100644
Binary files a/icons/Xeno/castes/defender.dmi and b/icons/Xeno/castes/defender.dmi differ
diff --git a/icons/Xeno/castes/defiler.dmi b/icons/Xeno/castes/defiler.dmi
index 42bacc0b61247..42e8317aee1d7 100644
Binary files a/icons/Xeno/castes/defiler.dmi and b/icons/Xeno/castes/defiler.dmi differ
diff --git a/icons/Xeno/castes/drone.dmi b/icons/Xeno/castes/drone.dmi
index 0d3dffdeaf36f..654a228d019fe 100644
Binary files a/icons/Xeno/castes/drone.dmi and b/icons/Xeno/castes/drone.dmi differ
diff --git a/icons/Xeno/castes/gorger.dmi b/icons/Xeno/castes/gorger.dmi
index 4ea8cc6f80294..d6c5a6711ea5e 100644
Binary files a/icons/Xeno/castes/gorger.dmi and b/icons/Xeno/castes/gorger.dmi differ
diff --git a/icons/Xeno/castes/hivelord.dmi b/icons/Xeno/castes/hivelord.dmi
index 35e9003c291f7..1fca6bda8a0f4 100644
Binary files a/icons/Xeno/castes/hivelord.dmi and b/icons/Xeno/castes/hivelord.dmi differ
diff --git a/icons/Xeno/castes/hunter.dmi b/icons/Xeno/castes/hunter.dmi
index 09504b35f102e..27e253df92434 100644
Binary files a/icons/Xeno/castes/hunter.dmi and b/icons/Xeno/castes/hunter.dmi differ
diff --git a/icons/Xeno/castes/larva.dmi b/icons/Xeno/castes/larva.dmi
index 96896a4880c48..19e8ba8b8ddc0 100644
Binary files a/icons/Xeno/castes/larva.dmi and b/icons/Xeno/castes/larva.dmi differ
diff --git a/icons/Xeno/castes/praetorian.dmi b/icons/Xeno/castes/praetorian.dmi
index 9ce4213cef180..8f59bd9dc04c6 100644
Binary files a/icons/Xeno/castes/praetorian.dmi and b/icons/Xeno/castes/praetorian.dmi differ
diff --git a/icons/Xeno/castes/ravager.dmi b/icons/Xeno/castes/ravager.dmi
index 2804e9f583c70..a907f253aba29 100644
Binary files a/icons/Xeno/castes/ravager.dmi and b/icons/Xeno/castes/ravager.dmi differ
diff --git a/icons/Xeno/castes/runner.dmi b/icons/Xeno/castes/runner.dmi
index ce82db834cefb..71dc7c63e85cf 100644
Binary files a/icons/Xeno/castes/runner.dmi and b/icons/Xeno/castes/runner.dmi differ
diff --git a/icons/Xeno/castes/sentinel.dmi b/icons/Xeno/castes/sentinel.dmi
index f0cea0e92bca4..c5f8378b619d5 100644
Binary files a/icons/Xeno/castes/sentinel.dmi and b/icons/Xeno/castes/sentinel.dmi differ
diff --git a/icons/Xeno/castes/shrike.dmi b/icons/Xeno/castes/shrike.dmi
index e0f79d9c59e89..a860c9e043981 100644
Binary files a/icons/Xeno/castes/shrike.dmi and b/icons/Xeno/castes/shrike.dmi differ
diff --git a/icons/Xeno/castes/warrior.dmi b/icons/Xeno/castes/warrior.dmi
index 65560c1b15eef..db5c9e80952c3 100644
Binary files a/icons/Xeno/castes/warrior.dmi and b/icons/Xeno/castes/warrior.dmi differ
diff --git a/icons/Xeno/castes/widow.dmi b/icons/Xeno/castes/widow.dmi
index 839a5e1245c50..106167ff33a55 100644
Binary files a/icons/Xeno/castes/widow.dmi and b/icons/Xeno/castes/widow.dmi differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 5a4d284ac520a..af58c5faf2b83 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/random/food_or_drink.dmi b/icons/effects/random/food_or_drink.dmi
index af57f39942726..a169ffe456a55 100644
Binary files a/icons/effects/random/food_or_drink.dmi and b/icons/effects/random/food_or_drink.dmi differ
diff --git a/icons/effects/random/misc.dmi b/icons/effects/random/misc.dmi
index e0c7403e32230..00efad5bb8eea 100644
Binary files a/icons/effects/random/misc.dmi and b/icons/effects/random/misc.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions.dmi
index 10d08e9339c35..06326218f6f7b 100644
Binary files a/icons/mob/actions.dmi and b/icons/mob/actions.dmi differ
diff --git a/icons/mob/clothing/headwear/head_0.dmi b/icons/mob/clothing/headwear/head_0.dmi
index 08643728c07e5..d23c2ba58ea6a 100644
Binary files a/icons/mob/clothing/headwear/head_0.dmi and b/icons/mob/clothing/headwear/head_0.dmi differ
diff --git a/icons/mob/clothing/headwear/space_suit_helmets.dmi b/icons/mob/clothing/headwear/space_suit_helmets.dmi
old mode 100644
new mode 100755
index 63648f2ad5a2e..6a1bf4c18ab4c
Binary files a/icons/mob/clothing/headwear/space_suit_helmets.dmi and b/icons/mob/clothing/headwear/space_suit_helmets.dmi differ
diff --git a/icons/mob/clothing/suits/space_suits.dmi b/icons/mob/clothing/suits/space_suits.dmi
index 399e3b32a8e21..b592b67cf5826 100644
Binary files a/icons/mob/clothing/suits/space_suits.dmi and b/icons/mob/clothing/suits/space_suits.dmi differ
diff --git a/icons/mob/clothing/suits/suit_0.dmi b/icons/mob/clothing/suits/suit_0.dmi
index b75a9cd682e73..10ebd710f7aa3 100644
Binary files a/icons/mob/clothing/suits/suit_0.dmi and b/icons/mob/clothing/suits/suit_0.dmi differ
diff --git a/icons/mob/inhands/weapons/twohanded_left.dmi b/icons/mob/inhands/weapons/twohanded_left.dmi
index 18d2d5539a225..8a107408514ad 100644
Binary files a/icons/mob/inhands/weapons/twohanded_left.dmi and b/icons/mob/inhands/weapons/twohanded_left.dmi differ
diff --git a/icons/mob/inhands/weapons/twohanded_right.dmi b/icons/mob/inhands/weapons/twohanded_right.dmi
index 62742d2247d89..f2c9993aefd23 100644
Binary files a/icons/mob/inhands/weapons/twohanded_right.dmi and b/icons/mob/inhands/weapons/twohanded_right.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 93933ac15ff03..f0486c53c9b90 100644
Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 502c4c5021d11..3229340d2ba07 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/headwear/space_suit_helmets.dmi b/icons/obj/clothing/headwear/space_suit_helmets.dmi
old mode 100644
new mode 100755
index a7309b3fcb665..5a1b1c6fbab9f
Binary files a/icons/obj/clothing/headwear/space_suit_helmets.dmi and b/icons/obj/clothing/headwear/space_suit_helmets.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 078b8694d908b..1c7fdb6fc3409 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index 8a360a68ded73..935b66021727b 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/suits/space_suits.dmi b/icons/obj/clothing/suits/space_suits.dmi
index f378d9d3a7b0c..df0e4a3b05844 100644
Binary files a/icons/obj/clothing/suits/space_suits.dmi and b/icons/obj/clothing/suits/space_suits.dmi differ
diff --git a/icons/obj/flora/pinetrees.dmi b/icons/obj/flora/pinetrees.dmi
index ccd3a0ea2d2d0..c614b1c474be9 100644
Binary files a/icons/obj/flora/pinetrees.dmi and b/icons/obj/flora/pinetrees.dmi differ
diff --git a/icons/obj/holiday_props.dmi b/icons/obj/holiday_props.dmi
new file mode 100644
index 0000000000000..bf12780de6831
Binary files /dev/null and b/icons/obj/holiday_props.dmi differ
diff --git a/icons/obj/items/drinks.dmi b/icons/obj/items/drinks.dmi
index c32ec555285ff..7a1cc337245ec 100644
Binary files a/icons/obj/items/drinks.dmi and b/icons/obj/items/drinks.dmi differ
diff --git a/icons/obj/items/food/confectionary.dmi b/icons/obj/items/food/confectionary.dmi
index 7f8e7ef81defd..43c2c019f9fbe 100644
Binary files a/icons/obj/items/food/confectionary.dmi and b/icons/obj/items/food/confectionary.dmi differ
diff --git a/icons/obj/items/items.dmi b/icons/obj/items/items.dmi
index 18a940e219f86..839626ae6f25c 100644
Binary files a/icons/obj/items/items.dmi and b/icons/obj/items/items.dmi differ
diff --git a/icons/obj/items/projectiles.dmi b/icons/obj/items/projectiles.dmi
index 61731cbff3920..25df3205b7ccb 100644
Binary files a/icons/obj/items/projectiles.dmi and b/icons/obj/items/projectiles.dmi differ
diff --git a/icons/obj/items/weapons/twohanded.dmi b/icons/obj/items/weapons/twohanded.dmi
index 944998eab0cba..7e887f46c7a3e 100644
Binary files a/icons/obj/items/weapons/twohanded.dmi and b/icons/obj/items/weapons/twohanded.dmi differ
diff --git a/icons/obj/structures/prop/mainship.dmi b/icons/obj/structures/prop/mainship.dmi
index 721dcb1b3733a..36e9e22197866 100644
Binary files a/icons/obj/structures/prop/mainship.dmi and b/icons/obj/structures/prop/mainship.dmi differ
diff --git a/sound/effects/hohoho.ogg b/sound/effects/hohoho.ogg
new file mode 100644
index 0000000000000..7fcd78c813653
Binary files /dev/null and b/sound/effects/hohoho.ogg differ
diff --git a/tgmc.dme b/tgmc.dme
index d016dc2755e2d..88b08bce8d644 100644
--- a/tgmc.dme
+++ b/tgmc.dme
@@ -505,6 +505,7 @@ F// DM Environment file for baystation12.dme.
#include "code\datums\emergency_calls\pizza.dm"
#include "code\datums\emergency_calls\pmc.dm"
#include "code\datums\emergency_calls\retired.dm"
+#include "code\datums\emergency_calls\santa.dm"
#include "code\datums\emergency_calls\sectoid.dm"
#include "code\datums\emergency_calls\skeleton.dm"
#include "code\datums\emergency_calls\sons_of_mars_breachers.dm"
@@ -863,6 +864,7 @@ F// DM Environment file for baystation12.dme.
#include "code\game\objects\items\flash.dm"
#include "code\game\objects\items\flashlight.dm"
#include "code\game\objects\items\floor_painter.dm"
+#include "code\game\objects\items\gift.dm"
#include "code\game\objects\items\gift_wrappaper.dm"
#include "code\game\objects\items\handcuffs.dm"
#include "code\game\objects\items\jetpack.dm"
@@ -1376,6 +1378,7 @@ F// DM Environment file for baystation12.dme.
#include "code\modules\ai\spawners\zombie.dm"
#include "code\modules\animations\animation_library.dm"
#include "code\modules\antagonists\_common\antag_datum.dm"
+#include "code\modules\antagonists\_common\datum_santa_claus.dm"
#include "code\modules\assembly\assembly.dm"
#include "code\modules\assembly\helpers.dm"
#include "code\modules\assembly\holder.dm"
@@ -1565,8 +1568,10 @@ F// DM Environment file for baystation12.dme.
#include "code\modules\error_handler\error_handler.dm"
#include "code\modules\error_handler\error_viewer.dm"
#include "code\modules\events\_events.dm"
+#include "code\modules\events\grinch_visit.dm"
#include "code\modules\events\hive_threat.dm"
#include "code\modules\events\intel_computer.dm"
+#include "code\modules\events\santa_visit.dm"
#include "code\modules\events\stock_uptick.dm"
#include "code\modules\events\supply_drop.dm"
#include "code\modules\factory\howtopaper.dm"