diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm index 093cc756ac4..c2ff02b966f 100644 --- a/maps/stellardelight/stellar_delight2.dmm +++ b/maps/stellardelight/stellar_delight2.dmm @@ -930,7 +930,6 @@ dir = 1; pixel_y = 24 }, -/obj/structure/sign/christmas/wreath, /mob/living/simple_mob/otie/red/chubby/cocoa, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) @@ -1235,7 +1234,7 @@ /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) "cC" = ( -/obj/structure/flora/pottedplant/xmas, +/obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "cD" = ( @@ -2615,15 +2614,9 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "fL" = ( -/obj/machinery/computer/arcade/battle, /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/landmark/vermin, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, +/obj/machinery/slot_machine, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "fN" = ( @@ -3407,9 +3400,6 @@ /obj/item/weapon/deck/cah/black, /obj/item/weapon/deck/cards, /obj/item/weapon/deck/cards/casino, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "hC" = ( @@ -3652,9 +3642,6 @@ }, /obj/structure/table/bench/steel, /obj/effect/landmark/start/visitor, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "ik" = ( @@ -3761,7 +3748,6 @@ dir = 1 }, /obj/effect/landmark/start/visitor, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "iy" = ( @@ -3920,7 +3906,6 @@ dir = 1; pixel_y = 4 }, -/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "iP" = ( @@ -4576,9 +4561,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "kq" = ( @@ -5280,9 +5262,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "lH" = ( @@ -5834,7 +5813,6 @@ /obj/machinery/camera/network/civilian{ dir = 1 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/dark, /area/crew_quarters/recreation_area) "mM" = ( @@ -5911,9 +5889,6 @@ /obj/machinery/camera/network/civilian{ dir = 8 }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "mV" = ( @@ -7781,7 +7756,6 @@ /obj/structure/bed/chair/sofa/corp/corner{ dir = 8 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "rh" = ( @@ -8115,14 +8089,6 @@ "rR" = ( /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portaft) -"rS" = ( -/obj/structure/table/wooden_reinforced, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "rT" = ( /turf/simulated/wall/bay/r_wall/steel, /area/storage/tech) @@ -8203,7 +8169,6 @@ /obj/structure/bed/chair/sofa/corp{ dir = 1 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "sd" = ( @@ -8428,7 +8393,6 @@ /area/quartermaster/storage) "sH" = ( /obj/structure/table/wooden_reinforced, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "sI" = ( @@ -9649,13 +9613,6 @@ /obj/machinery/lapvend, /turf/simulated/floor/tiled/techmaint, /area/storage/primary) -"vv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "vw" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor, @@ -9933,7 +9890,6 @@ /obj/structure/bed/chair/sofa/corp/corner{ dir = 4 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "wg" = ( @@ -10541,9 +10497,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "xG" = ( @@ -10769,9 +10722,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "yd" = ( @@ -11051,10 +11001,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "yH" = ( @@ -12264,9 +12210,6 @@ dir = 4; pixel_x = 24 }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "BD" = ( @@ -12392,9 +12335,6 @@ pixel_x = 9; pixel_y = 24 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "BT" = ( @@ -12916,15 +12856,12 @@ /turf/simulated/floor/tiled/techmaint, /area/storage/primary) "De" = ( -/obj/structure/flora/pottedplant/xmas, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/item/device/radio/intercom{ dir = 8; pixel_x = -24 }, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, +/obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Df" = ( @@ -13220,15 +13157,12 @@ /turf/simulated/floor/glass/reinforced, /area/stellardelight/deck2/fore) "DO" = ( -/obj/structure/flora/pottedplant/xmas, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/item/device/radio/intercom{ dir = 4; pixel_x = 24 }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, +/obj/structure/flora/pottedplant/decorative, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "DP" = ( @@ -13268,10 +13202,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/engineering/storage) -"DU" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "DV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14688,9 +14618,6 @@ /obj/structure/closet/crate/bin{ anchored = 1 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "GM" = ( @@ -15077,9 +15004,6 @@ dir = 8; pixel_x = -24 }, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "HF" = ( @@ -15596,7 +15520,6 @@ /obj/effect/landmark{ name = "lightsout" }, -/obj/structure/flora/tree/pine/xmas/presents, /turf/simulated/floor/glass/reinforced, /area/crew_quarters/recreation_area) "IF" = ( @@ -15825,12 +15748,6 @@ "Ji" = ( /obj/machinery/computer/arcade/orion_trail, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Jj" = ( @@ -17242,10 +17159,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) "Mp" = ( -/obj/machinery/computer/arcade/orion_trail, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, +/obj/machinery/computer/arcade/battle, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Mq" = ( @@ -17664,7 +17578,6 @@ dir = 1; pixel_y = 24 }, -/obj/structure/sign/christmas/wreath, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "Nl" = ( @@ -18226,13 +18139,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) -"Oy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "Oz" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/effect/floor_decal/steeldecal/steel_decals5{ @@ -19282,9 +19188,6 @@ pixel_y = -32 }, /obj/structure/table/bench/steel, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "QK" = ( @@ -19439,9 +19342,6 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Ra" = ( @@ -20085,10 +19985,7 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portfore) "SF" = ( -/obj/machinery/computer/arcade/battle, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, +/obj/machinery/slot_machine, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "SG" = ( @@ -20117,7 +20014,6 @@ /obj/item/weapon/stool/padded{ dir = 8 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "SK" = ( @@ -21114,9 +21010,6 @@ /obj/structure/sign/poster{ dir = 1 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "UX" = ( @@ -21808,9 +21701,6 @@ /area/medical/reception) "WC" = ( /obj/machinery/alarm/angled, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "WE" = ( @@ -21939,10 +21829,6 @@ "WR" = ( /obj/structure/table/wooden_reinforced, /obj/item/device/paicard, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "WS" = ( @@ -22349,9 +22235,6 @@ pixel_y = 32 }, /obj/machinery/recharge_station, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "XQ" = ( @@ -22480,7 +22363,6 @@ /obj/structure/musician/piano{ dir = 4 }, -/obj/structure/sign/christmas/lights, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Yd" = ( @@ -22537,9 +22419,6 @@ /area/stellardelight/deck2/port) "Yl" = ( /obj/machinery/firealarm/angled, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "Ym" = ( @@ -22808,9 +22687,6 @@ /obj/machinery/camera/network/civilian{ dir = 5 }, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "YO" = ( @@ -23348,10 +23224,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) @@ -32637,7 +32509,7 @@ mt jv ct Lq -vv +ct HE xE yG @@ -33773,7 +33645,7 @@ mt hm VM uJ -Oy +VM BC lG ZZ @@ -33909,12 +33781,12 @@ HO nt XP mt -mt +SF mt mt lO mt -DU +mt nt nt nt @@ -34198,7 +34070,7 @@ kp GA fK ij -rS +sH nt Rq Rq