From 9609b37e9a3874bf112f858b6f900b27f9a2813b Mon Sep 17 00:00:00 2001 From: TheGreatJorge <23423301+TheGreatJorge@users.noreply.github.com> Date: Fri, 8 Dec 2017 22:15:46 +0100 Subject: [PATCH 01/13] Christmas map additions (#3928) Fixes #3910 Fixes #3909 Fixes #3781 Fixes #3772 --- code/game/objects/structures/signs.dm | 2 +- html/changelogs/thegreatjorge-christmas.yml | 4 + maps/aurora/aurora-1_centcomm.dmm | 1464 +++++++++++++++++-- maps/aurora/aurora-3_sublevel.dmm | 216 ++- maps/aurora/aurora-4_mainlevel.dmm | 1258 ++++++++++++++-- maps/aurora/aurora-6_surface.dmm | 746 +++++++++- 6 files changed, 3318 insertions(+), 372 deletions(-) create mode 100644 html/changelogs/thegreatjorge-christmas.yml diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm index f87887c63de..293b98788d3 100644 --- a/code/game/objects/structures/signs.dm +++ b/code/game/objects/structures/signs.dm @@ -236,7 +236,7 @@ desc = "Flashy." icon = 'icons/obj/christmas.dmi' icon_state = "xmaslights" - layer = 5 + layer = 4.9 /obj/structure/sign/christmas/wreath name = "wreath" diff --git a/html/changelogs/thegreatjorge-christmas.yml b/html/changelogs/thegreatjorge-christmas.yml new file mode 100644 index 00000000000..273de52c988 --- /dev/null +++ b/html/changelogs/thegreatjorge-christmas.yml @@ -0,0 +1,4 @@ +author: Santa +delete-after: True +changes: + - rscadd: "Merry Christmas NSS Aurora!" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index b5293bb9894..1a280a877c6 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -7407,12 +7407,10 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4 }, /obj/structure/window/reinforced{ - tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1 }, @@ -7584,7 +7582,6 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4 }, @@ -7670,7 +7667,6 @@ /obj/structure/table/reinforced, /obj/item/weapon/storage/wallet, /obj/machinery/light{ - tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1 }, @@ -7886,7 +7882,6 @@ "asJ" = ( /obj/structure/lattice, /obj/structure/window/reinforced{ - tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1 }, @@ -8006,7 +8001,6 @@ }, /obj/structure/grille, /obj/structure/window/reinforced{ - tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4 }, @@ -8034,7 +8028,6 @@ "ata" = ( /obj/structure/table/rack, /obj/structure/window/reinforced{ - tag = "icon-rwindow (EAST)"; icon_state = "rwindow"; dir = 4 }, @@ -13285,6 +13278,7 @@ opacity = 1; req_access = list(101) }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -13381,6 +13375,14 @@ /area/centcom/holding) "aDM" = ( /obj/item/modular_computer/console/preset/command, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -13453,6 +13455,10 @@ c_tag = "Crescent Arrivals North"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -13620,6 +13626,10 @@ /area/centcom/holding) "aEr" = ( /obj/structure/banner, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 4 @@ -13630,6 +13640,7 @@ name = "Escape Shuttle Cockpit"; req_access = list(19) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/shuttle/floor, /area/shuttle/escape/centcom) "aEt" = ( @@ -14052,21 +14063,34 @@ }, /area/centcom/ferry) "aFs" = ( -/obj/structure/bed/chair/comfy/brown, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ dir = 9; icon_state = "carpetside" }, /area/centcom/holding) "aFt" = ( -/obj/structure/bed/chair/comfy/brown, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/unsimulated/floor{ dir = 1; icon_state = "carpetside" }, /area/centcom/holding) "aFu" = ( -/obj/structure/bed/chair/comfy/brown, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/unsimulated/floor{ dir = 5; icon_state = "carpetside" @@ -14090,6 +14114,10 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "greencorner"; dir = 1 @@ -14186,18 +14214,28 @@ /turf/simulated/shuttle/floor, /area/shuttle/transport1/centcom) "aFI" = ( +/obj/item/weapon/xmasgift/small{ + pixel_x = 10; + pixel_y = -5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ dir = 8; icon_state = "carpetside" }, /area/centcom/holding) "aFJ" = ( +/obj/structure/flora/tree/pine/xmas, /turf/unsimulated/floor{ dir = 2; icon_state = "carpetsymbol" }, /area/centcom/holding) "aFK" = ( +/obj/item/weapon/xmasgift/medium, /turf/unsimulated/floor{ dir = 4; icon_state = "carpetside" @@ -14275,8 +14313,17 @@ /turf/simulated/shuttle/plating, /area/shuttle/transport1/centcom) "aFR" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +/obj/item/weapon/xmasgift/medium{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/weapon/xmasgift/small{ + pixel_x = 16; + pixel_y = 0 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 }, /turf/unsimulated/floor{ dir = 10; @@ -14284,8 +14331,9 @@ }, /area/centcom/holding) "aFS" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +/obj/item/weapon/xmasgift/large{ + pixel_x = 0; + pixel_y = 10 }, /turf/unsimulated/floor{ dir = 2; @@ -14293,8 +14341,17 @@ }, /area/centcom/holding) "aFT" = ( -/obj/structure/bed/chair/comfy/brown{ - dir = 1 +/obj/item/weapon/xmasgift/small{ + pixel_x = -10; + pixel_y = -2 + }, +/obj/item/weapon/xmasgift/small{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/weapon/xmasgift/small{ + pixel_x = -12; + pixel_y = 12 }, /turf/unsimulated/floor{ dir = 6; @@ -14305,6 +14362,10 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/unsimulated/floor{ icon_state = "greencorner" }, @@ -14330,15 +14391,6 @@ }, /area/centcom/holding) "aFX" = ( -/obj/structure/table/woodentable{ - dir = 5 - }, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/material/ashtray/bronze{ - pixel_x = -1; - pixel_y = 1 - }, /obj/machinery/camera/network/crescent{ c_tag = "Crescent Bar East"; dir = 4 @@ -14365,6 +14417,10 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "greencorner"; dir = 8 @@ -14403,7 +14459,6 @@ /area/centcom/holding) "aGe" = ( /obj/machinery/light{ - tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1 }, @@ -14443,6 +14498,10 @@ c_tag = "Crescent Arrivals South"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 8 @@ -14578,6 +14637,10 @@ /area/centcom/holding) "aGx" = ( /obj/machinery/vending/coffee, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 8 @@ -14718,6 +14781,10 @@ /area/centcom/holding) "aGL" = ( /obj/machinery/vending/cigarette, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 10 @@ -14909,6 +14976,7 @@ name = "Escape Shuttle Infirmary"; req_access = list(5) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/shuttle/floor{ icon_state = "floor3" }, @@ -15313,6 +15381,7 @@ opacity = 1; req_access = list(109) }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -16448,7 +16517,6 @@ dir = 8 }, /obj/structure/window/reinforced{ - tag = "icon-rwindow (NORTH)"; icon_state = "rwindow"; dir = 1 }, @@ -17032,6 +17100,7 @@ /obj/machinery/door/airlock/centcom{ name = "To: Arrivals Deck" }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor, /area/centcom/spawning) "aLF" = ( @@ -17101,6 +17170,10 @@ /area/shuttle/arrival/centcom) "aLN" = ( /obj/structure/closet/emcloset, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/shuttle/floor, /area/shuttle/arrival/centcom) "aLO" = ( @@ -17108,6 +17181,10 @@ /obj/machinery/camera/network/civilian_east{ c_tag = "Surface - Arrivals Shuttle" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/shuttle/floor, /area/shuttle/arrival/centcom) "aLP" = ( @@ -18066,6 +18143,7 @@ /obj/machinery/door/airlock/centcom{ name = "To: NMSS Odin Hab Complex" }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor, /area/centcom/spawning) "aNP" = ( @@ -18349,6 +18427,7 @@ opacity = 1; req_access = list(109) }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -18368,6 +18447,7 @@ opacity = 1; req_access = newlist() }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -18771,6 +18851,10 @@ /obj/structure/flora/pottedplant/random{ anchored = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/unsimulated/floor{ icon_state = "blue"; dir = 4 @@ -19204,6 +19288,10 @@ c_tag = "Crescent Departures"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/unsimulated/floor{ icon_state = "blue"; dir = 4 @@ -19526,6 +19614,7 @@ opacity = 1; req_access = list(109) }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -19883,6 +19972,7 @@ opacity = 1; req_access = list(109) }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -19920,6 +20010,7 @@ /obj/machinery/door/airlock/glass{ name = "Cryogenic Storage" }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "freezerfloor"; dir = 2 @@ -19929,6 +20020,7 @@ /obj/machinery/door/airlock/centcom{ name = "Unisex Restroom" }, +/obj/structure/sign/christmas/wreath, /turf/unsimulated/floor{ icon_state = "freezerfloor"; dir = 2 @@ -24365,6 +24457,1100 @@ dir = 8 }, /area/centcom/specops) +"biS" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) +"biT" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"biU" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) +"biV" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"biW" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"biX" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"biY" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"biZ" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/shuttle/floor, +/area/shuttle/escape/centcom) +"bja" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/shuttle/floor, +/area/shuttle/escape/centcom) +"bjb" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjc" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjd" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bje" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjf" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) +"bjg" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjh" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bji" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjj" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjk" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bjl" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) +"bjm" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjn" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjo" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjp" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjq" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 4 + }, +/area/centcom/holding) +"bjr" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/holding) +"bjs" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjt" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bju" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjv" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjw" = ( +/obj/structure/bed/chair/wood/wings{ + icon_state = "wooden_chair_wings"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjx" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjy" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjz" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjA" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/shuttle/floor{ + icon_state = "floor3" + }, +/area/shuttle/escape/centcom) +"bjB" = ( +/obj/structure/bed/chair/wood/wings{ + icon_state = "wooden_chair_wings"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjC" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/escape/centcom) +"bjD" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/escape/centcom) +"bjE" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjF" = ( +/obj/structure/bed/chair/wood/wings{ + icon_state = "wooden_chair_wings"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjG" = ( +/obj/structure/bed/chair/wood/wings{ + icon_state = "wooden_chair_wings"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjH" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjI" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/area/centcom/holding) +"bjJ" = ( +/turf/unsimulated/floor{ + icon_state = "wood" + }, +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + name = "plating"; + icon_state = "siding4" + }, +/area/centcom/holding) +"bjK" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "grimy" + }, +/area/centcom/holding) +"bjL" = ( +/obj/machinery/door/airlock/glass{ + name = "NMSS Odin Cryogenic Storage" + }, +/obj/structure/sign/christmas/wreath, +/turf/unsimulated/floor{ + dir = 4; + icon_state = "whitegreenfull" + }, +/area/centcom/holding) +"bjM" = ( +/obj/machinery/door/airlock/glass{ + name = "NMSS Odin Cryogenic Storage" + }, +/obj/structure/sign/christmas/wreath, +/turf/unsimulated/floor{ + dir = 4; + icon_state = "whitegreenfull" + }, +/area/centcom/holding) +"bjN" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/spawning) +"bjO" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/spawning) +"bjP" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/spawning) +"bjQ" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjR" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjS" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjT" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjU" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjV" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/shuttle/floor, +/area/shuttle/arrival/centcom) +"bjW" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 8 + }, +/area/centcom/holding) +"bjX" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner" + }, +/area/centcom/holding) +"bjY" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bjZ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bka" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkb" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkc" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkd" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bke" = ( +/obj/machinery/porta_turret/crescent, +/obj/effect/decal/warning_stripes, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/spawning) +"bkf" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 9 + }, +/area/centcom/spawning) +"bkg" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkh" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bki" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkj" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkk" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkl" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkm" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkn" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bko" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkp" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 5 + }, +/area/centcom/spawning) +"bkq" = ( +/obj/machinery/porta_turret/crescent, +/obj/effect/decal/warning_stripes, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "floor" + }, +/area/centcom/spawning) +"bkr" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bks" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkt" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 1 + }, +/area/centcom/holding) +"bku" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 4 + }, +/area/centcom/holding) +"bkv" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 8 + }, +/area/centcom/spawning) +"bkw" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 8 + }, +/area/centcom/spawning) +"bkx" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "rampbottom"; + dir = 4 + }, +/area/centcom/spawning) +"bky" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 10 + }, +/area/centcom/spawning) +"bkz" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "blue" + }, +/area/centcom/spawning) +"bkA" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 6 + }, +/area/centcom/spawning) +"bkB" = ( +/obj/structure/sign/christmas/lights, +/turf/unsimulated/floor{ + icon_state = "rampbottom"; + dir = 4 + }, +/area/centcom/spawning) +"bkC" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 4 + }, +/area/centcom/spawning) +"bkD" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 8 + }, +/area/centcom/spawning) +"bkE" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 8 + }, +/area/centcom/spawning) +"bkF" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "rampbottom"; + dir = 4 + }, +/area/centcom/spawning) +"bkG" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 9 + }, +/area/centcom/spawning) +"bkH" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 1 + }, +/area/centcom/spawning) +"bkI" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 5 + }, +/area/centcom/spawning) +"bkJ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/unsimulated/floor{ + icon_state = "rampbottom"; + dir = 4 + }, +/area/centcom/spawning) +"bkK" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 4 + }, +/area/centcom/spawning) +"bkL" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "blue"; + dir = 8 + }, +/area/centcom/spawning) +"bkM" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 8 + }, +/area/centcom/holding) +"bkN" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner" + }, +/area/centcom/holding) +"bkO" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkP" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkQ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkR" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkS" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkT" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkU" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 8 + }, +/area/centcom/holding) +"bkV" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "green"; + dir = 4 + }, +/area/centcom/holding) +"bkW" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 1 + }, +/area/centcom/holding) +"bkX" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/unsimulated/floor{ + icon_state = "greencorner"; + dir = 4 + }, +/area/centcom/holding) (1,1,1) = {" aaa @@ -56166,11 +57352,11 @@ aFG aEQ aEo aFw -aGr -aGr -aFw -aGr -aGr +bjw +bjB +bjE +bjF +bjG aFw aCO aJw @@ -56943,7 +58129,7 @@ aFw aGu aGu aFw -aIX +bjL aJx aHx aKl @@ -57457,7 +58643,7 @@ aFw aGr aGr aFw -aIX +bjM aJy aJv aJb @@ -57970,7 +59156,7 @@ aGJ aFw aHs aHX -aFw +bjH aDx aDa aJR @@ -58227,7 +59413,7 @@ aGu aFw aGu aGu -aFw +bjI aDx aJz aCM @@ -58240,23 +59426,23 @@ aGM aDj aMX aNv -aGM -aDj -aDj -aDj -aDj -aDb +bjW +bjY +bka +bkc +bkr +bkt aNv aPX aDj aDb aNv -aGM -aDj -aDj -aDj -aDj -aDb +bkM +bkO +bkQ +bkS +bkU +bkW aNv aPX aDj @@ -58741,7 +59927,7 @@ aFw aHb aHb aHb -aHb +bjJ aDx aJz aCM @@ -58754,23 +59940,23 @@ aMB aDk aMY aNw -aMB -aDk -aDk -aDk -aDk -aPq +bjX +bjZ +bkb +bkd +bks +bku aNw aPY aDk aPq aNw -aMB -aDk -aDk -aDk -aDk -aPq +bkN +bkP +bkR +bkT +bkV +bkX aNw aPY aDk @@ -58998,7 +60184,7 @@ aGK aHc aHt aHu -aHu +bjK aDx aDd aJS @@ -59505,7 +60691,7 @@ aEo aFt aFJ aFS -aFY +aFw aFw aFw aGK @@ -59762,7 +60948,7 @@ aEo aFu aFK aFT -aFY +aFw aFw aFw aGK @@ -61297,10 +62483,10 @@ aDj aDS aDx aEp -aED -aED -aED -aED +biV +biW +biX +biY aFx aCM aCM @@ -61805,12 +62991,12 @@ aCp aAJ aCP aCM -aCM +biS aDx aDL aDT aEf -aCM +biU aCM aCM aEV @@ -62319,7 +63505,7 @@ aCp aAJ avz aDd -aDk +biT aDx aDM aDV @@ -62332,8 +63518,8 @@ aFk aCM aCM aFU -aEW -aFk +bjk +bjq aCM aCM aCO @@ -63359,9 +64545,9 @@ aEC aDx aFz aCM -aCM -aCM -aCM +bjf +bjl +bjr aCM aCM aCM @@ -63370,9 +64556,9 @@ aDx aII aJf aJE -aJf -aJf -aJf +bjN +bjO +bjP aJE aLC aJf @@ -63385,11 +64571,11 @@ aOd aMf aOR aOb -aOb -aOb -aOb -aOb -aOb +bkv +bkw +bkD +bkE +bkL aOb aRq aIL @@ -64414,9 +65600,9 @@ aOA aIL aPg aPt -aPt +bkx aMf -aPt +bkF aPt aQW aIL @@ -64671,9 +65857,9 @@ aOB aIL aNx aJg -aPH +bky aMf -aNx +bkG aJg aPH aRs @@ -64928,9 +66114,9 @@ aOC aIL aNy aPu -aPI +bkz aMf -aNy +bkH aPu aPI aRt @@ -65185,9 +66371,9 @@ aOB aIL aOU aJg -aPJ +bkA aMf -aOU +bkI aJg aPJ aRu @@ -65442,9 +66628,9 @@ aOD aIL aPg aPt -aPt +bkB aMf -aPt +bkJ aPt aQW aIL @@ -65928,11 +67114,11 @@ aEm aEm aEm aDQ -aEm -aEm -aEm -aEm -aEm +bjb +bjg +bjm +bjs +bjx aGO aDm aDm @@ -65953,7 +67139,7 @@ aKN aKN aKM aMf -aOT +bke aNy aJg aJg @@ -66184,13 +67370,13 @@ aDm aEL aEL aEY -aDQ +biZ aFN aDn aDn aDn aDn -aDQ +bjC aHg aHE aIe @@ -66210,7 +67396,7 @@ aLt aKN aKN aOE -aNx +bkf aPi aJg aJg @@ -66442,11 +67628,11 @@ aEM aEM aDn aFE -aEi -aEi -aEi -aEi -aEi +bjc +bjh +bjn +bjt +bjy aDQ aDn aHF @@ -66467,7 +67653,7 @@ aLt aKN aKN aMf -aNy +bkg aJg aJg aJg @@ -66724,7 +67910,7 @@ aNF aMf aMf aMf -aNy +bkh aJg aJg aPK @@ -66956,11 +68142,11 @@ aEO aEO aDn aDQ -aEm -aEm -aEm -aEm -aEm +bjd +bji +bjo +bju +bjz aDQ aDn aHH @@ -67212,13 +68398,13 @@ aDm aEL aEL aEY -aDQ +bja aFN aDn aDn aDn aDn -aDQ +bjD aDn aHI aIg @@ -67238,7 +68424,7 @@ aLt aMf aMf aMf -aNy +bki aJg aJg aPL @@ -67470,11 +68656,11 @@ aEi aEi aEi aDQ -aEi -aEi -aEi -aEi -aEi +bje +bjj +bjp +bjv +bjA aGO aDm aDm @@ -67490,12 +68676,12 @@ aLN aLQ aLQ aLQ -aLQ +bjT aLu aKN aKN aMf -aNy +bkj aJg aJg aPK @@ -67747,12 +68933,12 @@ aLO aMo aMo aMo -aLQ +bjU aLu aKN aOk aOE -aNy +bkk aJg aJg aPK @@ -68004,12 +69190,12 @@ aLN aMp aMp aMp -aLQ +bjV aLu aKN aKN aMf -aNy +bkl aJg aJg aPK @@ -68266,7 +69452,7 @@ aLt aMf aMf aMf -aNy +bkm aJg aJg aPL @@ -68780,7 +69966,7 @@ aNF aMf aMf aMf -aNy +bkn aJg aJg aPK @@ -69029,15 +70215,15 @@ aCO aKN aLt aLt -aMo -aMo -aMo +bjQ +bjR +bjS aLt aLt aKN aKN aMf -aNy +bko aJg aJg aJg @@ -69294,7 +70480,7 @@ aKN aKN aKN aOE -aOU +bkp aPe aJg aJg @@ -69551,7 +70737,7 @@ aKN aKN aKN aMf -aOT +bkq aNy aJg aJg @@ -69811,9 +70997,9 @@ aIL aIL aOS aPv -aLD +bkC aQn -aLD +bkK aPv aQZ aIL diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 264875f564f..5ddcfc80beb 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -878,6 +878,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/outpost/engineering/meeting) "cc" = ( @@ -2072,7 +2076,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/manifold/visible/green{ - tag = "icon-map (WEST)"; icon_state = "map"; dir = 8 }, @@ -2185,7 +2188,6 @@ /area/engineering/atmos) "eG" = ( /obj/effect/floor_decal/corner/black{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -2196,7 +2198,6 @@ /area/engineering/atmos) "eH" = ( /obj/effect/floor_decal/corner/black{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -2279,6 +2280,7 @@ "eO" = ( /obj/machinery/floodlight, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/outpost/engineering/meeting) "eP" = ( @@ -2296,11 +2298,13 @@ "eQ" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/outpost/engineering/meeting) "eR" = ( /obj/machinery/vending/cigarette, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/outpost/engineering/meeting) "eS" = ( @@ -2405,9 +2409,6 @@ /turf/simulated/floor/tiled, /area/engineering/atmos) "fe" = ( -/obj/machinery/atmospherics/pipe/simple/visible/red{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/visible/red{ icon_state = "map"; dir = 1 @@ -2593,6 +2594,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/white/diagonal, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/outpost/engineering/hallway) "fw" = ( @@ -2940,7 +2942,6 @@ dir = 4; icon_state = "map_valve0"; name = "Air Bypass valve"; - tag = "icon-map_valve0 (EAST)" }, /turf/simulated/floor/tiled, /area/engineering/atmos) @@ -3609,7 +3610,6 @@ /area/outpost/engineering/hallway) "hz" = ( /obj/machinery/atmospherics/pipe/zpipe/up/cyan{ - tag = "icon-up (EAST)"; icon_state = "up"; dir = 4 }, @@ -3897,7 +3897,6 @@ /area/mine/unexplored) "ic" = ( /obj/machinery/atmospherics/pipe/zpipe/up/yellow{ - tag = "icon-up (EAST)"; icon_state = "up"; dir = 4 }, @@ -4074,7 +4073,7 @@ "iu" = ( /obj/machinery/camera/network/engineering_outpost{ c_tag = "Engineering Sublevel -Tesla Parts Storage"; - dir = 5; + dir = 2; icon_state = "camera" }, /turf/simulated/floor{ @@ -5584,6 +5583,10 @@ /area/turret_protected/ai) "lw" = ( /obj/structure/table/standard, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -5778,6 +5781,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -5788,6 +5795,10 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -5798,6 +5809,10 @@ icon_state = "intact"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -6865,6 +6880,7 @@ name = "AI Core Door"; req_access = list(16) }, +/obj/item/weapon/xmasgift/small, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -6917,6 +6933,7 @@ /obj/effect/landmark/start{ name = "AI" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -7081,6 +7098,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "ny" = ( @@ -7430,6 +7448,10 @@ /obj/structure/table/rack, /obj/item/clothing/mask/breath, /obj/item/weapon/tank/emergency_oxygen, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -7735,6 +7757,7 @@ dir = 5; icon_state = "intact" }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -7744,6 +7767,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -7757,6 +7781,7 @@ dir = 1; pixel_y = -22 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/bluegrid{ name = "cooled mainframe floor"; temperature = 278 @@ -7948,6 +7973,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "oP" = ( @@ -8017,6 +8043,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "oT" = ( @@ -8081,6 +8108,7 @@ "oX" = ( /obj/machinery/computer/robotics, /obj/effect/decal/cleanable/dirt, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/dark{ name = "cooled dark floor"; temperature = 278 @@ -8951,6 +8979,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/dark, /area/turret_protected/ai_upload_foyer) "qs" = ( @@ -9725,7 +9754,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -9749,7 +9777,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -9770,7 +9797,6 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -9797,7 +9823,6 @@ req_access = list(19) }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -9810,7 +9835,6 @@ pixel_y = -22 }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -17459,6 +17483,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/medical/patient_a) "Fc" = ( @@ -17513,6 +17538,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/medical/patient_b) "Ff" = ( @@ -17796,14 +17822,26 @@ /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "FF" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "FG" = ( /obj/structure/bed/roller, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "FH" = ( /obj/machinery/iv_drip, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "FI" = ( @@ -18869,6 +18907,10 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "Hl" = ( @@ -18878,6 +18920,10 @@ "Hm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "Hn" = ( @@ -19198,6 +19244,10 @@ "HR" = ( /obj/structure/bed/chair/comfy/teal, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "HS" = ( @@ -19210,6 +19260,10 @@ dir = 6 }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "HT" = ( @@ -19242,6 +19296,10 @@ dir = 10 }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/patient_wing) "HX" = ( @@ -19923,6 +19981,10 @@ icon_state = "rwindow"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled{ icon_state = "vault"; dir = 5 @@ -19931,6 +19993,10 @@ "Jk" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled{ icon_state = "vault"; dir = 5 @@ -19941,6 +20007,10 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled{ icon_state = "vault"; dir = 5 @@ -20987,6 +21057,10 @@ /area/crew_quarters/medbreak) "La" = ( /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "Lb" = ( @@ -21023,6 +21097,10 @@ pixel_y = 32 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "Lg" = ( @@ -21278,6 +21356,10 @@ dir = 4 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "LH" = ( @@ -21386,6 +21468,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "LN" = ( @@ -22422,6 +22505,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/dark, /area/crew_quarters/medbreak) "NC" = ( @@ -22512,6 +22596,10 @@ /obj/machinery/status_display{ pixel_y = -32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/medbreak) "NI" = ( @@ -22778,6 +22866,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/medical) "Ok" = ( @@ -23653,6 +23742,7 @@ name = "Briefing Room"; req_access = list(5) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/medical/medbay4) "PN" = ( @@ -23836,7 +23926,6 @@ /area/rnd/mixing) "Qg" = ( /obj/structure/toilet{ - tag = "icon-toilet00 (NORTH)"; icon_state = "toilet00"; dir = 1 }, @@ -25226,6 +25315,83 @@ }, /turf/simulated/floor/tiled/white, /area/medical/medbay4) +"Ts" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/outpost/engineering/meeting) +"Tt" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/outpost/engineering/meeting) +"Tu" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/outpost/engineering/meeting) +"Tv" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/outpost/engineering/meeting) +"Tw" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/turret_protected/ai) +"Tx" = ( +/obj/structure/table/standard, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/turret_protected/ai) +"Ty" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled/dark{ + name = "cooled dark floor"; + temperature = 278 + }, +/area/turret_protected/ai) +"Tz" = ( +/obj/structure/bed/chair/comfy/teal{ + dir = 8; + icon_state = "comfychair_preview" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/medical/patient_wing) +"TA" = ( +/obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/medbreak) (1,1,1) = {" aa @@ -38679,7 +38845,7 @@ bY cC dt ca -bw +Tv fu fU gB @@ -39445,10 +39611,10 @@ af am aD aZ -bw +Ts cb -bw -bw +Tt +Tu ef eR fu @@ -63941,7 +64107,7 @@ Ko Lf LL Ms -La +TA NH Ko OM @@ -68558,7 +68724,7 @@ Fd FJ GI Ho -HX +Tz IH Jm HX @@ -75193,7 +75359,7 @@ lb lb lv lL -lw +Tx mE nb nC @@ -76991,13 +77157,13 @@ kj lb lb lb -ly +Tw ly mJ ni nH ly -ly +Ty lb lb lb diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 55ff00b07b0..62d1efcac48 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -4769,7 +4769,6 @@ /area/engineering/atmos) "ajK" = ( /obj/machinery/atmospherics/pipe/zpipe/down/cyan{ - tag = "icon-down (WEST)"; icon_state = "down"; dir = 8 }, @@ -5544,7 +5543,6 @@ /area/engineering/atmos) "als" = ( /obj/machinery/atmospherics/pipe/zpipe/down/red{ - tag = "icon-down (WEST)"; icon_state = "down"; dir = 8 }, @@ -5897,12 +5895,10 @@ /obj/item/device/radio, /obj/item/device/radio, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -5918,7 +5914,6 @@ /obj/item/weapon/crowbar, /obj/item/weapon/crowbar, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -5931,7 +5926,6 @@ /obj/item/device/flashlight/maglight, /obj/item/device/flashlight/maglight, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -6438,11 +6432,11 @@ name = "Equipment Storage"; req_access = list(1) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/main) "anc" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -6897,7 +6891,6 @@ /area/security/brig) "anX" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -7390,7 +7383,6 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -7742,7 +7734,6 @@ /obj/structure/table/standard, /obj/structure/window/reinforced, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -8518,7 +8509,6 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -8928,7 +8918,6 @@ icon_state = "left"; name = "Atmospheric Hardsuits"; req_access = list(24); - tag = "icon-left (EAST)" }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) @@ -9144,7 +9133,6 @@ "asf" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -9169,7 +9157,6 @@ /area/security/main) "asi" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10 }, @@ -9187,7 +9174,6 @@ "asj" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10 }, @@ -9595,7 +9581,6 @@ icon_state = "left"; name = "Atmospheric Hardsuits"; req_access = list(24); - tag = "icon-left (EAST)" }, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) @@ -9886,6 +9871,7 @@ name = "Equipment Storage"; req_access = list(1) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/main) "atq" = ( @@ -12122,11 +12108,11 @@ icon_state = "alarm0"; pixel_x = 24 }, -/obj/item/device/pipe_painter, /obj/effect/floor_decal/industrial/warning/corner{ icon_state = "warningcorner"; dir = 1 }, +/obj/item/device/floor_painter, /turf/simulated/floor/tiled, /area/engineering/engine_monitoring) "awS" = ( @@ -12179,7 +12165,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -12340,7 +12325,6 @@ icon_state = "leftsecure"; name = "Secure Holding Cell"; req_access = list(2); - tag = "icon-leftsecure" }, /turf/simulated/floor/tiled, /area/security/brig) @@ -12649,6 +12633,10 @@ /area/lawoffice) "axJ" = ( /obj/structure/closet/emcloset, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "axK" = ( @@ -12891,7 +12879,6 @@ c_tag = "Engineering - Engine Starboard"; dir = 8; icon_state = "camera"; - tag = "icon-camera (WEST)" }, /turf/simulated/floor/plating, /area/engineering/engine_room) @@ -13225,7 +13212,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5 }, @@ -13239,7 +13225,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -13260,7 +13245,6 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/red{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -13550,7 +13534,6 @@ /area/security/brig) "aza" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -13568,7 +13551,6 @@ /area/security/brig) "azb" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -13588,7 +13570,6 @@ /area/security/brig) "azc" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -13823,6 +13804,10 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "azy" = ( @@ -14390,7 +14375,6 @@ dir = 1 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -15276,7 +15260,6 @@ dir = 4 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHWEST)"; icon_state = "corner_white"; dir = 9 }, @@ -15665,6 +15648,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge) "aCC" = ( @@ -15858,6 +15842,10 @@ icon_state = "1-2"; pixel_y = 0 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aCU" = ( @@ -15893,10 +15881,18 @@ dir = 5 }, /obj/item/modular_computer/console/preset/engineering, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aCX" = ( /obj/machinery/papershredder, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aCY" = ( @@ -16287,6 +16283,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/security/prison) "aDA" = ( @@ -16479,6 +16479,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/lawoffice) "aDS" = ( @@ -17170,9 +17171,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/weapon/stamp{ - name = "warden's rubber stamp" - }, /obj/item/weapon/folder/sec, /obj/item/weapon/stamp{ name = "warden's rubber stamp" @@ -18039,6 +18037,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/security/brig) "aGz" = ( @@ -18054,6 +18053,7 @@ /obj/effect/floor_decal/corner/blue{ dir = 10 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/security/brig) "aGA" = ( @@ -19233,6 +19233,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/crew_quarters/heads/hos) "aIp" = ( @@ -19528,6 +19529,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/warden) "aIH" = ( @@ -19757,6 +19759,7 @@ name = "Bridge"; req_access = list(19) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/bridge) "aJa" = ( @@ -20295,6 +20298,10 @@ pixel_x = 0; pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/lobby) "aJV" = ( @@ -20583,6 +20590,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/brig) "aKs" = ( @@ -20647,6 +20655,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge) "aKA" = ( @@ -21348,6 +21357,10 @@ /obj/machinery/computer/cryopod{ pixel_x = -32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/prison) "aLS" = ( @@ -21910,6 +21923,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/item/weapon/xmasgift/large, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "aMC" = ( @@ -22353,6 +22367,10 @@ icon_state = "corner_white"; dir = 9 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/lobby) "aNv" = ( @@ -22621,6 +22639,7 @@ name = "Security Blast Door"; opacity = 0 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/brig) "aNS" = ( @@ -22765,6 +22784,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge) "aOf" = ( @@ -22966,6 +22986,10 @@ /obj/structure/bed/chair/comfy/brown{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge) "aOs" = ( @@ -23305,6 +23329,7 @@ "aPa" = ( /obj/structure/table/woodentable, /obj/machinery/computer/skills, +/obj/item/weapon/xmasgift/medium, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) "aPb" = ( @@ -23334,6 +23359,10 @@ icon_state = "corner_white"; dir = 9 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/lobby) "aPe" = ( @@ -23529,6 +23558,10 @@ /obj/machinery/newscaster{ pixel_x = 27 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/security/prison) "aPx" = ( @@ -23700,6 +23733,7 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aPM" = ( @@ -23824,6 +23858,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aPV" = ( @@ -23979,6 +24014,7 @@ /obj/structure/table/standard, /obj/item/weapon/paper_bin, /obj/item/weapon/pen, +/obj/item/weapon/xmasgift/medium, /turf/simulated/floor/carpet, /area/crew_quarters/heads/chief) "aQj" = ( @@ -24045,6 +24081,10 @@ icon_state = "corner_white"; dir = 9 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aQo" = ( @@ -24277,6 +24317,10 @@ dir = 9 }, /obj/machinery/firealarm/west, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/security/lobby) "aQK" = ( @@ -24676,7 +24720,6 @@ /area/bridge/meeting_room) "aRu" = ( /obj/effect/floor_decal/spline/fancy/wood{ - tag = "icon-spline_fancy (EAST)"; icon_state = "spline_fancy"; dir = 4 }, @@ -24833,6 +24876,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aRG" = ( @@ -24847,6 +24891,7 @@ pixel_y = -27 }, /obj/machinery/firealarm/south, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aRH" = ( @@ -24871,6 +24916,7 @@ icon_state = "intact-scrubbers"; dir = 5 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/captain) "aRI" = ( @@ -25036,6 +25082,7 @@ name = "Chief Engineer"; req_access = list(56) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/crew_quarters/heads/chief) "aRS" = ( @@ -25476,6 +25523,10 @@ pixel_x = -32; pixel_y = 0 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aSH" = ( @@ -25497,6 +25548,10 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aSJ" = ( @@ -25705,6 +25760,10 @@ "aTc" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/corner/yellow/full, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aTd" = ( @@ -26333,6 +26392,10 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aUf" = ( @@ -26347,6 +26410,10 @@ /area/hallway/primary/starboard) "aUg" = ( /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aUh" = ( @@ -26424,7 +26491,6 @@ /obj/structure/table/woodentable, /obj/item/weapon/folder/blue, /obj/effect/floor_decal/spline/fancy/wood{ - tag = "icon-spline_fancy (EAST)"; icon_state = "spline_fancy"; dir = 4 }, @@ -26784,6 +26850,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/engineering/foyer) "aUP" = ( @@ -26793,6 +26860,7 @@ req_one_access = list(10) }, /obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/engineering/foyer) "aUQ" = ( @@ -26821,6 +26889,10 @@ icon_state = "corner_white_full"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aUT" = ( @@ -26835,6 +26907,10 @@ icon_state = "corner_white_full"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aUV" = ( @@ -26990,6 +27066,7 @@ desc = "It opens and closes. Hazardous lifeforms ahead. Caution advised!"; name = "Security Lobby" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/lobby) "aVg" = ( @@ -27008,6 +27085,7 @@ name = "Security Aft Entrance"; req_access = list(63) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/brig) "aVh" = ( @@ -27061,6 +27139,10 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aVn" = ( @@ -27077,6 +27159,7 @@ "aVo" = ( /obj/structure/table/reinforced, /obj/machinery/computer/skills, +/obj/item/weapon/xmasgift/medium, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aVp" = ( @@ -27110,7 +27193,6 @@ }, /obj/item/weapon/pen, /obj/effect/floor_decal/spline/fancy/wood{ - tag = "icon-spline_fancy (EAST)"; icon_state = "spline_fancy"; dir = 4 }, @@ -27233,6 +27315,10 @@ /area/engineering/foyer) "aVJ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aVK" = ( @@ -27254,6 +27340,10 @@ icon_state = "corner_white"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aVM" = ( @@ -27284,6 +27374,10 @@ icon_state = "corner_white"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/engineering/foyer) "aVP" = ( @@ -27481,6 +27575,10 @@ pixel_x = 0; pixel_y = 24 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "aWl" = ( @@ -27739,6 +27837,10 @@ dir = 1 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "aWM" = ( @@ -27828,7 +27930,6 @@ "aWT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/corner/orange{ - tag = "icon-corner_white (SOUTHEAST)"; icon_state = "corner_white"; dir = 6 }, @@ -28532,6 +28633,7 @@ name = "Bridge Blast Doors"; opacity = 0 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/crew_quarters/heads/hop) "aXS" = ( @@ -29514,6 +29616,7 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/engineering/foyer) "aZH" = ( @@ -29523,6 +29626,7 @@ /obj/structure/bed/chair{ dir = 1 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/engineering/foyer) "aZI" = ( @@ -30882,6 +30986,10 @@ icon_state = "corner_white"; dir = 6 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bci" = ( @@ -30919,6 +31027,10 @@ /area/hallway/primary/central_one) "bcj" = ( /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "bck" = ( @@ -31404,6 +31516,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/bridge) "bda" = ( @@ -32401,6 +32514,10 @@ icon_state = "corner_white"; dir = 6 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "beD" = ( @@ -34655,6 +34772,7 @@ pixel_x = 5; pixel_y = 5 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/assembly/robotics) "biw" = ( @@ -35823,6 +35941,10 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/minibar) "bkq" = ( @@ -36684,6 +36806,10 @@ "blJ" = ( /obj/machinery/vending/dinnerware, /obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/minibar) "blK" = ( @@ -37433,7 +37559,7 @@ /obj/item/weapon/folder/white, /obj/item/weapon/pen, /obj/machinery/camera/network/medbay{ - c_tag = "Medical - Phychiatrist Office"; + c_tag = "Medical - Psychiatrist's Office"; dir = 1; icon_state = "camera" }, @@ -37635,6 +37761,7 @@ d2 = 8; icon_state = "2-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge) "bna" = ( @@ -38302,6 +38429,10 @@ /obj/machinery/alarm{ pixel_y = 23 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bog" = ( @@ -38457,6 +38588,10 @@ req_access = list(19) }, /obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/minibar) "bos" = ( @@ -38765,6 +38900,10 @@ /obj/machinery/ringer_button{ id = "medbay_ringer" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "boS" = ( @@ -38778,6 +38917,14 @@ icon_state = "corner_white"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "boT" = ( @@ -39097,6 +39244,7 @@ dir = 4 }, /obj/effect/floor_decal/corner/paleblue/diagonal, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bpw" = ( @@ -39253,6 +39401,10 @@ "bpI" = ( /obj/machinery/smartfridge/drinks, /obj/effect/floor_decal/corner/red/diagonal, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/minibar) "bpJ" = ( @@ -39856,6 +40008,10 @@ dir = 8; icon_state = "comfychair_preview" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bqD" = ( @@ -40723,11 +40879,14 @@ /area/medical/medbay2) "bsc" = ( /obj/effect/floor_decal/corner/grey{ - tag = "icon-corner_white (WEST)"; icon_state = "corner_white"; dir = 8 }, /obj/structure/table/standard, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/medbay2) "bsd" = ( @@ -40753,7 +40912,6 @@ /area/crew_quarters/heads/cmo) "bsf" = ( /obj/effect/floor_decal/corner/paleblue{ - tag = "icon-corner_white (WEST)"; icon_state = "corner_white"; dir = 8 }, @@ -40782,6 +40940,7 @@ pixel_y = 6 }, /obj/item/weapon/pen, +/obj/item/weapon/xmasgift/medium, /turf/simulated/floor/tiled/white, /area/crew_quarters/heads/cmo) "bsj" = ( @@ -41085,6 +41244,7 @@ name = "Biohazard Shutter"; opacity = 0 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/rnd/research) "bsE" = ( @@ -41330,7 +41490,6 @@ /obj/structure/bed/chair/comfy/teal{ dir = 8; icon_state = "comfychair_preview"; - tag = "icon-comfychair (WEST)" }, /turf/simulated/floor/tiled/white, /area/medical/gen_treatment) @@ -41752,6 +41911,10 @@ /obj/structure/table/standard, /obj/item/weapon/storage/box/cups, /obj/item/weapon/storage/box/cups, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "btM" = ( @@ -41765,6 +41928,7 @@ /obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/white, /area/medical/reception) "btO" = ( @@ -41775,6 +41939,7 @@ /obj/effect/floor_decal/corner/lime{ dir = 10 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/white, /area/medical/reception) "btP" = ( @@ -42300,6 +42465,10 @@ /area/medical/reception) "buL" = ( /obj/structure/reagent_dispensers/water_cooler, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "buM" = ( @@ -42967,6 +43136,7 @@ d2 = 4; icon_state = "2-4" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "bvL" = ( @@ -43204,6 +43374,7 @@ name = "Biohazard Shutter"; opacity = 0 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/rnd/lab) "bwb" = ( @@ -43657,7 +43828,6 @@ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/paper/monitorkey, /obj/item/device/megaphone, /obj/item/weapon/paper_bin{ pixel_x = 1; @@ -43665,11 +43835,13 @@ }, /obj/item/weapon/pen, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/xmasgift/medium, /turf/simulated/floor/tiled/white, /area/rnd/rdoffice) "bwS" = ( /obj/structure/table/standard, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/paper/monitorkey, /turf/simulated/floor/tiled/white, /area/rnd/rdoffice) "bwT" = ( @@ -43699,6 +43871,10 @@ /obj/effect/floor_decal/corner/purple{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/research) "bwV" = ( @@ -43909,6 +44085,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/medical/reception) "bxn" = ( @@ -44864,6 +45041,10 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/rnd/research) "byM" = ( @@ -45015,6 +45196,10 @@ dir = 6 }, /obj/machinery/firealarm/south, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/medical/reception) "byZ" = ( @@ -46450,6 +46635,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/rnd/rdoffice) "bBw" = ( @@ -46934,6 +47120,10 @@ /area/crew_quarters/sleep/research) "bCi" = ( /obj/effect/floor_decal/corner/mauve, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/research) "bCj" = ( @@ -48543,6 +48733,7 @@ name = "Conference Room and Lift"; req_access = list(47) }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/research) "bEP" = ( @@ -49711,6 +49902,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/wood, /area/crew_quarters/sleep/main) "bGJ" = ( @@ -49740,6 +49932,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/locker/locker_toilet) "bGM" = ( @@ -50924,6 +51117,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/wood, /area/library) "bJm" = ( @@ -51514,6 +51711,7 @@ name = "Unisex Restrooms" }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/locker/locker_toilet) "bKB" = ( @@ -54722,6 +54920,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bQN" = ( @@ -54762,6 +54961,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bQQ" = ( @@ -54965,6 +55165,10 @@ pixel_y = 0 }, /obj/structure/closet/emcloset, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bRo" = ( @@ -55105,6 +55309,7 @@ "bRF" = ( /obj/structure/table/marble, /obj/machinery/firealarm/west, +/obj/item/weapon/toy/xmas_cracker, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bRG" = ( @@ -55705,6 +55910,10 @@ c_tag = "Aft Corridor - Camera 1"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/aft) "bSV" = ( @@ -55720,6 +55929,10 @@ /area/hallway/primary/aft) "bSW" = ( /obj/machinery/firealarm/west, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bSX" = ( @@ -56049,6 +56262,10 @@ dir = 8 }, /obj/machinery/firealarm/north, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "bTF" = ( @@ -56179,6 +56396,7 @@ pixel_x = 5; pixel_y = 5 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/quartermaster/office) "bTT" = ( @@ -56336,6 +56554,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/crew_quarters/bar) "bUi" = ( @@ -56448,6 +56667,10 @@ /area/quartermaster/office) "bUs" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "bUt" = ( @@ -56571,6 +56794,10 @@ pixel_x = 4 }, /obj/item/weapon/material/kitchen/utensil/fork, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bUB" = ( @@ -56745,6 +56972,10 @@ pixel_x = 4 }, /obj/item/weapon/material/kitchen/utensil/knife/plastic, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bUW" = ( @@ -56912,6 +57143,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/quartermaster/office) "bVm" = ( @@ -56934,6 +57166,10 @@ /obj/structure/bed/chair{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "bVo" = ( @@ -56961,6 +57197,10 @@ pixel_x = 4 }, /obj/item/weapon/material/kitchen/utensil/spoon, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bVq" = ( @@ -57129,6 +57369,10 @@ name = "Station Intercom (General)"; pixel_y = -28 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "bVE" = ( @@ -57190,6 +57434,10 @@ /area/crew_quarters/bar) "bVL" = ( /obj/structure/bed/chair/comfy/black, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bVM" = ( @@ -57197,6 +57445,14 @@ /obj/machinery/camera/network/civilian_west{ c_tag = "Bar - Smoking Lounge" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bVN" = ( @@ -57335,7 +57591,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet, /area/crew_quarters/bar) "bVZ" = ( /obj/structure/disposalpipe/segment{ @@ -57529,24 +57785,30 @@ }, /area/janitor) "bWq" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 4 - }, /obj/structure/window/reinforced{ dir = 8 }, +/obj/structure/table/woodentable, +/obj/item/weapon/toy/xmas_cracker, +/obj/item/clothing/head/festive/santa, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "bWr" = ( -/obj/structure/table/woodentable, +/obj/item/weapon/xmasgift/medium{ + pixel_x = -5; + pixel_y = -5 + }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "bWs" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 8 +/obj/item/weapon/xmasgift/small{ + pixel_x = 10; + pixel_y = -5 }, -/obj/structure/window/reinforced{ - dir = 4 +/obj/item/weapon/xmasgift/medium{ + layer = 2.9; + pixel_x = 0; + pixel_y = 0 }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) @@ -57580,6 +57842,7 @@ /obj/structure/bed/chair/comfy/black{ dir = 4 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bWx" = ( @@ -57589,12 +57852,18 @@ pixel_x = 0; pixel_y = -32 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bWy" = ( /obj/structure/bed/chair/comfy/black{ dir = 8 }, +/obj/structure/sign/christmas/lights, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bWz" = ( @@ -57747,17 +58016,29 @@ }, /area/janitor) "bWP" = ( -/obj/structure/table/woodentable, /obj/machinery/light/small, /obj/machinery/camera/network/civilian_west{ c_tag = "Bar - Diner Seating"; dir = 1 }, -/turf/simulated/floor/carpet, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bWQ" = ( -/obj/structure/table/woodentable, +/obj/item/weapon/xmasgift/small{ + pixel_x = -10; + pixel_y = -2 + }, +/obj/item/weapon/xmasgift/small{ + pixel_x = -2; + pixel_y = 7 + }, +/obj/item/weapon/xmasgift/small, /obj/machinery/light/small, +/obj/item/weapon/xmasgift/medium{ + layer = 2.9; + pixel_x = -8; + pixel_y = 8 + }, /turf/simulated/floor/carpet, /area/crew_quarters/bar) "bWR" = ( @@ -58263,6 +58544,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/quartermaster/office) "bXI" = ( @@ -59414,6 +59696,7 @@ req_access = list(50) }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/quartermaster/office) "bZY" = ( @@ -62044,6 +62327,10 @@ pixel_x = 0; pixel_y = -32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/quartermaster/office) "ceH" = ( @@ -62254,7 +62541,6 @@ "cfd" = ( /obj/structure/table/woodentable, /obj/effect/floor_decal/spline/fancy/wood{ - tag = "icon-spline_fancy (EAST)"; icon_state = "spline_fancy"; dir = 4 }, @@ -62284,7 +62570,6 @@ /area/bridge/meeting_room) "cfh" = ( /obj/effect/floor_decal/spline/fancy/wood{ - tag = "icon-spline_fancy (EAST)"; icon_state = "spline_fancy"; dir = 4 }, @@ -62555,7 +62840,6 @@ dir = 8 }, /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (SOUTHWEST)"; icon_state = "corner_white"; dir = 10 }, @@ -62710,7 +62994,6 @@ /area/hydroponics) "cfO" = ( /obj/structure/sign/double/barsign{ - tag = "icon-empty (WEST)"; icon_state = "empty"; dir = 8 }, @@ -63499,7 +63782,6 @@ /area/security/brig) "chm" = ( /obj/effect/floor_decal/corner/blue{ - tag = "icon-corner_white (NORTHEAST)"; icon_state = "corner_white"; dir = 5 }, @@ -63522,6 +63804,10 @@ /obj/structure/bed/chair{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "chp" = ( @@ -64168,6 +64454,10 @@ pixel_x = 0; pixel_y = 32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge) "cip" = ( @@ -64536,6 +64826,10 @@ /area/bridge/meeting_room) "ciR" = ( /obj/structure/flora/pottedplant/random, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge) "ciS" = ( @@ -64905,7 +65199,6 @@ /area/bridge) "cjv" = ( /obj/structure/toilet{ - tag = "icon-toilet00 (WEST)"; icon_state = "toilet00"; dir = 8 }, @@ -65077,6 +65370,10 @@ icon_state = "corner_white"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) "cjP" = ( @@ -65237,6 +65534,661 @@ /obj/structure/sign/greencross, /turf/simulated/wall, /area/medical/reception) +"ckh" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"cki" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/security/brig) +"ckj" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/security/brig) +"ckk" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/brig) +"ckl" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckm" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckn" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"cko" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckp" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckq" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckr" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/security/lobby) +"cks" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckt" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"cku" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckv" = ( +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckw" = ( +/obj/effect/floor_decal/corner/yellow{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckx" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"cky" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckz" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/engineering/foyer) +"ckA" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) +"ckB" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) +"ckC" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/starboard) +"ckD" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckE" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckF" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckG" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckH" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckI" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckJ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckK" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckL" = ( +/obj/effect/floor_decal/corner/lime, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckM" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckN" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"ckP" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 6 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/medical/reception) +"ckQ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckR" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckS" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/research) +"ckT" = ( +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckU" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckV" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckW" = ( +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckX" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckY" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"ckZ" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"cla" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/research) +"clb" = ( +/obj/effect/floor_decal/corner/mauve{ + icon_state = "corner_white"; + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"clc" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/rnd/research) +"cld" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"cle" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/sleep/research) +"clf" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"clg" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"clh" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"cli" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"clj" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/central_one) +"clk" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"cll" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) +"clm" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/library) +"cln" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) +"clo" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/wood, +/area/library) +"clp" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"clq" = ( +/obj/structure/bed/chair/comfy/black, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"clr" = ( +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp/green{ + pixel_x = 1; + pixel_y = 5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/library) +"cls" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clt" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clu" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clv" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"clw" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"clx" = ( +/obj/structure/table/marble, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +"cly" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clz" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clA" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clB" = ( +/obj/effect/floor_decal/corner/grey, +/obj/effect/floor_decal/corner/white{ + icon_state = "corner_white"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/aft) +"clC" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/toy/xmas_cracker, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"clD" = ( +/obj/structure/table/woodentable, +/obj/item/clothing/head/festive/santa, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"clE" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/xmasgift/small, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"clF" = ( +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clG" = ( +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clH" = ( +/obj/structure/flora/tree/pine/xmas, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clI" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"clJ" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/sign/christmas/lights, +/obj/structure/table/woodentable, +/obj/item/weapon/toy/xmas_cracker, +/obj/item/weapon/xmasgift/small, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clK" = ( +/obj/item/weapon/xmasgift/medium{ + pixel_x = 8; + pixel_y = 8 + }, +/obj/item/weapon/xmasgift/small{ + pixel_x = 14; + pixel_y = 0 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clL" = ( +/obj/item/weapon/xmasgift/large{ + pixel_x = 0; + pixel_y = 10 + }, +/obj/structure/sign/christmas/lights, +/obj/item/weapon/xmasgift/small{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/item/weapon/xmasgift/small, +/obj/item/weapon/xmasgift/small{ + pixel_x = -6; + pixel_y = 2 + }, +/turf/simulated/floor/carpet, +/area/crew_quarters/bar) +"clM" = ( +/obj/structure/sign/christmas/lights, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) (1,1,1) = {" aaa @@ -82321,7 +83273,7 @@ aQj aRN aSY aUI -aEJ +cky aXg aEJ aZz @@ -82578,7 +83530,7 @@ aQg aRO aSZ aUJ -aEJ +ckz aXg aYn aQs @@ -83600,8 +84552,8 @@ aGd aHS aJy aLj -aEJ -aEJ +ckl +ckq aQn aRS aTc @@ -84662,7 +85614,7 @@ byE cdL bAz bBu -bCh +cle bCX bDP bEG @@ -85404,7 +86356,7 @@ aOP aQu aRX aTi -aUT +ckv aEJ aXm aDa @@ -85918,7 +86870,7 @@ aOT aQv aRZ aTk -aUT +ckw aEJ aXm aDa @@ -86164,7 +87116,7 @@ awY ayD aAm aBI -aDa +ckh aEJ aEJ aHZ @@ -86970,10 +87922,10 @@ bqZ buB bvL bwU -bqZ +ckS byL -bqZ -bqZ +cla +clc bBx bCp bDe @@ -87975,7 +88927,7 @@ aGu aGu aTo aUW -aVT +ckA aXs aVT aVa @@ -88489,7 +89441,7 @@ aIg aIg aTq aUY -aVT +ckB aXu aYx aZJ @@ -91339,10 +92291,10 @@ brh buG bwb bkL -bkL -bkL -bwc -aWn +ckT +ckW +clb +cld bBL buG bDn @@ -91563,7 +92515,7 @@ aAw aBU ame aES -aGB +cki aIp aJM aLF @@ -91578,9 +92530,9 @@ aXB aWn aWc baP -aWn -aWn -aWn +ckD +ckE +ckF bfR baT aWn @@ -91820,7 +92772,7 @@ aoT aoT aDm aEQ -aGB +ckj aIq aJN aLG @@ -92109,9 +93061,9 @@ bsE aWn bdA bwd -aWn -aWn -aWn +ckQ +ckU +ckX bzV bdA aWn @@ -92618,7 +93570,7 @@ bcj bny aVc aWn -aWn +ckM bsF btJ btJ @@ -92631,7 +93583,7 @@ btJ btJ btJ bsF -aWn +clh bFh bGb bGH @@ -93156,9 +94108,9 @@ bJR bKz bOd bLD -bJa +cls bMG -bJa +clt bNC bKZ bOH @@ -93166,11 +94118,11 @@ bPg bPO bQl bIl -bJa -bJa +clu +cly bRZ -bJa -bJa +clz +clA bSU bTl bJa @@ -93402,7 +94354,7 @@ btJ btJ btJ ceB -aWn +cli bFj bDx bGJ @@ -93452,9 +94404,9 @@ aaa aaa aab aab -aab -aab -aab +aSV +aSV +aSV aab aab aab @@ -93685,7 +94637,7 @@ bMI bJa bOf bSG -bOf +clB bOf bOf bTY @@ -93709,9 +94661,9 @@ aaa aaa aab aab -aab -aab -aab +aSV +aSV +aSV aab aab aab @@ -93881,7 +94833,7 @@ aIs aJU aLJ aLJ -aLJ +ckr cfI aSi aTD @@ -93966,9 +94918,9 @@ aaa aaa aab aab -aab -aab -aab +aSV +aSV +aSV aab aab aab @@ -94160,7 +95112,7 @@ bix bix aZN aWn -aWn +ckN bsF btJ btJ @@ -94173,7 +95125,7 @@ btJ btJ btJ ceB -aWn +clj bFk aWn bGK @@ -94451,7 +95403,7 @@ bNF bNF bQn bQL -bRk +clv bRF bSa bRH @@ -94679,9 +95631,9 @@ bsH aWn bdD bwe -aWn -aWn -aWn +ckR +ckV +ckY aWc bdD aWn @@ -94723,7 +95675,7 @@ bUW bVI bRH bWq -bWq +clJ bRi bTe bMM @@ -94965,21 +95917,21 @@ bPi bPQ bQp bQN -bRk +clw bRl bSb bRH bSJ bSX -bTm +clC bTG bUb bSX -bTm +clE bTG bRH bRH -bWr +bRH bWP bRi bMQ @@ -95179,15 +96131,15 @@ baV aWn bdE beG +ckG +ckH +aWn +ckI +ckJ aWn aWn -aWn -aWn -aWn -aWn -aWn -aWn -bpW +ckK +ckL brp bsJ btK @@ -95195,7 +96147,7 @@ bpW bwf brp cjO -aWn +ckZ aWc aWn aXD @@ -95222,7 +96174,7 @@ bPj bPR bQp bQO -bRl +clx bRG bSb bRH @@ -95235,9 +96187,9 @@ bSX bTn bTG bRH -bRH -bWs +clF bWs +clK bRi cdZ bMN @@ -95485,16 +96437,16 @@ bSc bRm bSL bSX -bTm +clD bTG bUb bSX bTm bTG bRH -bRH -bWq -bWq +clG +clH +clL bRi bMQ bMN @@ -95713,7 +96665,7 @@ byW btQ bAR bBN -bCD +clf bDz bEl bFo @@ -95970,7 +96922,7 @@ byX btQ bAS aXD -bCD +clg bDA bEm bFp @@ -96007,8 +96959,8 @@ bRH bRH bRH bRH -bWs -bWs +clI +clM bRi bMQ bXM @@ -96219,7 +97171,7 @@ bqa brt brr btM -buM +ckP buM bxi buM @@ -96988,7 +97940,7 @@ bnA boS bqc brw -bsN +ckO btP buP bsN @@ -97257,10 +98209,10 @@ bAW bBS bly bDD -bEr -bEp -bEp +clk bEp +cll +clm bEp bIt bEp @@ -97518,7 +98470,7 @@ bEs bFr bGh bGP -bEr +cln bIt bEp bEp @@ -97775,7 +98727,7 @@ bEt bFs bEr bGQ -bEr +clo bIt bJj bEp @@ -98806,9 +99758,9 @@ bDy bHI bGf bJl -bGM -bGf -bGN +clp +clq +clr bLT bDy bMQ @@ -101332,7 +102284,7 @@ aFq aHc aIP abH -abI +ckk aNQ aPy aQZ @@ -102363,11 +103315,11 @@ azz aLZ cdu aAY -azz -azz -azz +cks +ckt +cku aVh -azz +ckC cfj aZa bac @@ -103646,7 +104598,7 @@ azz aIQ azz aMc -azz +ckm aPE aRe aSz @@ -103903,7 +104855,7 @@ axK aIR axK aMd -azz +ckn aPF aRf aSA @@ -104160,7 +105112,7 @@ aHk aIQ azz aMe -azz +cko aPF aRg aSB @@ -104417,7 +105369,7 @@ awj awj cfa aMe -azz +ckp aPG aRh aSC @@ -106735,7 +107687,7 @@ aPJ aRn aSI aUg -aRn +ckx aWM aXR aZk diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 78040be7cfc..0b58a48eeba 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -771,6 +771,10 @@ "bu" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/dock) "bx" = ( @@ -1096,6 +1100,10 @@ }, /obj/structure/window/reinforced, /obj/effect/floor_decal/corner/blue/full, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/dock) "cn" = ( @@ -1297,6 +1305,10 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/dock) "cI" = ( @@ -2557,7 +2569,6 @@ dir = 1 }, /obj/machinery/door/window/eastright{ - tag = "icon-right (WEST)"; icon_state = "right"; dir = 8 }, @@ -2600,6 +2611,10 @@ icon_state = "corner_white_full"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) "eW" = ( @@ -2668,6 +2683,10 @@ icon_state = "corner_white_full"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "fc" = ( @@ -3003,6 +3022,10 @@ /area/hallway/secondary/entry/dock) "fI" = ( /obj/effect/floor_decal/corner/blue/full, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/dock) "fJ" = ( @@ -3381,7 +3404,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 4; icon_state = "map"; - tag = "icon-manifold-f (EAST)" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) @@ -3482,7 +3504,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; icon_state = "map"; - tag = "icon-manifold-f (WEST)" }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) @@ -3990,6 +4011,10 @@ icon_state = "corner_white_full"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "hr" = ( @@ -4274,6 +4299,10 @@ "hX" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/emcloset, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) "hZ" = ( @@ -4400,6 +4429,10 @@ "ip" = ( /obj/structure/closet/emcloset, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "iq" = ( @@ -5231,6 +5264,10 @@ icon_state = "corner_white_full"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "jP" = ( @@ -5282,6 +5319,7 @@ req_access = list(1) }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/checkpoint2) "jT" = ( @@ -5326,6 +5364,10 @@ /area/security/checkpoint2) "jV" = ( /obj/effect/floor_decal/corner/blue/full, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "jW" = ( @@ -5890,6 +5932,10 @@ "kP" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "kQ" = ( @@ -5943,6 +5989,10 @@ /area/security/checkpoint2) "kV" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "kW" = ( @@ -6260,6 +6310,7 @@ dir = 8 }, /obj/effect/floor_decal/corner/red/full, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) "lw" = ( @@ -6708,6 +6759,10 @@ icon_state = "corner_white_full"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mi" = ( @@ -6728,6 +6783,10 @@ /obj/effect/floor_decal/corner/blue/full{ dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mk" = ( @@ -6760,12 +6819,17 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/checkpoint2) "mm" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mn" = ( @@ -6780,6 +6844,10 @@ icon_state = "corner_white_full"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mp" = ( @@ -6877,6 +6945,10 @@ icon_state = "corner_white"; dir = 5 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "my" = ( @@ -6997,6 +7069,10 @@ dir = 1; pixel_y = -22 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mK" = ( @@ -7043,6 +7119,10 @@ /obj/machinery/newscaster{ pixel_y = -32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "mQ" = ( @@ -7192,6 +7272,7 @@ name = "NSS Aurora" }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "nh" = ( @@ -7205,6 +7286,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "ni" = ( @@ -7905,6 +7987,10 @@ /turf/simulated/floor/plating, /area/maintenance/solarmaint) "oA" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/carpet, /area/hallway/secondary/entry/fore) "oB" = ( @@ -7995,6 +8081,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/security/vacantoffice) "oJ" = ( @@ -8212,6 +8299,10 @@ spawn_nothing_percentage = 50; spawn_object = /obj/item/weapon/flame/lighter }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/carpet, /area/hallway/secondary/entry/fore) "pe" = ( @@ -8330,6 +8421,10 @@ "pr" = ( /obj/structure/table/woodentable, /obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/carpet, /area/hallway/secondary/entry/fore) "ps" = ( @@ -8823,6 +8918,10 @@ /area/storage/primary) "qp" = ( /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/primary) "qq" = ( @@ -8873,6 +8972,10 @@ dir = 4; icon_state = "comfychair_preview" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "qt" = ( @@ -8927,6 +9030,10 @@ "qy" = ( /obj/structure/reagent_dispensers/fueltank, /obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/primary) "qz" = ( @@ -8952,6 +9059,10 @@ c_tag = "Surface - Corridor Camera 10"; dir = 8 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "qB" = ( @@ -8997,6 +9108,10 @@ dir = 8 }, /obj/structure/flora/pottedplant/random, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "qD" = ( @@ -9129,6 +9244,10 @@ /obj/structure/table/standard, /obj/random/tech_supply, /obj/random/tech_supply, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/primary) "qP" = ( @@ -9160,6 +9279,10 @@ dir = 4; icon_state = "comfychair_preview" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "qR" = ( @@ -9264,6 +9387,10 @@ /obj/machinery/recharger{ pixel_y = 0 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/primary) "rf" = ( @@ -9365,6 +9492,10 @@ /area/storage/primary) "rm" = ( /obj/structure/reagent_dispensers/watertank, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/storage/primary) "rn" = ( @@ -10368,6 +10499,10 @@ icon_state = "corner_white_full"; dir = 1 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/levela) "tv" = ( @@ -10891,6 +11026,10 @@ /area/crew_quarters/sleep/cryo) "uw" = ( /obj/structure/closet/emcloset, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "ux" = ( @@ -11056,6 +11195,10 @@ icon_state = "corner_white_full"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/bridge/levela) "uP" = ( @@ -11273,6 +11416,10 @@ "vk" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "vl" = ( @@ -11412,6 +11559,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge/levela) "vz" = ( @@ -11655,6 +11803,10 @@ dir = 8; icon_state = "pipe-c" }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "vV" = ( @@ -11851,6 +12003,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/bridge/levela) "wm" = ( @@ -13214,6 +13367,10 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) "yJ" = ( @@ -13266,6 +13423,11 @@ /area/hallway/secondary/entry/fore) "yP" = ( /obj/structure/flora/pottedplant/random, +/obj/structure/sign/christmas/lights, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "yQ" = ( @@ -13286,6 +13448,10 @@ pixel_x = 0; pixel_y = -32 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, /turf/simulated/floor/tiled, /area/crew_quarters/sleep/cryo) "yU" = ( @@ -14035,6 +14201,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/carpet, /area/crew_quarters/sleep/bedrooms) "Ai" = ( @@ -14052,6 +14219,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "Ak" = ( @@ -15544,6 +15712,10 @@ /area/quartermaster/loading) "Dz" = ( /obj/machinery/vending/coffee, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "DA" = ( @@ -15689,6 +15861,10 @@ /area/quartermaster/loading) "DQ" = ( /obj/machinery/vending/cola, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "DR" = ( @@ -15802,6 +15978,10 @@ c_tag = "Cargo - Auxilliary Entrance"; dir = 4 }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "Eg" = ( @@ -16076,6 +16256,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled, /area/quartermaster/loading) "EA" = ( @@ -16334,6 +16515,10 @@ /area/quartermaster/loading) "ET" = ( /obj/structure/closet/crate/trashcart, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "EU" = ( @@ -16860,6 +17045,7 @@ /obj/structure/table/standard{ name = "plastic table frame" }, +/obj/item/weapon/xmasgift/small, /turf/simulated/floor/tiled, /area/quartermaster/qm) "FW" = ( @@ -16975,6 +17161,10 @@ /turf/simulated/floor/tiled, /area/quartermaster/loading) "Gh" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled/ramp{ icon_state = "ramptop"; dir = 8 @@ -17097,6 +17287,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/ramp{ icon_state = "ramptop"; dir = 8 @@ -18296,7 +18487,6 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden{ - tag = "icon-intact (EAST)"; icon_state = "intact"; dir = 4 }, @@ -18361,7 +18551,6 @@ /area/hallway/secondary/exit) "II" = ( /obj/effect/floor_decal/industrial/warning/cee{ - tag = "icon-warningcee (EAST)"; icon_state = "warningcee"; dir = 4 }, @@ -18398,7 +18587,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8; icon_state = "map"; - tag = "icon-manifold-f (WEST)" }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/port) @@ -18615,7 +18803,6 @@ "Jj" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible{ - tag = "icon-intact (NORTHEAST)"; icon_state = "intact"; dir = 5 }, @@ -18691,6 +18878,10 @@ dir = 1 }, /obj/machinery/firealarm/east, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/fore) "Jr" = ( @@ -19443,6 +19634,453 @@ /obj/machinery/firealarm/west, /turf/simulated/floor/tiled, /area/quartermaster/loading) +"MJ" = ( +/obj/structure/bed/chair, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/effect/floor_decal/corner/blue/full{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/dock) +"MK" = ( +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/window/reinforced, +/obj/effect/floor_decal/corner/blue/full{ + icon_state = "corner_white_full"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/dock) +"ML" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/full{ + icon_state = "corner_white_full"; + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/port) +"MM" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/dock) +"MN" = ( +/obj/effect/floor_decal/corner/blue{ + icon_state = "corner_white"; + dir = 6 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/dock) +"MO" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/full{ + icon_state = "corner_white_full"; + dir = 1 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/exit) +"MP" = ( +/obj/effect/floor_decal/corner/blue/full{ + icon_state = "corner_white_full"; + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/dock) +"MQ" = ( +/obj/effect/floor_decal/corner/lime{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MR" = ( +/obj/effect/floor_decal/corner/lime{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MS" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MT" = ( +/obj/effect/floor_decal/corner/blue{ + dir = 10 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MU" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/corner/yellow/full, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/port) +"MV" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/corner/yellow/full{ + icon_state = "corner_white_full"; + dir = 4 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/port) +"MW" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MX" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/effect/floor_decal/corner/red/full{ + icon_state = "corner_white_full"; + dir = 4 + }, +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/exit) +"MY" = ( +/obj/effect/floor_decal/corner/lime{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"MZ" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 6 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Na" = ( +/obj/effect/floor_decal/corner/lime{ + icon_state = "corner_white"; + dir = 9 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nb" = ( +/obj/effect/floor_decal/corner/lime{ + dir = 6 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nd" = ( +/obj/structure/bed/chair/comfy/beige, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/hallway/secondary/entry/fore) +"Ne" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nf" = ( +/obj/structure/bed/chair/comfy/beige{ + dir = 1; + icon_state = "comfychair_preview" + }, +/obj/machinery/light, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/hallway/secondary/entry/fore) +"Ng" = ( +/obj/structure/sign/christmas/lights, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Ni" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nj" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nk" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/storage/primary) +"Nl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nm" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"No" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"Np" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"Nq" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"Nr" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Ns" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nt" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nu" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nv" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nw" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/fore) +"Nx" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker) +"Ny" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) +"Nz" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) +"NA" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) +"NB" = ( +/obj/machinery/door/firedoor, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) +"NC" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) +"ND" = ( +/obj/structure/sign/christmas/lights{ + icon_state = "xmaslights"; + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) (1,1,1) = {" aa @@ -42928,7 +43566,7 @@ aa aa aa ey -eT +ML fB fC ho @@ -42938,7 +43576,7 @@ fB IM fC fB -li +MU jI aa aa @@ -43452,7 +44090,7 @@ fD fC fC fD -lh +MV jI aa aa @@ -44006,7 +44644,7 @@ xD yi yI vK -vK +Nx vK Ar sP @@ -44238,10 +44876,10 @@ gs nU oj oA -oS +Nd pd pr -pB +Nf pP pW qg @@ -44484,8 +45122,8 @@ ll lF lP mh -ju -ju +MY +Na mJ gs IU @@ -44721,7 +45359,7 @@ aa bq bO IC -cE +MJ cY cm cE @@ -44994,7 +45632,7 @@ jw jO kj kP -kV +MW lG lP mj @@ -45244,10 +45882,10 @@ eC aa aa gu -hr +MQ ie iM -jx +MS jP jR kQ @@ -45278,7 +45916,7 @@ qy qO re rm -rz +Nk rX sw pP @@ -45755,7 +46393,7 @@ ds dM ee eD -eD +MM fI gv hr @@ -45798,10 +46436,10 @@ ph sS tE Ih -ph -ph +Nl +Nm wL -ph +Nn ph yM zn @@ -46044,9 +46682,9 @@ kO pR kO ql -kO +Nh qA -kO +Ni kO kO rB @@ -46269,8 +46907,8 @@ cn dO eg eF -eF -ej +MN +MP gv hr ii @@ -46292,19 +46930,19 @@ jA jA nL jA -oo +Nc iL -jA +Ne jw nZ jA pS jA -jA +Ng qr qB qP -jA +Nj jA mM jA @@ -46786,10 +47424,10 @@ eA aa aa gt -hr +MR ik iS -jx +MT jU jR kQ @@ -46831,7 +47469,7 @@ vN wP xG yn -jA +Nr iL oo Ai @@ -47088,7 +47726,7 @@ tK wQ ta yo -jA +Ns zp on Aj @@ -47293,7 +47931,7 @@ bV cr cH dc -cr +MK dQ ej eC @@ -47345,7 +47983,7 @@ tJ wR um yp -jA +Nt iL zL Ai @@ -47568,8 +48206,8 @@ ls lN lW mo -jB -jB +MZ +Nb mP gs ag @@ -47859,7 +48497,7 @@ tJ vO um yq -jA +Nu iL zN Ai @@ -48116,7 +48754,7 @@ tK vO tK yo -jA +Nv iL zO pu @@ -48373,7 +49011,7 @@ vO vO um yn -jA +Nw zr on pv @@ -48640,18 +49278,18 @@ Bi BB BB BB -Cj -BB +Ny BB BB +Nz CG BB BB BB -BB -AR -Cj -BB +NA +NB +NC +ND BB JK BB @@ -49096,7 +49734,7 @@ aa aa aa eI -fa +MO fM fO IH @@ -49106,7 +49744,7 @@ fM fO Iw fM -lu +MX eI aa aa @@ -49913,8 +50551,8 @@ us vg vS wV -wZ -wZ +No +Np yP rr zT @@ -51199,7 +51837,7 @@ vk vU wZ vg -wZ +Nq yT rr sr From 45653b05223ace7ef20621397d1411776c2a0508 Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 8 Dec 2017 23:18:21 +0200 Subject: [PATCH 02/13] Changelogs, 08DEC2017 --- html/changelog.html | 10 ++++++++++ html/changelogs/.all_changelog.yml | 6 ++++++ html/changelogs/lohikar-pipedel.yml | 4 ---- html/changelogs/thegreatjorge-christmas.yml | 4 ---- 4 files changed, 16 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/lohikar-pipedel.yml delete mode 100644 html/changelogs/thegreatjorge-christmas.yml diff --git a/html/changelog.html b/html/changelog.html index 839bf38a65f..87ccf6d8983 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,16 @@ -->
+

08 December 2017

+

Lohikar updated:

+ +

Santa updated:

+ +

30 November 2017

Alberyk updated: