From 6b09f507ee606858b7cf26d69bf2a2c8966bd0c8 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 14 Jan 2024 07:18:49 +1000 Subject: [PATCH 1/2] Revert "Map swap + prep" --- maps/stellar_delight/stellar_delight2.dmm | 1468 +++++++++------------ vorestation.dme | 2 +- 2 files changed, 620 insertions(+), 850 deletions(-) diff --git a/maps/stellar_delight/stellar_delight2.dmm b/maps/stellar_delight/stellar_delight2.dmm index c9bf74678b3..f9d20b291ce 100644 --- a/maps/stellar_delight/stellar_delight2.dmm +++ b/maps/stellar_delight/stellar_delight2.dmm @@ -488,22 +488,7 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "aY" = ( -/obj/machinery/alarm/angled{ - dir = 4 - }, -/obj/machinery/recharge_station, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, +/obj/machinery/light, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "aZ" = ( @@ -949,10 +934,11 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) "bO" = ( -/obj/structure/table/woodentable, -/obj/structure/sign/christmas/lights{ - dir = 1 +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24 }, +/mob/living/simple_mob/vore/otie/red/chubby/cocoa, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "bP" = ( @@ -1284,23 +1270,9 @@ /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) "cC" = ( -/obj/structure/table/woodentable, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_y = 30 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/structure/flora/pottedplant/decorative, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "cD" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -2731,15 +2703,16 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) "fE" = ( -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/item/weapon/storage/pill_bottle/dice_nerd, +/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/weapon/storage/dicecup, +/obj/item/weapon/deck/cah, +/obj/item/weapon/deck/cah/black, +/obj/item/weapon/deck/cards, +/obj/item/weapon/deck/cards/casino, +/obj/structure/closet/walllocker_double/misc_civ/north, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "fF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable/white{ @@ -2827,26 +2800,11 @@ /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "fL" = ( -/obj/structure/table/woodentable, -/obj/machinery/light/floortube{ - dir = 1; - pixel_y = 6 - }, -/obj/machinery/camera/network/civilian, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3; - pixel_y = 4 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/item/weapon/material/ashtray/glass, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/landmark/vermin, +/obj/machinery/station_slot_machine, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "fM" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -3916,16 +3874,14 @@ /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) "ia" = ( -/obj/item/device/radio/intercom{ - dir = 1; - pixel_y = 24 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32; + pixel_y = -32 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/mob/living/simple_mob/vore/otie/red/chubby/cocoa, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/structure/table/bench/steel, +/obj/effect/landmark/start/entrepreneur, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "ib" = ( /obj/machinery/power/grounding_rod, /obj/structure/cable/yellow{ @@ -3982,21 +3938,14 @@ /turf/simulated/floor/tiled, /area/hydroponics) "ij" = ( -/obj/machinery/disposal/wall{ - dir = 8 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = 32; + pixel_y = -32 }, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/machinery/firealarm/angled, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/structure/table/bench/steel, +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "ik" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 10 @@ -4049,15 +3998,6 @@ /obj/structure/low_wall/bay/reinforced/white, /turf/simulated/floor, /area/medical/psych) -"iq" = ( -/obj/structure/noticeboard{ - pixel_y = 32 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "ir" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -4100,15 +4040,12 @@ /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/locker_room) "ix" = ( -/obj/machinery/media/jukebox, -/obj/machinery/light{ +/obj/structure/bed/chair/sofa/corp{ dir = 1 }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/effect/landmark/start/visitor, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "iy" = ( /obj/machinery/atm{ pixel_y = 30 @@ -4241,19 +4178,6 @@ }, /turf/simulated/floor, /area/stellardelight/deck2/starboardescape) -"iM" = ( -/obj/structure/table/woodentable, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/recharger{ - pixel_y = 5 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "iN" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/standard/glass{ @@ -4350,15 +4274,14 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) "iX" = ( -/obj/structure/table/woodentable, -/obj/random/paicard, -/obj/structure/sign/christmas/lights{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + door_color = "#9c9c9c"; + name = "Bar"; + stripe_color = "#89bd66" }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, +/turf/simulated/floor/tiled/steel_ridged, /area/crew_quarters/bar) "iY" = ( /obj/structure/cable/green{ @@ -4377,27 +4300,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/monitoring) -"jb" = ( -/obj/machinery/power/apc/angled{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "jc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/eris/white/bluecorner, @@ -4416,21 +4318,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) -"je" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/vending/wallmed1/public{ - pixel_x = 29 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "jf" = ( /obj/structure/table/reinforced, /obj/item/weapon/reagent_containers/glass/beaker/large, @@ -4447,22 +4334,6 @@ /obj/random/tech_supply, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) -"jh" = ( -/obj/machinery/door/window/brigdoor/northleft{ - name = "Bar"; - req_access = list(25) - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "ji" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4501,36 +4372,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) -"jl" = ( -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "bar"; - name = "Bar Shutter Control"; - pixel_x = 24 - }, -/obj/structure/table/marble, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/shaker{ - pixel_x = -7; - pixel_y = 11 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 26; - pixel_y = -9 - }, -/obj/machinery/button/remote/blast_door{ - dir = 8; - id = "barlockdown"; - name = "Window Lockdown"; - pixel_x = 24; - pixel_y = 10 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "jm" = ( /obj/structure/table/reinforced, /obj/item/device/gps/engineering{ @@ -4601,13 +4442,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) -"ju" = ( -/obj/item/weapon/stool/padded{ - dir = 8 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "jv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -4735,13 +4569,6 @@ /obj/item/weapon/pen, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) -"jH" = ( -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "jI" = ( /obj/structure/table/woodentable, /obj/structure/plushie/ian{ @@ -4806,10 +4633,6 @@ "jQ" = ( /turf/simulated/floor/reinforced, /area/quartermaster/storage) -"jR" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) "jS" = ( /obj/structure/cable{ icon_state = "1-8" @@ -4990,10 +4813,13 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "kl" = ( -/obj/machinery/light, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/structure/window/reinforced{ + dir = 8; + pixel_x = -4 + }, +/obj/structure/flora/pottedplant/decorative, +/turf/simulated/floor/glass/reinforced, +/area/stellardelight/deck2/fore) "km" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/structure/cable/orange{ @@ -5028,13 +4854,16 @@ /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) "kp" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_y = -32 +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 4 }, -/obj/structure/sign/christmas/lights, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled/eris/steel/brown_platform, -/area/crew_quarters/bar) +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "kq" = ( /obj/structure/closet/secure_closet/cargotech, /obj/item/weapon/stamp/cargo, @@ -5096,15 +4925,10 @@ /turf/simulated/open, /area/stellardelight/deck2/aftport) "ku" = ( -/obj/item/weapon/stool/padded{ - dir = 4 +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_y = -32 }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/light, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, +/turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) "kv" = ( /obj/machinery/alarm/angled{ @@ -5118,17 +4942,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) -"kw" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "bar"; - layer = 3.3; - name = "Bar Shutters" - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "kx" = ( /obj/structure/disposalpipe/sortjunction/wildcard/flipped{ dir = 1 @@ -5375,10 +5188,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/engineering/engine_eva) -"kU" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "kV" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 @@ -5429,11 +5238,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"lb" = ( -/obj/machinery/vending/boozeomat, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "lc" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -5584,11 +5388,6 @@ }, /turf/simulated/floor/tiled/eris/dark/monofloor, /area/bridge) -"lp" = ( -/obj/machinery/smartfridge/drinks, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "lq" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'RADIOACTIVE AREA'"; @@ -5749,18 +5548,6 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/bridge) -"lE" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_coffee/full{ - dir = 1 - }, -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/obj/machinery/light/small, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "lF" = ( /obj/effect/landmark{ name = "lightsout" @@ -5768,36 +5555,15 @@ /turf/simulated/floor, /area/stellardelight/deck2/combustionworkshop) "lG" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 1 - }, -/obj/machinery/requests_console{ - department = "Service"; - dir = 1; - pixel_y = -26 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/effect/landmark/vermin, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) -"lH" = ( -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 1 - }, -/obj/machinery/camera/network/civilian{ +/obj/structure/bed/chair/sofa/corp/right{ dir = 8 }, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ +/obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "lI" = ( /obj/structure/table/steel_reinforced, /obj/machinery/door/window/westleft{ @@ -6049,17 +5815,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) -"mc" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9c9c9c"; - name = "Bar"; - stripe_color = "#89bd66" - }, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/bar) "md" = ( /obj/effect/floor_decal/industrial/outline, /obj/effect/floor_decal/steeldecal/steel_decals9, @@ -6151,18 +5906,7 @@ /turf/simulated/floor/tiled, /area/stellardelight/deck2/starboard) "mn" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9c9c9c"; - name = "Bar"; - stripe_color = "#89bd66" - }, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled/steel_ridged, +/turf/simulated/floor/lino, /area/crew_quarters/bar) "mo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6173,20 +5917,6 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) -"mp" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9c9c9c"; - fill_color = null; - name = "Commons"; - stripe_color = "#89bd66" - }, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) "mq" = ( /obj/machinery/atmospherics/unary/engine/bigger{ dir = 1 @@ -6249,17 +5979,6 @@ /obj/machinery/portable_atmospherics/canister/nitrogen, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"my" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/angled_bay/standard/glass{ - door_color = "#9c9c9c"; - fill_color = null; - name = "Commons"; - stripe_color = "#89bd66" - }, -/obj/structure/sign/christmas/wreath, -/turf/simulated/floor/tiled/steel_ridged, -/area/crew_quarters/recreation_area) "mz" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/milspec/color/green/half{ @@ -6368,16 +6087,10 @@ /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/atmos) "mJ" = ( -/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) +/obj/structure/table/woodentable, +/obj/random/paicard, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "mK" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/white{ @@ -6399,11 +6112,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/medical/surgery2) "mL" = ( -/obj/machinery/computer/arcade/battle, -/obj/structure/sign/christmas/lights{ +/obj/structure/flora/pottedplant/small, +/obj/machinery/camera/network/civilian{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, +/turf/simulated/floor/tiled/dark, /area/crew_quarters/recreation_area) "mM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -6472,15 +6185,13 @@ /turf/simulated/wall/bay/steel, /area/storage/art) "mU" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/structure/closet/crate/bin{ - anchored = 1 - }, -/obj/structure/sign/christmas/lights{ +/obj/item/weapon/stool/padded{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "mV" = ( @@ -6560,22 +6271,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) -"nc" = ( -/obj/machinery/alarm/angled, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "nd" = ( /turf/simulated/wall/bay/white, /area/medical/surgery2) -"ne" = ( -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "nf" = ( /obj/machinery/firealarm/angled{ dir = 4 @@ -6594,15 +6292,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/eris/dark/danger, /area/engineering/engine_room) -"nh" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "ni" = ( /turf/simulated/wall/bay/r_wall/steel, /area/engineering/engine_room) @@ -6616,38 +6305,6 @@ /obj/effect/floor_decal/steeldecal/steel_decals10, /turf/simulated/floor/tiled/eris/white/cargo, /area/stellardelight/deck2/triage) -"nk" = ( -/obj/machinery/power/apc/angled{ - dir = 1; - name = "night shift APC"; - nightshift_setting = 2 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light_switch{ - 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) -"nl" = ( -/obj/item/weapon/storage/pill_bottle/dice_nerd, -/obj/item/weapon/storage/pill_bottle/dice, -/obj/item/weapon/storage/dicecup, -/obj/item/weapon/deck/cah, -/obj/item/weapon/deck/cah/black, -/obj/item/weapon/deck/cards, -/obj/item/weapon/deck/cards/casino, -/obj/structure/closet/walllocker_double/misc_civ/north, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "nm" = ( /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 @@ -6658,13 +6315,6 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"nn" = ( -/obj/machinery/firealarm/angled, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "no" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6903,15 +6553,21 @@ /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) "nQ" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/obj/machinery/recharge_station, -/obj/structure/sign/christmas/lights{ +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full{ dir = 1 }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) +/obj/machinery/requests_console{ + department = "Service"; + dir = 1; + pixel_y = -26 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/landmark/vermin, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "nR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/red{ dir = 6 @@ -6985,13 +6641,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) -"nY" = ( -/obj/machinery/computer/arcade/clawmachine, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "nZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -7151,18 +6800,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) -"or" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/landmark/vermin, -/obj/machinery/station_slot_machine, -/obj/structure/sign/christmas/lights{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "os" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 @@ -7337,19 +6974,6 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/storage/art) -"oN" = ( -/obj/item/weapon/stool/padded{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/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) "oO" = ( /obj/machinery/chem_master/condimaster, /turf/simulated/floor/tiled/eris/cafe, @@ -7399,19 +7023,6 @@ }, /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/engineering/workshop) -"oW" = ( -/obj/item/weapon/stool/padded{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/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) "oX" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /turf/simulated/floor/tiled/eris/dark/orangecorner, @@ -7522,18 +7133,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardaft) -"pi" = ( -/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/xmas, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "pj" = ( /obj/machinery/light/small{ dir = 8 @@ -7569,15 +7168,19 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) -"pm" = ( -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "pn" = ( -/obj/structure/table/gamblingtable, -/obj/item/toy/xmastree, -/turf/simulated/floor/carpet, -/area/crew_quarters/recreation_area) +/obj/machinery/alarm/angled{ + dir = 4 + }, +/obj/machinery/recharge_station, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "po" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -7619,23 +7222,6 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/tiled/eris/white/danger, /area/stellardelight/deck2/port) -"ps" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/toy/xmas_cracker, -/turf/simulated/floor/carpet, -/area/crew_quarters/recreation_area) -"pt" = ( -/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/xmas, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "pu" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -7703,34 +7289,6 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"pE" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 4 - }, -/obj/machinery/light{ - 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) -"pF" = ( -/obj/structure/window/reinforced{ - dir = 1; - pixel_y = 4 - }, -/obj/machinery/light{ - 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) "pG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -7907,14 +7465,12 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker) "pW" = ( -/obj/structure/table/gamblingtable, -/obj/machinery/light/floortube{ - pixel_y = -6 +/obj/machinery/media/jukebox, +/obj/machinery/light{ + dir = 1 }, -/obj/item/weapon/material/ashtray/glass, -/obj/item/weapon/toy/xmas_cracker, -/turf/simulated/floor/carpet, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "pX" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/milspec/color/green/half{ @@ -7970,18 +7526,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftport) -"qc" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32; - pixel_y = -32 - }, -/obj/structure/table/bench/steel, -/obj/effect/landmark/start/entrepreneur, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "qd" = ( /obj/item/device/radio/intercom{ dir = 1; @@ -8229,18 +7773,6 @@ /obj/machinery/camera/network/engineering, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/storage/tech) -"qB" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = 32; - pixel_y = -32 - }, -/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) "qC" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/double{ @@ -8262,15 +7794,6 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) -"qE" = ( -/obj/structure/table/wooden_reinforced, -/obj/random/paicard, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "qF" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -8311,13 +7834,6 @@ }, /turf/simulated/floor/tiled/eris/dark/techfloor_grid, /area/engineering/engine_room) -"qK" = ( -/obj/structure/musician/piano{ - dir = 4 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "qL" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -8358,20 +7874,16 @@ /obj/machinery/smartfridge/chemistry, /turf/simulated/floor/plating, /area/medical/chemistry) -"qR" = ( +"qS" = ( /obj/item/weapon/stool/padded{ + dir = 4 + }, +/obj/effect/floor_decal/spline/plain{ dir = 8 }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) -"qS" = ( -/obj/effect/landmark{ - name = "lightsout" - }, -/obj/structure/flora/tree/pine/xmas/presents, -/turf/simulated/floor/glass/reinforced, -/area/crew_quarters/recreation_area) +/obj/machinery/light, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "qT" = ( /obj/structure/lattice, /obj/structure/railing/grey{ @@ -8388,10 +7900,6 @@ }, /turf/simulated/floor, /area/stellardelight/deck2/aftport) -"qU" = ( -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "qV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8514,18 +8022,11 @@ /obj/effect/landmark/start/cargo, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"rf" = ( -/obj/structure/table/wooden_reinforced, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, -/area/crew_quarters/recreation_area) "rg" = ( -/obj/structure/table/wooden_reinforced, -/obj/structure/sign/christmas/lights{ - dir = 4 +/obj/structure/bed/chair/sofa/corp/corner{ + dir = 8 }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/tiled/eris/dark/cargo, +/turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "rh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -8593,13 +8094,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) -"ro" = ( -/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) "rp" = ( /obj/structure/cable/cyan{ icon_state = "1-2" @@ -8739,13 +8233,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) -"rA" = ( -/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) "rB" = ( /obj/structure/particle_accelerator/particle_emitter/right{ dir = 4 @@ -8813,17 +8300,6 @@ }, /turf/simulated/floor/tiled, /area/crew_quarters/locker) -"rJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/device/radio/intercom{ - dir = 8; - pixel_x = -24 - }, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) "rK" = ( /obj/structure/cable{ icon_state = "1-2" @@ -8831,17 +8307,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) -"rL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) "rM" = ( /obj/machinery/light/small{ dir = 1 @@ -8896,35 +8361,9 @@ "rR" = ( /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portaft) -"rS" = ( -/obj/structure/bed/chair/sofa/corp/left{ - dir = 4 - }, -/obj/machinery/light{ - 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) "rT" = ( /turf/simulated/wall/bay/r_wall/steel, /area/storage/tech) -"rU" = ( -/obj/structure/bed/chair/sofa/corp/right{ - dir = 8 - }, -/obj/machinery/light{ - 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) "rV" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -9002,16 +8441,9 @@ /turf/simulated/floor/tiled/techmaint, /area/engineering/atmos/storage) "sc" = ( -/obj/structure/bed/chair/sofa/corp/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ +/obj/structure/bed/chair/sofa/corp{ dir = 1 }, -/obj/structure/sign/christmas/lights, -/obj/structure/sign/christmas/lights{ - dir = 8 - }, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "sd" = ( @@ -9030,14 +8462,6 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) -"sf" = ( -/obj/structure/bed/chair/sofa/corp{ - dir = 1 - }, -/obj/effect/landmark/start/visitor, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) "sg" = ( /turf/simulated/floor/tiled/eris/white/danger, /area/stellardelight/deck2/port) @@ -9140,20 +8564,6 @@ }, /turf/simulated/floor/lino, /area/crew_quarters/bar) -"ss" = ( -/obj/structure/bed/chair/sofa/corp{ - dir = 1 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) -"st" = ( -/obj/structure/bed/chair/sofa/corp/corner{ - dir = 8 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) "su" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/light/floortube{ @@ -9257,12 +8667,8 @@ /turf/simulated/wall/bay/brown, /area/quartermaster/storage) "sH" = ( -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/obj/structure/sign/christmas/lights, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/tiled/dark, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/tiled/eris/dark/cargo, /area/crew_quarters/recreation_area) "sI" = ( /obj/structure/sign/deck2{ @@ -9287,12 +8693,15 @@ /turf/simulated/floor/tiled/white, /area/medical/surgery) "sL" = ( -/obj/structure/bed/chair/sofa/corp/corner{ - dir = 4 +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "sM" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -9568,27 +8977,6 @@ /obj/structure/cable, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) -"tq" = ( -/obj/structure/bed/chair/sofa/corp/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/sign/christmas/lights{ - dir = 4 - }, -/obj/structure/sign/christmas/lights, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) -"tr" = ( -/obj/structure/window/reinforced{ - dir = 4; - pixel_x = 4 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/glass/reinforced, -/area/stellardelight/deck2/fore) "ts" = ( /obj/structure/bed/chair/bay/comfy/brown{ dir = 1 @@ -9645,14 +9033,6 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardsolars) -"tx" = ( -/obj/structure/window/reinforced{ - dir = 8; - pixel_x = -4 - }, -/obj/structure/flora/pottedplant/xmas, -/turf/simulated/floor/glass/reinforced, -/area/stellardelight/deck2/fore) "ty" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -10317,6 +9697,33 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) +"uZ" = ( +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "bar"; + name = "Bar Shutter Control"; + pixel_x = 24 + }, +/obj/structure/table/marble, +/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/weapon/reagent_containers/food/drinks/shaker{ + pixel_x = -7; + pixel_y = 11 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26; + pixel_y = -9 + }, +/obj/machinery/button/remote/blast_door{ + dir = 8; + id = "barlockdown"; + name = "Window Lockdown"; + pixel_x = 24; + pixel_y = 10 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "va" = ( /obj/structure/bed/chair/comfy/brown{ dir = 1 @@ -10368,6 +9775,21 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/stellardelight/deck2/triage) +"vg" = ( +/obj/machinery/power/apc/angled{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/machinery/status_display{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "vh" = ( /obj/structure/closet/crate/freezer, /obj/machinery/light{ @@ -10730,6 +10152,12 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) +"wf" = ( +/obj/structure/bed/chair/sofa/corp/corner{ + dir = 4 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "wg" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/structure/cable/orange{ @@ -10925,6 +10353,21 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) +"wG" = ( +/obj/structure/table/woodentable, +/obj/machinery/computer/security/telescreen/entertainment{ + pixel_y = 30 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 2; + pixel_y = 7 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "wH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -11318,6 +10761,16 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/crew_quarters/bar) +"xE" = ( +/obj/structure/bed/chair/sofa/corp/left{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "xG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11546,6 +10999,12 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) +"yc" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "yd" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -11804,6 +11263,15 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"yG" = ( +/obj/structure/bed/chair/sofa/corp/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "yH" = ( /obj/structure/cable{ icon_state = "0-4" @@ -12535,6 +12003,18 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/stellardelight/deck2/aftstarboard) +"Ax" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/vending/wallmed1/public{ + pixel_x = 29 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "Ay" = ( /obj/structure/cable/white{ icon_state = "2-8" @@ -13010,6 +12490,24 @@ }, /turf/simulated/floor/tiled/eris/dark/orangecorner, /area/engineering/engine_eva) +"BC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) +"BD" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + door_color = "#9c9c9c"; + fill_color = null; + name = "Commons"; + stripe_color = "#89bd66" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "BE" = ( /obj/structure/cable{ icon_state = "1-8" @@ -13110,6 +12608,21 @@ /obj/structure/closet/secure_closet/medical1, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/chemistry) +"BS" = ( +/obj/machinery/power/apc/angled{ + dir = 1; + name = "night shift APC"; + nightshift_setting = 2 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/light_switch{ + pixel_x = 9; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "BT" = ( /turf/simulated/wall/bay/r_wall/steel, /area/engineering/atmos/storage) @@ -13637,6 +13150,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/storage/primary) +"De" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/obj/structure/flora/pottedplant/decorative, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Df" = ( /obj/machinery/atmospherics/unary/freezer{ dir = 8 @@ -13664,6 +13186,10 @@ }, /turf/simulated/floor/airless, /area/stellardelight/deck2/exterior) +"Dj" = ( +/obj/machinery/smartfridge/drinks, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "Dk" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/double/glass{ @@ -13869,6 +13395,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) +"DI" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "DJ" = ( /obj/machinery/portable_atmospherics/canister/oxygen/prechilled, /obj/machinery/atmospherics/portables_connector{ @@ -13906,6 +13438,15 @@ /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/glass/reinforced, /area/stellardelight/deck2/fore) +"DO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/obj/structure/flora/pottedplant/decorative, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "DP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 6 @@ -14663,6 +14204,14 @@ }, /turf/simulated/floor/tiled/techfloor, /area/engineering/atmos/monitoring) +"Fw" = ( +/obj/structure/table/gamblingtable, +/obj/machinery/light/floortube{ + pixel_y = -6 + }, +/obj/item/weapon/material/ashtray/glass, +/turf/simulated/floor/carpet, +/area/crew_quarters/recreation_area) "Fx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 10 @@ -14785,6 +14334,19 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portaft) +"FJ" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + door_color = "#9c9c9c"; + name = "Bar"; + stripe_color = "#89bd66" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/bar) "FK" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -15317,6 +14879,15 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portsolars) +"GL" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "GM" = ( /obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/milspec/color/green/half{ @@ -15512,6 +15083,16 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/central) +"Hi" = ( +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_alc/full{ + dir = 1 + }, +/obj/machinery/camera/network/civilian{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "Hj" = ( /obj/machinery/atm{ pixel_y = 30 @@ -15705,6 +15286,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/eris/white/danger, /area/stellardelight/deck2/starboard) +"HE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/device/radio/intercom{ + dir = 8; + pixel_x = -24 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) "HF" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/closet/crate/medical, @@ -16209,6 +15798,12 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) +"IE" = ( +/obj/effect/landmark{ + name = "lightsout" + }, +/turf/simulated/floor/glass/reinforced, +/area/crew_quarters/recreation_area) "IF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ dir = 8 @@ -16438,6 +16033,11 @@ "Jh" = ( /turf/space, /area/space) +"Ji" = ( +/obj/machinery/computer/arcade/orion_trail, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Jj" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -16717,6 +16317,19 @@ "JQ" = ( /turf/simulated/floor/tiled/eris/dark/gray_platform, /area/bridge) +"JR" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/airlock/angled_bay/standard/glass{ + door_color = "#9c9c9c"; + fill_color = null; + name = "Commons"; + stripe_color = "#89bd66" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/crew_quarters/recreation_area) "JS" = ( /obj/machinery/atmospherics/pipe/manifold4w/visible/black, /turf/simulated/floor/tiled/techmaint, @@ -17502,6 +17115,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals5, /turf/simulated/floor/tiled, /area/stellardelight/deck2/aftstarboard) +"LL" = ( +/obj/machinery/door/window/brigdoor/northleft{ + name = "Bar"; + req_access = list(25) + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "LM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/angled_bay/external/glass{ @@ -17535,6 +17161,24 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"LP" = ( +/obj/structure/table/woodentable, +/obj/machinery/light/floortube{ + dir = 1; + pixel_y = 6 + }, +/obj/machinery/camera/network/civilian, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3; + pixel_y = 4 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 2; + pixel_y = 7 + }, +/obj/item/weapon/material/ashtray/glass, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "LQ" = ( /obj/structure/cable/white{ icon_state = "4-8" @@ -17560,6 +17204,16 @@ /mob/living/simple_mob/animal/passive/chicken, /turf/simulated/floor/grass, /area/hydroponics) +"LT" = ( +/obj/machinery/disposal/wall{ + dir = 8 + }, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/firealarm/angled, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "LU" = ( /obj/machinery/atmospherics/pipe/simple/visible/universal{ name = "Distro Loop Drain" @@ -17768,6 +17422,10 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) +"Mp" = ( +/obj/machinery/computer/arcade/battle, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Mq" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -18094,6 +17752,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/stellardelight/deck2/port) +"MZ" = ( +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "Na" = ( /obj/machinery/atmospherics/pipe/simple/hidden/green, /obj/machinery/atmospherics/pipe/simple/hidden/red{ @@ -18178,6 +17840,13 @@ }, /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/quartermaster/storage) +"Nk" = ( +/obj/item/device/radio/intercom{ + dir = 1; + pixel_y = 24 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "Nl" = ( /obj/machinery/atmospherics/pipe/simple/visible/black{ dir = 4 @@ -19012,6 +18681,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/eris/dark/danger, /area/engineering/engine_room) +"Pe" = ( +/obj/structure/table/woodentable, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "Pf" = ( /obj/structure/sign/directions/evac{ dir = 4; @@ -19900,6 +19579,17 @@ /obj/structure/low_wall/bay/reinforced/steel, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/portaft) +"QZ" = ( +/obj/structure/window/reinforced{ + dir = 1; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Ra" = ( /obj/machinery/door/firedoor/glass, /obj/structure/window/bay/reinforced, @@ -20543,6 +20233,10 @@ }, /turf/simulated/wall/bay/r_wall/steel, /area/maintenance/stellardelight/deck2/portfore) +"SF" = ( +/obj/machinery/computer/arcade/clawmachine, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "SG" = ( /obj/structure/table/rack/steel, /obj/item/device/slime_scanner, @@ -20565,6 +20259,12 @@ }, /turf/simulated/floor/wood, /area/stellardelight/deck2/briefingroom) +"SI" = ( +/obj/item/weapon/stool/padded{ + dir = 8 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "SK" = ( /turf/simulated/wall/bay/r_wall/steel, /area/engineering/atmos/monitoring) @@ -21736,6 +21436,14 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/cmostore) +"Vr" = ( +/obj/structure/window/reinforced{ + dir = 4; + pixel_x = 4 + }, +/obj/structure/flora/pottedplant/decorative, +/turf/simulated/floor/glass/reinforced, +/area/stellardelight/deck2/fore) "Vt" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -22259,6 +21967,10 @@ /mob/living/simple_mob/animal/passive/cat/jones, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) +"WC" = ( +/obj/machinery/alarm/angled, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "WE" = ( /obj/machinery/firealarm/angled{ dir = 4 @@ -22383,6 +22095,11 @@ }, /turf/simulated/floor/tiled/eris/white/bluecorner, /area/medical/reception) +"WR" = ( +/obj/structure/table/wooden_reinforced, +/obj/random/paicard, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "WS" = ( /obj/machinery/atmospherics/pipe/simple/visible/red{ dir = 6 @@ -22806,6 +22523,13 @@ }, /turf/simulated/floor/tiled, /area/stellardelight/deck2/fore) +"XP" = ( +/obj/machinery/status_display{ + pixel_y = 32 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "XQ" = ( /obj/structure/cable{ icon_state = "2-4" @@ -22928,6 +22652,12 @@ }, /turf/simulated/floor, /area/maintenance/stellardelight/deck2/starboardfore) +"Yc" = ( +/obj/structure/musician/piano{ + dir = 4 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Yd" = ( /obj/item/device/suit_cooling_unit, /obj/item/device/suit_cooling_unit, @@ -22980,6 +22710,10 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/steel_ridged, /area/stellardelight/deck2/port) +"Yl" = ( +/obj/machinery/firealarm/angled, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "Ym" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23135,6 +22869,12 @@ /obj/effect/landmark/start/chef, /turf/simulated/floor/tiled/eris/cafe, /area/crew_quarters/kitchen) +"YD" = ( +/obj/structure/noticeboard{ + pixel_y = 32 + }, +/turf/simulated/floor/tiled/eris/steel/brown_platform, +/area/crew_quarters/bar) "YE" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/simple/visible/scrubbers{ @@ -23232,6 +22972,16 @@ }, /turf/simulated/floor/wood, /area/stellardelight/deck2/barbackroom) +"YN" = ( +/obj/item/weapon/stool/padded{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/camera/network/civilian{ + dir = 5 + }, +/turf/simulated/floor/tiled/eris/dark/cargo, +/area/crew_quarters/recreation_area) "YO" = ( /obj/structure/table/gamblingtable, /obj/machinery/recharger{ @@ -23663,6 +23413,17 @@ /obj/machinery/vending/engivend, /turf/simulated/floor/tiled/techfloor, /area/stellardelight/deck2/o2production) +"ZO" = ( +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 1 + }, +/obj/item/device/radio/intercom{ + pixel_y = -24 + }, +/obj/machinery/light/small, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "ZP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -23766,6 +23527,15 @@ }, /turf/simulated/floor/tiled/eris/steel/cargo, /area/quartermaster/storage) +"ZZ" = ( +/obj/structure/bed/chair/sofa/corp/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/recreation_area) (1,1,1) = {" Jh @@ -32485,7 +32255,7 @@ nt DN xP Wq -tr +Vr Wk Xi RT @@ -32603,26 +32373,26 @@ NL jx HQ HQ -iq +YD EV EV EV ZC FM -ju +EV Sx po td jF nt -mJ -oN -pi -pE +Ji +YN +De +QZ Ho aE -qc -qE +ia +WR nt Rq Rq @@ -32744,27 +32514,27 @@ bD dk dM ir -aY +pn QS QS QS BJ Fb TC -jH +DI Sx jr KH zz nt -mL +Mp dY -pm +cC iO mt Cy mt -qK +Yc nt Rq Rq @@ -32886,27 +32656,27 @@ Jh Jh Jh oJ -bO +Gn MK YU Nc Nc dU TC -jR +YU rV VG KH HO nt -mU +GL mt mt mt mt Cy mt -qR +SI nt nt nt @@ -33028,20 +32798,20 @@ Jh Jh Jh oJ -cC +wG MK YU Gn CY Gn TC -jR +YU rV lT KH Ct nt -nc +WC mt mt mt @@ -33049,10 +32819,10 @@ mt jv ct Lq -ro -rJ -rS -sc +ct +HE +xE +yG nt kr Mi @@ -33170,20 +32940,20 @@ Jh Jh Jh oJ -bO +Gn MK YU ic ls oF TC -kl +aY bx VG KH zz nt -ne +mt Bp oS oS @@ -33194,7 +32964,7 @@ mt mt DL Lb -sf +ix nt rH QX @@ -33312,23 +33082,23 @@ Jh Jh Wb HQ -fE +Nk YU YU YU qe YU TC -jR +YU Sx VG KH zz nt -nh +yc Dl UX -ps +UX UX hP mt @@ -33336,7 +33106,7 @@ mt mt DL Lb -ss +sc nt yF uE @@ -33454,7 +33224,7 @@ Jh Wb TU oJ -bO +Gn MK YU Nc @@ -33462,11 +33232,11 @@ Ux xD Pc fB -mc +iX UQ kS PK -mp +JR xA DS UX @@ -33478,7 +33248,7 @@ Ut Ut DL tb -st +rg nt dG wK @@ -33596,31 +33366,31 @@ Jh Jh Xc oJ -fL +LP zw Jl Gn CI iT TC -kp +ku Sx Je DW JL nt -nk +BS Dl YO BK -pW +Fw vS Ut -qS +IE Ut Xx NS -sH +mL nt HY GI @@ -33738,7 +33508,7 @@ Jh Wb TU oJ -bO +Gn MK oB wq @@ -33746,14 +33516,14 @@ wq WI LR by -mn +FJ OW pG co -my +BD ud Ep -pn +UX Bp UX ts @@ -33762,7 +33532,7 @@ Ut Ut DL hD -sL +wf nt pa rj @@ -33880,23 +33650,23 @@ Jh Jh Wb HQ -ia +bO YU lU as as Rr AY -jR +YU Sx Ls KH zz nt -nh +yc Dl -ps -ps +UX +UX UX hP mt @@ -33904,7 +33674,7 @@ mt mt DL Lb -ss +sc nt yF uE @@ -34022,20 +33792,20 @@ Jh Jh Jh oJ -bO +Gn MK fi VC XU sr Xq -ku +qS Sx EE KH zz nt -nl +fE Bp io io @@ -34046,7 +33816,7 @@ mt mt DL Lb -sf +ix nt Yy Hy @@ -34164,20 +33934,20 @@ Jh Jh Jh oJ -cC +wG MK fi dw On rd AN -kw +sL rV lT KH Ct nt -nn +Yl mt mt mt @@ -34185,10 +33955,10 @@ mt hm VM uJ -rA -rL -rU -tq +VM +BC +lG +ZZ nt ys IK @@ -34306,27 +34076,27 @@ Jh Jh Jh oJ -bO +Gn zw fi dw BV py fp -kU +mn rV VG KH HO nt -nQ +XP mt mt mt mt lO mt -qU +mt nt nt nt @@ -34448,27 +34218,27 @@ bD dk Di HQ -ij +LT as uX dw On hY fp -lb +MZ Sx Xl KH zz nt -nY +SF Fy -pm +cC iO mt lO id -rf +sH nt Rq Rq @@ -34591,26 +34361,26 @@ NL jx HQ HQ -ix +pW sP dw On py fp -lp +Dj Sx po AI jF nt -or -oW -pt -pF +fL +mU +DO +kp GA fK -qB -rg +ij +sH nt Rq Rq @@ -34733,13 +34503,13 @@ NL tj dk PR -iM +Pe bp dw On py fp -lE +ZO Sx VY KH @@ -34757,7 +34527,7 @@ nt dv Im Gb -tx +kl Wk IK RT @@ -34875,13 +34645,13 @@ Wb jx NL oJ -iX +mJ sP dw On wV aK -lG +nQ Sx aC KH @@ -35018,12 +34788,12 @@ nP Wb HQ HQ -jb -je -jh +vg +Ax +LL GX -jl -lH +uZ +Hi Sx iy mV diff --git a/vorestation.dme b/vorestation.dme index 30446eec84b..80ffdf3f20f 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4288,6 +4288,7 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" +#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\admin_use_vr\event_autonomous_drone.dm" @@ -4298,6 +4299,5 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" -#include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE From d3941fb82e7cbb93964b4b7318ad6720dc950fa3 Mon Sep 17 00:00:00 2001 From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com> Date: Sun, 14 Jan 2024 07:20:08 +1000 Subject: [PATCH 2/2] Update vorestation.dme --- vorestation.dme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vorestation.dme b/vorestation.dme index 80ffdf3f20f..30446eec84b 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4288,7 +4288,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellar_delight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\admin_use_vr\event_autonomous_drone.dm" @@ -4299,5 +4298,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE