From f57f4b68d4295d2d1b9a3528b924077f25fd798d Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Thu, 13 Jul 2023 19:27:50 -0400 Subject: [PATCH 01/11] Rough pass, finer details coming --- _maps/map_files/Oshan/oshan.dmm | 1276 ++++++++++++++++++------------- 1 file changed, 741 insertions(+), 535 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 9b778d958d8a..b5f69c0105dd 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -32,6 +32,8 @@ /area/station/cargo/warehouse) "abR" = ( /obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/window, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "acc" = ( @@ -158,9 +160,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "agv" = ( -/obj/machinery/light/directional/south, -/obj/machinery/light_switch/directional/west, -/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/vending/dinnerware, +/obj/machinery/light/directional/west, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "agA" = ( @@ -361,7 +362,12 @@ /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) "apm" = ( -/turf/open/floor/stone, +/obj/machinery/duct/industrial/waste, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "apr" = ( /obj/effect/turf_decal/tile/yellow{ @@ -410,6 +416,18 @@ }, /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) +"asG" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/structure/table/wood, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "asM" = ( /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, @@ -597,6 +615,9 @@ }, /turf/open/floor/iron, /area/station/security/brig) +"aAA" = ( +/turf/open/floor/wood, +/area/station/commons/lounge) "aAJ" = ( /obj/machinery/duct/industrial/waste, /obj/structure/disposalpipe/segment{ @@ -934,7 +955,7 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "aTR" = ( -/obj/structure/table, +/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "aTV" = ( @@ -1022,7 +1043,10 @@ /area/station/science/genetics) "aVK" = ( /obj/structure/cable, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "aVT" = ( /obj/machinery/light/directional/south, @@ -1585,11 +1609,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "bvn" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/wood/glass, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, -/turf/open/floor/iron/kitchen, -/area/station/service/bar) +/obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) "bvx" = ( /obj/effect/decal/cleanable/dirt, /obj/item/mmi, @@ -1767,11 +1789,12 @@ /turf/open/floor/iron, /area/station/cargo/warehouse) "bFn" = ( -/obj/effect/landmark/start/bartender, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/disposalpipe/segment{ + dir = 4; + invisibility = 101 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "bFq" = ( /obj/machinery/door/morgue{ name = "Confession Booth (Chaplain)"; @@ -2259,15 +2282,21 @@ /turf/open/floor/iron/dark, /area/station/service/chapel/office) "ceP" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/service/kitchen/kitchen_backroom) +/obj/machinery/firealarm/directional/north, +/obj/machinery/oven, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ceV" = ( -/obj/structure/cable, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "cfb" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -2441,6 +2470,14 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/science/lab) +"clx" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "clC" = ( /obj/machinery/light/directional/north, /turf/open/floor/wood, @@ -2454,12 +2491,12 @@ /turf/open/floor/iron/white, /area/station/science/robotics/mechbay) "cmi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/table, -/obj/item/reagent_containers/condiment/enzyme{ - layer = 5 - }, -/obj/item/reagent_containers/cup/beaker{ - pixel_x = 5 +/obj/machinery/microwave{ + pixel_y = 3 }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -2750,12 +2787,10 @@ /turf/open/floor/iron/dark, /area/station/science/server) "cCd" = ( -/obj/machinery/door/airlock{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/turf/open/floor/stone, -/area/station/service/kitchen) +/obj/structure/table/wood, +/obj/machinery/light_switch/directional/east, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "cCg" = ( /obj/effect/turf_decal/tile/green{ dir = 1 @@ -2766,9 +2801,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "cCo" = ( -/obj/structure/table, -/turf/open/floor/wood, -/area/station/service/barber) +/obj/item/chair/wood, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "cCM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2849,7 +2884,7 @@ "cEY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "cFb" = ( /obj/structure/cable, @@ -2989,9 +3024,7 @@ }, /area/station/cargo/miningoffice) "cLP" = ( -/obj/item/holosign_creator/robot_seat/bar, -/obj/structure/table/wood, -/obj/machinery/light_switch/directional/south, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "cNS" = ( @@ -3467,6 +3500,13 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/wood, /area/station/security/detectives_office) +"djR" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/holopad, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "djZ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -3652,6 +3692,7 @@ /obj/machinery/chem_dispenser/drinks/beer{ dir = 2 }, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "dqB" = ( @@ -3692,10 +3733,9 @@ }, /area/station/service/chapel) "drW" = ( -/obj/machinery/power/apc/worn_out/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/kitchen, -/area/station/service/barber) +/obj/machinery/requests_console/directional/north, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "dsp" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/shutters/preopen{ @@ -3773,9 +3813,9 @@ /turf/open/floor/plating, /area/station/medical/surgery/theatre) "dvZ" = ( -/obj/item/chair/wood, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/wood, -/area/station/service/barber) +/area/station/commons/lounge) "dwb" = ( /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron/dark, @@ -3857,9 +3897,9 @@ /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) "dAR" = ( -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron, -/area/station/commons/lounge) +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "dAY" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/iron, @@ -3993,7 +4033,10 @@ /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "dHX" = ( -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/table, +/obj/machinery/microwave{ + pixel_y = 1 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "dIo" = ( @@ -4594,8 +4637,10 @@ /turf/open/floor/iron, /area/station/engineering/main) "enZ" = ( -/turf/open/floor/wood, -/area/station/service/barber) +/obj/structure/reagent_dispensers/beerkeg, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "eoD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/light/directional/east, @@ -4913,7 +4958,6 @@ /area/station/cargo/miningoffice) "eBR" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "eCk" = ( @@ -5689,9 +5733,9 @@ /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) "fpz" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/service/barber) +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "fpZ" = ( /obj/effect/spawner/random/entertainment/arcade{ dir = 1 @@ -5900,14 +5944,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"fyj" = ( -/obj/structure/cable, -/obj/structure/table, -/obj/machinery/microwave, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "fyB" = ( /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /obj/effect/turf_decal/siding/purple, @@ -6446,18 +6482,11 @@ }, /area/station/cargo/miningoffice) "gbP" = ( -/obj/machinery/light/directional/east, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, /obj/effect/turf_decal/siding/white{ dir = 8 }, -/turf/open/floor/iron, -/area/station/service/bar/backroom) +/turf/closed/wall, +/area/station/service/kitchen) "gdm" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -6497,9 +6526,14 @@ /turf/open/floor/wood/parquet, /area/station/medical/medbay/central) "ggc" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/service/bar) +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/lounge) "ggD" = ( /obj/machinery/door/airlock/research{ name = "Ordnance Lab" @@ -6522,7 +6556,10 @@ "ghf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "ghj" = ( /obj/effect/turf_decal/stripes{ @@ -6549,9 +6586,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/stairs{ - dir = 4 - }, +/turf/open/floor/wood, /area/station/commons/lounge) "gir" = ( /obj/structure/table/wood, @@ -6599,6 +6634,7 @@ /area/station/cargo/miningoffice) "gmz" = ( /obj/effect/landmark/start/bartender, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "gmC" = ( @@ -6875,7 +6911,7 @@ "gyq" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "gyA" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ @@ -7062,6 +7098,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) +"gEM" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "gFG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7169,9 +7209,7 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/aft) "gJY" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/effect/landmark/start/cook, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gKd" = ( @@ -7245,16 +7283,16 @@ /area/station/command/heads_quarters/cmo) "gOG" = ( /obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "gOH" = ( -/obj/machinery/door/airlock{ - name = "Kitchen" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/stone, +/turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gPj" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -7294,6 +7332,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gQq" = ( @@ -7938,11 +7977,12 @@ /turf/open/floor/engine, /area/station/cargo/miningoffice) "hts" = ( -/obj/machinery/oven, -/obj/machinery/light/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/biogenerator, +/turf/open/floor/iron, +/area/station/service/hydroponics) "htI" = ( /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, @@ -8033,7 +8073,7 @@ "hxL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "hyj" = ( /obj/structure/table, @@ -8145,6 +8185,7 @@ /area/station/command/heads_quarters/hos) "hGY" = ( /obj/machinery/camera/autoname/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "hIg" = ( @@ -8193,12 +8234,10 @@ /turf/open/floor/iron/white, /area/station/medical/pharmacy) "hKd" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, +/obj/effect/spawner/structure/window/reinforced/plasma, /obj/structure/cable, -/turf/open/floor/iron/kitchen, -/area/station/service/barber) +/turf/open/floor/plating, +/area/station/maintenance/port/central) "hLd" = ( /turf/open/floor/iron, /area/station/commons/storage/emergency/port) @@ -8312,8 +8351,10 @@ /area/station/cargo/miningoffice) "hPN" = ( /obj/structure/table/wood/fancy/black, -/turf/open/floor/stone, -/area/station/commons/lounge) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "hPQ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood{ @@ -8395,10 +8436,8 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "hWe" = ( -/obj/machinery/chem_master/condimaster{ - desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; - name = "HoochMaster Deluxe" - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "hXe" = ( @@ -8488,12 +8527,12 @@ /turf/open/floor/engine, /area/station/engineering/atmos/office) "ibt" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "ica" = ( @@ -8622,9 +8661,11 @@ /turf/open/floor/iron/white, /area/station/science/robotics/lab) "ihX" = ( -/obj/structure/cable, -/turf/open/floor/iron/kitchen, -/area/station/service/barber) +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "iir" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners, /obj/structure/cable, @@ -8761,8 +8802,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "inb" = ( -/turf/open/ballpit, -/area/station/service/barber) +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "inf" = ( /obj/machinery/disposal/delivery_chute, /obj/structure/disposalpipe/trunk, @@ -9398,13 +9443,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"iVD" = ( -/obj/structure/table/wood/fancy/black, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) "iVJ" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, @@ -9461,8 +9499,13 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) "iXT" = ( -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/table/wood, +/obj/machinery/chem_master/condimaster{ + desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; + name = "HoochMaster Deluxe" }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) @@ -9980,6 +10023,7 @@ /area/station/medical/medbay/central) "juw" = ( /obj/machinery/smartfridge, +/obj/machinery/door/firedoor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "jvc" = ( @@ -10008,9 +10052,17 @@ /turf/open/floor/plating, /area/station/engineering/main) "jvK" = ( -/obj/machinery/restaurant_portal/restaurant, -/turf/open/floor/stone, -/area/station/commons/lounge) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table/wood, +/obj/machinery/reagentgrinder{ + pixel_y = 6; + pixel_x = -2 + }, +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "jvW" = ( /obj/effect/turf_decal/tile/dark_red/anticorner/contrasted{ dir = 8 @@ -10258,7 +10310,7 @@ /area/station/hallway/primary/central) "jGs" = ( /obj/machinery/vending/coffee, -/turf/open/floor/stone, +/turf/open/floor/wood, /area/station/commons/lounge) "jGv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -10518,11 +10570,10 @@ /turf/open/floor/iron, /area/station/science/xenobiology) "jSP" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/wood, +/area/station/commons/lounge) "jUd" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 1 @@ -10973,8 +11024,10 @@ /turf/closed/wall/r_wall, /area/station/commons/storage/emergency/port) "kpG" = ( -/obj/machinery/food_cart, /obj/machinery/light/dim/directional/north, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "kpN" = ( @@ -11167,10 +11220,10 @@ /turf/open/floor/iron, /area/station/service/hydroponics) "kyN" = ( -/turf/open/floor/iron/stairs{ - dir = 4 - }, -/area/station/commons/lounge) +/obj/machinery/firealarm/directional/south, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "kzi" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -11262,9 +11315,7 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "kDY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "kEj" = ( @@ -11456,7 +11507,8 @@ /area/station/maintenance/starboard/aft) "kLZ" = ( /obj/structure/table, -/obj/item/storage/bag/tray, +/obj/item/kitchen/rollingpin, +/obj/item/plate, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "kMl" = ( @@ -11858,6 +11910,12 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/mine/storage/public) +"lgw" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "lgG" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -11877,7 +11935,11 @@ /area/station/service/cafeteria) "lgY" = ( /obj/structure/table, -/obj/item/kitchen/rollingpin, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/obj/item/food/pie/cream, +/obj/effect/spawner/random/food_or_drink/cake_ingredients, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "lgZ" = ( @@ -11938,7 +12000,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "lll" = ( -/obj/machinery/deepfryer, +/obj/machinery/processor{ + pixel_y = 4 + }, +/obj/structure/table, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "llK" = ( @@ -11998,21 +12063,10 @@ /turf/open/floor/iron/dark, /area/station/medical/surgery/theatre) "loJ" = ( -/obj/structure/disposaloutlet{ - dir = 1; - name = "Cargo Deliveries" - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/warning{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/service/bar/backroom) +/obj/machinery/airalarm/directional/north, +/obj/structure/closet/secure_closet/freezer/fridge, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "loR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, @@ -12154,6 +12208,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"lxt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/lounge) "lxK" = ( /obj/effect/turf_decal/stripes{ dir = 8 @@ -12180,13 +12239,6 @@ /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) -"lyn" = ( -/obj/structure/table, -/obj/machinery/processor{ - pixel_y = 12 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "lyz" = ( /obj/structure/disposalpipe/trunk{ dir = 8 @@ -12288,9 +12340,9 @@ /turf/open/floor/iron, /area/station/engineering/main) "lEQ" = ( -/obj/structure/bookcase, -/turf/open/floor/wood, -/area/station/service/barber) +/obj/structure/sign/poster/official/safety_eye_protection, +/turf/closed/wall, +/area/station/service/bar) "lFv" = ( /obj/structure/table, /obj/item/seeds/ambrosia/gaia, @@ -12326,7 +12378,7 @@ /area/station/service/theater) "lIE" = ( /obj/effect/spawner/random/entertainment/arcade, -/turf/open/floor/stone, +/turf/open/floor/wood, /area/station/commons/lounge) "lIL" = ( /obj/effect/spawner/structure/window/reinforced/plasma, @@ -12381,7 +12433,10 @@ /turf/open/floor/engine, /area/station/hallway/secondary/exit/departure_lounge) "lLr" = ( -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "lLE" = ( /obj/structure/sink/directional/east, @@ -12574,7 +12629,7 @@ /obj/structure/chair/wood{ dir = 4 }, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "lTG" = ( /obj/machinery/duct/industrial/waste, @@ -12673,6 +12728,11 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron, /area/station/cargo/miningoffice) +"lYO" = ( +/obj/machinery/deepfryer, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "lYV" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, @@ -12705,8 +12765,13 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/firedoor, /turf/open/floor/stone, -/area/station/commons/lounge) +/area/station/service/kitchen) "mca" = ( /turf/open/floor/engine, /area/station/commons/storage/emergency/port) @@ -13333,8 +13398,9 @@ /turf/open/floor/plating, /area/station/cargo/miningoffice) "mIT" = ( -/turf/open/floor/iron/kitchen, -/area/station/service/barber) +/obj/machinery/holopad, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "mJe" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, @@ -13415,8 +13481,9 @@ /turf/open/floor/engine, /area/station/engineering/main) "mMk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/wood, /area/station/commons/lounge) "mMt" = ( /obj/structure/cable, @@ -13591,9 +13658,17 @@ /turf/open/floor/iron, /area/station/cargo/storage) "mVg" = ( -/obj/structure/table_frame, -/turf/open/floor/wood, -/area/station/service/barber) +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 7; + pixel_y = 4 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "mVu" = ( /obj/effect/landmark/start/clown, /turf/open/floor/eighties/red{ @@ -13672,7 +13747,15 @@ /area/station/service/lawoffice) "nao" = ( /obj/machinery/light/directional/north, -/turf/open/floor/iron, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/wood, /area/station/commons/lounge) "naN" = ( /obj/structure/lattice, @@ -13692,7 +13775,9 @@ /turf/open/floor/wood, /area/station/command/heads_quarters/hop) "nbs" = ( -/obj/machinery/vending/dinnerware, +/obj/machinery/vending/wardrobe/chef_wardrobe, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "nbX" = ( @@ -13835,7 +13920,13 @@ /turf/open/floor/iron/dark, /area/station/science/lab) "nii" = ( -/obj/machinery/oven, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "nij" = ( @@ -13989,6 +14080,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) +"nqw" = ( +/obj/structure/sink{ + pixel_y = 11 + }, +/obj/structure/mirror/directional/north, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "nqR" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -14269,9 +14367,9 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "nEc" = ( -/obj/effect/landmark/start/psychologist, -/turf/open/floor/iron, -/area/station/commons/lounge) +/obj/machinery/vending/wardrobe/bar_wardrobe, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "nFf" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -14651,10 +14749,12 @@ /turf/open/floor/iron, /area/station/hallway/primary/aft) "nTf" = ( -/obj/structure/disposalpipe/trunk, -/obj/machinery/disposal/bin{ - name = "Jim Norton's Quebecois Coffee disposal unit" +/obj/machinery/firealarm/directional/south, +/obj/structure/table, +/obj/item/reagent_containers/condiment/flour{ + pixel_y = 4 }, +/obj/item/reagent_containers/condiment/flour, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "nTi" = ( @@ -14767,8 +14867,9 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "nZE" = ( -/turf/closed/wall, -/area/station/service/barber) +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "nZL" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/delivery, @@ -14919,8 +15020,8 @@ }, /area/station/medical/treatment_center) "ogb" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/iron, +/obj/structure/cable, +/turf/open/floor/wood, /area/station/commons/lounge) "ogd" = ( /turf/closed/wall/r_wall, @@ -14938,16 +15039,8 @@ /area/station/engineering/atmos) "ohh" = ( /obj/machinery/light/directional/south, -/obj/machinery/camera/autoname/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/disposal/bin{ - name = "Jim Norton's Quebecois Coffee disposal unit" - }, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/turf/open/floor/wood, +/area/station/commons/lounge) "ohs" = ( /obj/structure/cable/industrial, /obj/effect/spawner/structure/window/reinforced/plasma, @@ -15278,6 +15371,7 @@ name = "Kitchen" }, /obj/effect/mapping_helpers/airlock/access/all/service/general, +/obj/machinery/door/firedoor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "oyT" = ( @@ -15454,6 +15548,16 @@ /obj/structure/disposalpipe/junction/yjunction{ dir = 1 }, +/obj/structure/table, +/obj/item/reagent_containers/condiment/enzyme{ + layer = 5; + pixel_x = -8; + pixel_y = 3 + }, +/obj/item/reagent_containers/cup/beaker/large{ + pixel_x = 5; + pixel_y = 2 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "oHr" = ( @@ -15598,7 +15702,7 @@ /area/station/science/robotics/lab) "oPI" = ( /obj/machinery/duct/industrial/waste, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "oQe" = ( /obj/machinery/meter, @@ -15947,6 +16051,16 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/central) +"pir" = ( +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "piw" = ( /obj/machinery/door/airlock{ id_tag = "Cabin5"; @@ -16029,6 +16143,10 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/engine, /area/station/engineering/atmos/office) +"pnU" = ( +/obj/structure/closet/cabinet, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "pnW" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) @@ -16113,14 +16231,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/central) -"psS" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Central Access" - }, -/obj/structure/barricade/wooden/crude, -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/service/barber) "ptd" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -16234,8 +16344,12 @@ /turf/closed/wall, /area/ruin/space/ks13/engineering/secure_storage) "pDh" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/landmark/start/cook, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/table, +/obj/item/storage/bag/tray, +/obj/item/knife, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "pDq" = ( @@ -16288,10 +16402,9 @@ /turf/open/floor/wood, /area/station/ai_monitored/turret_protected/ai_upload) "pFY" = ( -/obj/machinery/requests_console/directional/south{ - department = "Kitchen"; - name = "Kitchen Requests Console"; - supplies_requestable = 1 +/obj/structure/disposalpipe/segment, +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -16569,12 +16682,14 @@ /turf/open/floor/wood, /area/station/science/robotics) "pRl" = ( -/obj/machinery/restaurant_portal/bar, -/obj/machinery/camera/motion/directional/east{ - c_tag = "E.V.A. Storage" +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/stone, -/area/station/commons/lounge) +/obj/structure/table/wood/fancy/black, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "pRH" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -16605,12 +16720,9 @@ /turf/open/floor/plating, /area/station/maintenance/starboard/fore) "pVh" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/cable, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "pVF" = ( @@ -16690,10 +16802,7 @@ /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) "pZb" = ( -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, -/obj/machinery/light/directional/south, +/obj/machinery/deepfryer, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "pZg" = ( @@ -16729,7 +16838,6 @@ name = "Pete" }, /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "qaa" = ( @@ -16802,9 +16910,7 @@ /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/auxiliary) "qeO" = ( -/obj/machinery/camera/motion/directional/east{ - c_tag = "E.V.A. Storage" - }, +/obj/structure/extinguisher_cabinet/directional/east, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "qfa" = ( @@ -17403,10 +17509,9 @@ }, /area/station/security/checkpoint/customs) "qIp" = ( -/obj/structure/cable, /obj/machinery/light_switch/directional/south, -/turf/open/floor/wood, -/area/station/service/barber) +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "qIz" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -17813,7 +17918,7 @@ /area/station/service/cafeteria) "rdz" = ( /obj/machinery/airalarm/directional/north, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "rdF" = ( /obj/machinery/door/airlock/public/glass{ @@ -17834,6 +17939,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/central) +"rfa" = ( +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "rfd" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners, /obj/machinery/light/directional/south, @@ -17908,7 +18017,7 @@ /area/station/science/ordnance/storage) "riW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "rja" = ( /obj/structure/table/wood/fancy/blue, @@ -17948,8 +18057,21 @@ /turf/open/floor/carpet/green, /area/station/command/heads_quarters/hop) "rkZ" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /obj/structure/table, -/obj/item/book/manual/wiki/cooking_to_serve_man, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 5; + pixel_x = 10 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 10; + pixel_y = -2 + }, +/obj/item/book/manual/wiki/cooking_to_serve_man{ + pixel_x = -3 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "rlq" = ( @@ -18126,7 +18248,7 @@ dir = 4 }, /obj/effect/landmark/start/assistant, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "rtQ" = ( /obj/machinery/door/airlock/security{ @@ -18210,7 +18332,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "rwi" = ( /obj/machinery/meter, @@ -18317,6 +18439,7 @@ /area/station/service/janitor) "rAy" = ( /obj/machinery/light/dim/directional/south, +/obj/machinery/grill, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "rAT" = ( @@ -18451,10 +18574,13 @@ /turf/open/floor/iron, /area/station/security/checkpoint/science) "rHQ" = ( -/obj/machinery/camera/autoname/directional/west, -/obj/structure/disposalpipe/segment{ - dir = 5 +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" }, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "rIb" = ( @@ -18654,7 +18780,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "rSO" = ( /obj/machinery/camera/autoname/directional/west, @@ -18959,6 +19085,10 @@ /obj/item/modular_computer/laptop/preset/civilian, /turf/open/floor/wood, /area/station/service/cafeteria) +"shy" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "shE" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 @@ -18991,6 +19121,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/office) +"siR" = ( +/obj/effect/landmark/start/bartender, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "sjq" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -19034,15 +19170,13 @@ /turf/open/floor/iron/dark, /area/station/engineering/atmos) "skI" = ( -/obj/structure/table, -/obj/machinery/reagentgrinder{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/food/pie/cream, /obj/machinery/camera/motion/directional/east{ c_tag = "E.V.A. Storage" }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "slx" = ( @@ -19302,8 +19436,12 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/vending/wardrobe/chef_wardrobe, /obj/structure/disposalpipe/segment, +/obj/structure/table, +/obj/machinery/reagentgrinder{ + pixel_y = 6; + pixel_x = -2 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "szK" = ( @@ -19639,7 +19777,7 @@ /area/station/medical/coldroom) "sSh" = ( /obj/effect/spawner/random/vending/colavend, -/turf/open/floor/stone, +/turf/open/floor/wood, /area/station/commons/lounge) "sSx" = ( /obj/structure/table/reinforced, @@ -19669,6 +19807,12 @@ /obj/structure/table/wood, /turf/open/floor/carpet/lone/star, /area/station/security/courtroom) +"sTo" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/requests_console/directional/north, +/obj/machinery/camera/motion/directional/north, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "sUz" = ( /obj/machinery/suit_storage_unit/rd, /turf/open/floor/carpet/neon/simple/purple/nodots, @@ -20223,7 +20367,11 @@ /area/station/security/office) "tBk" = ( /obj/machinery/plumbing/floor_pump/input/on/waste/directional/west, -/turf/open/floor/iron, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "tBs" = ( /obj/machinery/door/airlock/public/glass{ @@ -20272,13 +20420,29 @@ /area/station/maintenance/port/central) "tDO" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 9 }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) +"tDU" = ( +/obj/machinery/food_cart, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) +"tDW" = ( +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) -"tDW" = ( -/turf/open/floor/iron/dark, -/area/station/service/barber) "tEL" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -20304,10 +20468,19 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/service/kitchen/kitchen_backroom) "tFZ" = ( -/obj/machinery/light/directional/east, +/obj/structure/table, +/obj/machinery/light/directional/south, +/obj/item/food/meat/slab/monkey{ + pixel_x = -3 + }, +/obj/item/food/meat/slab/monkey, +/obj/item/food/meat/slab/monkey{ + pixel_x = 2 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "tGd" = ( @@ -20646,9 +20819,8 @@ /turf/open/floor/engine, /area/station/commons/storage/emergency/starboard) "tUD" = ( -/obj/machinery/biogenerator, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/kitchen, +/turf/closed/wall, /area/station/service/kitchen) "tUG" = ( /obj/machinery/light/no_nightlight/directional/west, @@ -21183,6 +21355,19 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) +"uxE" = ( +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "uxK" = ( /turf/closed/wall/r_wall, /area/station/commons/fitness/recreation/entertainment) @@ -21253,12 +21438,13 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) "uBe" = ( -/obj/machinery/door/airlock/wood/glass, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/kitchen, +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" + }, +/turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "uBI" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -21301,10 +21487,10 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "uEy" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/wood, /area/station/commons/lounge) "uEF" = ( /turf/open/floor/iron/dark, @@ -21359,7 +21545,7 @@ /obj/machinery/camera/motion/directional/east{ c_tag = "E.V.A. Storage" }, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "uGB" = ( /obj/machinery/door/airlock/public/glass{ @@ -21421,7 +21607,8 @@ /turf/open/floor/iron/white, /area/station/science/lab) "uJu" = ( -/turf/open/floor/iron/dark, +/obj/structure/sign/poster/official/cleanliness, +/turf/closed/wall, /area/station/service/kitchen) "uJx" = ( /obj/item/lipstick/black, @@ -21438,9 +21625,12 @@ /turf/open/floor/iron/grimy, /area/station/service/theater/abandoned) "uKv" = ( -/obj/structure/cable, -/turf/open/floor/wood, -/area/station/service/barber) +/obj/structure/table/wood, +/obj/item/holosign_creator/robot_seat/bar, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/storage/box/drinkingglasses, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "uKC" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -21758,9 +21948,11 @@ /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) "vbr" = ( -/obj/effect/spawner/structure/window/reinforced/plasma, -/turf/open/floor/plating, -/area/station/commons/lounge) +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "vbs" = ( /obj/structure/cable, /obj/machinery/plumbing/floor_pump/input/on/waste/directional/north, @@ -22245,6 +22437,10 @@ "vzu" = ( /turf/open/floor/iron/stairs, /area/station/hallway/primary/aft) +"vzG" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/commons/lounge) "vzP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22636,10 +22832,11 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vTZ" = ( -/obj/structure/cable, -/obj/structure/sink/kitchen/directional/west, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/directional/east, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/structure/table, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "vUg" = ( @@ -22823,16 +23020,11 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"wcN" = ( -/obj/structure/table, -/obj/effect/spawner/random/food_or_drink/cake_ingredients, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "wdb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "wdc" = ( /obj/structure/cable, @@ -23069,8 +23261,10 @@ /area/station/commons/vacant_room/commissary) "wmc" = ( /obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/iron/kitchen, -/area/station/service/barber) +/area/station/service/bar) "wmh" = ( /obj/structure/chair/office{ dir = 4 @@ -24504,16 +24698,20 @@ /turf/open/floor/engine, /area/station/engineering/main) "xJM" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, /obj/effect/turf_decal/trimline/brown/warning{ dir = 8 }, /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/disposaloutlet{ + dir = 1; + name = "Cargo Deliveries" + }, +/obj/effect/turf_decal/stripes/box, /turf/open/floor/iron, /area/station/service/bar/backroom) "xJW" = ( @@ -24563,7 +24761,7 @@ /area/station/science/xenobiology) "xLZ" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "xMc" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ @@ -24596,6 +24794,10 @@ /obj/structure/cable/industrial, /turf/open/floor/iron, /area/station/engineering/main) +"xNi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/wood, +/area/station/commons/lounge) "xOE" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/cable, @@ -24644,7 +24846,7 @@ /area/station/service/library) "xRh" = ( /obj/machinery/vending/cigarette, -/turf/open/floor/stone, +/turf/open/floor/wood, /area/station/commons/lounge) "xRl" = ( /obj/machinery/light/very_dim/directional/south, @@ -24677,7 +24879,7 @@ "xSI" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, +/turf/open/floor/wood, /area/station/commons/lounge) "xSR" = ( /obj/machinery/light/directional/north, @@ -24873,6 +25075,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/security/detectives_office) +"ycI" = ( +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "ydk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/directional/west, @@ -25026,7 +25232,7 @@ /turf/open/floor/iron, /area/station/security/office) "ykH" = ( -/obj/machinery/airalarm/directional/north, +/obj/machinery/airalarm/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet/locker) "ykK" = ( @@ -37849,7 +38055,7 @@ iLp jwh hGY eBR -ceP +wvr cQf mIB ieT @@ -38611,18 +38817,18 @@ gTM lfb bAX toS -toS -toS oyG pqp +pqp +aTR kam -nTf -rHQ cvu -pqp +rHQ +tDU +dHX agv +nbs oyT -uJu fYK cbc qNu @@ -38870,16 +39076,16 @@ iKG xJM gbP loJ -oyT -nii +pqp +pqp kam -kDY +pqp jsA +pqp +pqp +pqp +fbw eYH -dHX -pFY -oyT -uJu fYK vRp pzs @@ -39125,18 +39331,18 @@ vrw vrw dyl vrw -oyT -oyT -oyT -hts +uJu +eYH +pqp +pqp kam pqp jsA -wcN -nBu -pDh -oyT -uJu +pqp +pqp +pqp +fbw +eYH fYK rvH pzs @@ -39383,17 +39589,17 @@ rXf dYl aRH oyT -lyn -lyn -aTR -kam -pqp -jsA +lYO +rFz +gJY +cmi +rkZ +pDh kLZ nBu -gJY -oyT -oyT +pqp +fbw +pZb fYK fbb yjV @@ -39642,15 +39848,15 @@ utm abR sKC pqp -rFz +pqp kam pqp -jsA -cmi -nBu -mYT +djR +sKC pqp -pZb +pqp +fbw +lll fYK ykH yjV @@ -39897,17 +40103,17 @@ hyj mMt aTZ tUD -cFC +sTo cFC cFC sze -cFC +pFY oFK lgY -rkZ -fbw +nBu pqp -nbs +mYT +tFZ fYK fYK tZm @@ -40157,14 +40363,14 @@ juw pqp pqp pqp -fyj -pqp +kam +pVh ibt -pqp -pqp +pVh +pVh +kam fbw -pqp -lll +nTf pug tbp vtb @@ -40411,14 +40617,14 @@ mnX dYl utm oyT -wRB +ceP sKC -tFZ -kam -kam -pVh -kam -vTZ +pqp +pqp +pqp +jsA +pqp +pqp kam kDY skI @@ -40666,18 +40872,18 @@ bbo nuk aVe upw -nuk +hts oyT wRB qeO -lzc -ggc -bvn -uBe -ggc -lzc +vTZ +pqp +pqp +jsA +pqp +pqp gOH -cCd +rfa oyT pug cfI @@ -40927,14 +41133,14 @@ pQl oyT oyT oyT -lzc -iXT +oyT +uxE ceV tDO -cLP -lzc +nii +oyT lZP -apm +oyT pug jFi kUp @@ -41183,15 +41389,15 @@ xvl ddU wRT xRh -apm -lzc +aAA +dvZ bFn -ceV -jSP -ohh -lzc -lZP -apm +aAA +aAA +aAA +aAA +ghX +aAA pug qGs lqa @@ -41440,15 +41646,15 @@ osu uRy wRT sSh -apm -xIK -ojS -hWe -rgY -ojS -xIK -lZP -apm +aAA +uEy +lgw +aAA +aAA +aAA +aAA +ghX +aAA kmY exP jDu @@ -41697,15 +41903,15 @@ xvl eZW wRT jGs -apm -xIK -ojS -cbq -dqA -ojS -xIK -lZP -apm +aAA +lLr +aAA +aAA +aAA +aAA +aAA +ghX +aAA kmY exP lqa @@ -41954,15 +42160,15 @@ upw koV wRT lIE -apm -xIK -ojS -ojS -ojS -gmz -xIK -lZP -apm +aAA +lLr +aAA +aAA +aAA +aAA +aAA +ghX +aAA kmY exP lqa @@ -42210,16 +42416,16 @@ knL sJo ykL wRT -kyN -kyN -xIK -iVD -gmz -ojS -iVD -xIK +fpz +aAA +lLr +aAA +aAA +aAA +aAA +aAA ghX -kyN +aAA kmY ncg hdv @@ -42467,15 +42673,15 @@ bow kxW foP wRT -nao -lLr +gEM +aAA lLr -xIK -xIK -xIK -xIK -lLr -uEy +aAA +aAA +aAA +aAA +aAA +ghX uGk pug nxs @@ -42727,11 +42933,11 @@ wRT wRT rdz lLr -lLr -nEc -dAR -lLr -lLr +aAA +aAA +aAA +aAA +aAA rvS wRT pug @@ -42982,13 +43188,13 @@ nyD cCg qbR pAj +jSP ghf -ghf -ghf -ghf -ghf -ghf -ghf +jSP +jSP +jSP +jSP +jSP rRS eco eyu @@ -43239,14 +43445,14 @@ wDZ jgV pHV qEO +ogb aVK -aVK -aVK +ogb hxL cEY -aVK -aVK -aVK +ogb +ogb +ogb qEO mkz mkz @@ -43497,7 +43703,7 @@ lca nDl wmV oPI -oPI +apm oPI xSI gyq @@ -43507,7 +43713,7 @@ oPI wmV haA haA -vIx +haA haA haA haA @@ -43753,18 +43959,18 @@ tGW jgV ffP xPG -lLr +aAA tBk -lLr -mMk +aAA +xNi riW -lLr -tBk -lLr +aAA +bvn +aAA yhH hZV tFd -mkz +hZV aPz hZV hZV @@ -44011,19 +44217,19 @@ rCp eqZ eqZ eqZ -lLr -lLr +clx +vzG +xNi mMk -riW wdb -ogb -nZE -nZE -fpz -fpz -psS -nZE -nZE +aAA +ohh +lzc +lzc +lzc +lzc +lzc +inb iWZ iWZ xJb @@ -44270,17 +44476,17 @@ alx eqZ gOG xLZ -mMk -lLr -lLr -lLr -nZE -lEQ +xNi +lxt +lxt +aAA +aAA +lzc enZ mVg uKv -nZE -inb +lzc +csW iWZ fos lyY @@ -44529,15 +44735,15 @@ nao lTi rtq lTi -lTi -lLr -nZE -lEQ -enZ +ggc +aAA +aAA +lzc +drW cCo -uKv nZE -inb +lzc +csW iWZ cqw jPs @@ -44783,18 +44989,18 @@ knP gUb eqZ pRl +xIK +xIK +xIK hPN -hPN -hPN -hPN -jvK -nZE +xIK +xIK lEQ -dvZ -uKv +pnU +ojS qIp -nZE -inb +lzc +csW dSA lRV lyY @@ -45039,19 +45245,19 @@ oMw hmD rNz hmD -wRT -vbr -vbr -vbr +asG +ojS +ojS +ojS vbr -wRT -nZE -nZE -nZE -hKd -nZE -nZE +ojS nZE +lzc +nqw +ojS +ojS +lzc +csW iWZ eYD lSK @@ -45296,19 +45502,19 @@ kvA eLw izt hmD -aah -aah -aah -aah -aah -aah -nZE -tDW -nZE -ihX -mIT -mIT +jvK +cLP mIT +ojS +hWe +ihX +ojS +tDW +ojS +ojS +ojS +lzc +csW iWZ iWZ iWZ @@ -45553,20 +45759,20 @@ jUK pvz xRl hmD -aah -aah -aah -aah -aah -aah -nZE -tDW -nZE -drW -mIT -nZE -nZE -nZE +uBe +gmz +ojS +ojS +siR +shy +dAR +lzc +nEc +ycI +ojS +lzc +csW +csW csW csW jBl @@ -45810,18 +46016,18 @@ jPB dMz kgY hmD -aah -aah -aah -aah -aah -aah -nZE -tDW -nZE -nZE +pir +dqA +cbq +rgY +iXT +cCd +kyN +lzc +lzc +lzc wmc -nZE +lzc tod rsm rsm @@ -46068,14 +46274,14 @@ hmD hmD hmD mSq -ske -ske -ske -ske +hKd +hKd +hKd +hKd mSq -nZE -nZE -nZE +mSq +mSq +wdT wdT wdT wdT From e9566f22b8883b2c65a97bde60c0e4ac46fd6aab Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:27:24 -0400 Subject: [PATCH 02/11] oshan stuff --- _maps/map_files/Oshan/oshan.dmm | 392 +++++++++++++++++++++++--------- 1 file changed, 286 insertions(+), 106 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index b5f69c0105dd..55518e82b495 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -380,7 +380,10 @@ /area/station/hallway/primary/aft) "apv" = ( /obj/structure/table/reinforced, -/obj/item/lighter, +/obj/item/lighter{ + pixel_x = 7; + pixel_y = 3 + }, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/ce) "aqC" = ( @@ -2789,6 +2792,9 @@ "cCd" = ( /obj/structure/table/wood, /obj/machinery/light_switch/directional/east, +/obj/item/reagent_containers/cup/rag{ + pixel_y = 7 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "cCg" = ( @@ -2803,7 +2809,7 @@ "cCo" = ( /obj/item/chair/wood, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "cCM" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -2871,6 +2877,16 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"cEC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/lounge) "cES" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -3735,7 +3751,7 @@ "drW" = ( /obj/machinery/requests_console/directional/north, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "dsp" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/shutters/preopen{ @@ -4366,6 +4382,10 @@ "dYT" = ( /turf/open/floor/iron/dark, /area/station/command/heads_quarters/qm) +"dZo" = ( +/obj/structure/sign/poster/official/cleanliness, +/turf/closed/wall, +/area/station/commons/lounge) "dZG" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -4640,7 +4660,7 @@ /obj/structure/reagent_dispensers/beerkeg, /obj/item/radio/intercom/directional/north, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "eoD" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/light/directional/east, @@ -4838,6 +4858,16 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/qm) +"exO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/lounge) "exP" = ( /obj/effect/turf_decal/stripes{ dir = 1 @@ -5080,6 +5110,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/service/cafeteria) +"eIf" = ( +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar/backroom) "eIg" = ( /turf/open/floor/iron/stairs, /area/station/engineering/main) @@ -5734,6 +5768,7 @@ /area/station/service/bar/backroom) "fpz" = ( /obj/machinery/light_switch/directional/north, +/obj/machinery/restaurant_portal/restaurant, /turf/open/floor/wood, /area/station/commons/lounge) "fpZ" = ( @@ -7100,6 +7135,7 @@ /area/station/security/office) "gEM" = ( /obj/machinery/light/directional/north, +/obj/machinery/jukebox, /turf/open/floor/wood, /area/station/commons/lounge) "gFG" = ( @@ -7290,8 +7326,16 @@ /turf/open/floor/wood, /area/station/commons/lounge) "gOH" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "rndlab2"; + name = "Secondary Research and Development Shutter" + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gPj" = ( @@ -8238,6 +8282,10 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/central) +"hKT" = ( +/obj/machinery/light/directional/south, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar/backroom) "hLd" = ( /turf/open/floor/iron, /area/station/commons/storage/emergency/port) @@ -8353,6 +8401,15 @@ /obj/structure/table/wood/fancy/black, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/storage/fancy/cigarettes{ + pixel_y = 7; + pixel_x = -4 + }, +/obj/item/lighter{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/machinery/door/firedoor, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "hPQ" = ( @@ -8438,6 +8495,7 @@ "hWe" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "hXe" = ( @@ -8535,6 +8593,17 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"ibY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/door/airlock{ + name = "Kitchen" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/firedoor, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "ica" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -8664,6 +8733,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "iir" = ( @@ -9499,10 +9569,6 @@ /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) "iXT" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/table/wood, /obj/machinery/chem_master/condimaster{ desc = "Looks like a knock-off chem-master. Perhaps useful for separating liquids when mixing drinks precisely. Also dispenses condiments."; name = "HoochMaster Deluxe" @@ -10429,6 +10495,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/engine, /area/station/science/robotics/mechbay) +"jKU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "jKZ" = ( /obj/machinery/light/directional/east, /turf/open/floor/iron, @@ -10697,6 +10772,25 @@ /obj/machinery/camera/directional/west, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) +"jXK" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 5 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/glass/drinkingglass/shotglass{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "jYb" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted{ dir = 1 @@ -10892,6 +10986,12 @@ /obj/structure/table/optable, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"khQ" = ( +/obj/structure/table/wood/fancy/black, +/obj/effect/spawner/random/food_or_drink, +/obj/machinery/door/firedoor, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "kiI" = ( /obj/structure/reagent_dispensers/fueltank, /obj/machinery/light_switch/directional/north{ @@ -11315,9 +11415,14 @@ /turf/open/floor/wood, /area/station/service/lawoffice) "kDY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/chair/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "kEj" = ( /obj/structure/bed/dogbed, /mob/living/basic/pet/dog/bullterrier{ @@ -11364,6 +11469,10 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/grimy, /area/station/service/bar/backroom) +"kFS" = ( +/obj/structure/sign/poster/official/cohiba_robusto_ad, +/turf/closed/wall, +/area/station/security/detectives_office) "kFT" = ( /obj/machinery/atmospherics/components/unary/vent_pump/siphon/monitored/plasma_output{ dir = 1 @@ -11717,6 +11826,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"kXA" = ( +/obj/structure/table/wood/fancy/red, +/obj/item/reagent_containers/cup/soda_cans/monkestation/lemonade{ + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "kYh" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -12077,6 +12193,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/sorting) +"lpE" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar/backroom) "lpF" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, @@ -12762,16 +12883,13 @@ /turf/open/floor/plating/ocean, /area/ocean) "lZP" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock{ - name = "Kitchen" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/machinery/door/firedoor, -/turf/open/floor/stone, -/area/station/service/kitchen) +/obj/structure/table/wood/fancy/red, +/obj/effect/spawner/random/food_or_drink, +/turf/open/floor/wood, +/area/station/commons/lounge) "mca" = ( /turf/open/floor/engine, /area/station/commons/storage/emergency/port) @@ -13075,6 +13193,9 @@ /obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, /turf/open/floor/iron, /area/station/engineering/atmos) +"msi" = ( +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar/backroom) "msv" = ( /obj/structure/fans/tiny/forcefield, /obj/machinery/door/poddoor/shutters{ @@ -13399,6 +13520,7 @@ /area/station/cargo/miningoffice) "mIT" = ( /obj/machinery/holopad, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "mJe" = ( @@ -13481,8 +13603,10 @@ /turf/open/floor/engine, /area/station/engineering/main) "mMk" = ( +/obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/restaurant_portal/restaurant, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/table/wood/fancy/red, /turf/open/floor/wood, /area/station/commons/lounge) "mMt" = ( @@ -13668,7 +13792,7 @@ pixel_y = 4 }, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "mVu" = ( /obj/effect/landmark/start/clown, /turf/open/floor/eighties/red{ @@ -14086,7 +14210,7 @@ }, /obj/structure/mirror/directional/north, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "nqR" = ( /obj/effect/turf_decal/stripes{ dir = 6 @@ -14369,7 +14493,7 @@ "nEc" = ( /obj/machinery/vending/wardrobe/bar_wardrobe, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "nFf" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -14755,6 +14879,9 @@ pixel_y = 4 }, /obj/item/reagent_containers/condiment/flour, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "nTi" = ( @@ -15560,6 +15687,10 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"oGC" = ( +/obj/structure/sign/poster/official/high_class_martini, +/turf/closed/wall, +/area/station/security/detectives_office) "oHr" = ( /obj/structure/closet/crate/freezer/blood, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, @@ -16144,9 +16275,11 @@ /turf/open/floor/engine, /area/station/engineering/atmos/office) "pnU" = ( -/obj/structure/closet/cabinet, +/obj/effect/landmark/start/bartender, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "pnW" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai) @@ -16257,7 +16390,10 @@ /area/station/engineering/atmos) "pvz" = ( /obj/structure/table/wood, -/obj/item/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes{ + pixel_y = 7; + pixel_x = -4 + }, /obj/item/camera/detective, /obj/item/restraints/handcuffs, /obj/item/storage/secure/briefcase{ @@ -16350,6 +16486,7 @@ /obj/structure/table, /obj/item/storage/bag/tray, /obj/item/knife, +/obj/item/kitchen/spoon/soup_ladle, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "pDq" = ( @@ -16688,6 +16825,15 @@ dir = 4 }, /obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/machinery/door/firedoor, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "pRH" = ( @@ -16792,6 +16938,14 @@ }, /turf/open/floor/grass, /area/station/service/hydroponics) +"pYL" = ( +/obj/structure/table/wood/fancy/black, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_y = 7 + }, +/obj/machinery/door/firedoor, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "pYM" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/disposalpipe/segment{ @@ -16911,6 +17065,7 @@ /area/station/commons/toilet/auxiliary) "qeO" = ( /obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "qfa" = ( @@ -17511,7 +17666,7 @@ "qIp" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "qIz" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -17787,6 +17942,10 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"qVJ" = ( +/obj/structure/sign/poster/quirk/service_logo, +/turf/closed/wall, +/area/station/commons/lounge) "qVN" = ( /obj/machinery/door/airlock/command/glass{ name = "Chief Engineer" @@ -18063,12 +18222,13 @@ /obj/structure/table, /obj/item/reagent_containers/condiment/saltshaker{ pixel_y = 5; - pixel_x = 10 + pixel_x = 6 }, /obj/item/reagent_containers/condiment/peppermill{ pixel_x = 10; pixel_y = -2 }, +/obj/item/reagent_containers/cup/soup_pot, /obj/item/book/manual/wiki/cooking_to_serve_man{ pixel_x = -3 }, @@ -18974,6 +19134,11 @@ }, /turf/open/floor/engine, /area/station/cargo/miningoffice) +"scN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "sdJ" = ( /obj/effect/turf_decal/stripes{ dir = 4 @@ -19086,9 +19251,11 @@ /turf/open/floor/wood, /area/station/service/cafeteria) "shy" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/obj/structure/chair/wood{ + dir = 8 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "shE" = ( /obj/effect/turf_decal/tile/green/opposingcorners{ dir = 1 @@ -19123,8 +19290,9 @@ /area/station/security/office) "siR" = ( /obj/effect/landmark/start/bartender, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "sjq" = ( @@ -19174,9 +19342,6 @@ c_tag = "E.V.A. Storage" }, /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "slx" = ( @@ -20441,6 +20606,7 @@ }, /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "tEL" = ( @@ -21366,6 +21532,14 @@ id = "rndlab2"; name = "Secondary Research and Development Shutter" }, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 5; + pixel_x = 6 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "uxK" = ( @@ -21629,8 +21803,10 @@ /obj/item/holosign_creator/robot_seat/bar, /obj/item/reagent_containers/cup/glass/shaker, /obj/item/storage/box/drinkingglasses, +/obj/item/gun/ballistic/shotgun/sc_pump, +/obj/item/ammo_casing/shotgun/improvised, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "uKC" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -22588,6 +22764,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"vIL" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/effect/landmark/start/assistant, +/turf/open/floor/wood, +/area/station/commons/lounge) "vJu" = ( /obj/machinery/computer/security, /turf/open/floor/iron, @@ -22832,13 +23015,9 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "vTZ" = ( -/obj/machinery/light/directional/east, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/structure/table, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) +/obj/structure/table/wood/fancy/red, +/turf/open/floor/wood, +/area/station/commons/lounge) "vUg" = ( /obj/machinery/camera/autoname/directional/south, /turf/open/floor/bamboo, @@ -23264,7 +23443,7 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/iron/kitchen, -/area/station/service/bar) +/area/station/service/bar/backroom) "wmh" = ( /obj/structure/chair/office{ dir = 4 @@ -24667,6 +24846,7 @@ /area/station/service/hydroponics) "xIK" = ( /obj/structure/table/wood/fancy/black, +/obj/machinery/door/firedoor, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "xIO" = ( @@ -25078,7 +25258,7 @@ "ycI" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar) +/area/station/service/bar/backroom) "ydk" = ( /obj/structure/disposalpipe/segment, /obj/machinery/light/directional/west, @@ -40369,7 +40549,7 @@ ibt pVh pVh kam -fbw +scN nTf pug tbp @@ -40626,7 +40806,7 @@ jsA pqp pqp kam -kDY +pqp skI pug vtb @@ -40876,14 +41056,14 @@ hts oyT wRB qeO -vTZ +rfa pqp pqp jsA pqp pqp -gOH -rfa +pVh +kam oyT pug cfI @@ -41138,9 +41318,9 @@ uxE ceV tDO nii +gOH oyT -lZP -oyT +ibY pug jFi kUp @@ -41396,8 +41576,8 @@ aAA aAA aAA aAA -ghX aAA +ghX pug qGs lqa @@ -41644,7 +41824,7 @@ nNT wOi osu uRy -wRT +qVJ sSh aAA uEy @@ -41653,8 +41833,8 @@ aAA aAA aAA aAA -ghX aAA +ghX kmY exP jDu @@ -41904,14 +42084,14 @@ eZW wRT jGs aAA -lLr -aAA -aAA +kDY aAA +rtq aAA +lTi aAA +cEC ghX -aAA kmY exP lqa @@ -42161,13 +42341,13 @@ koV wRT lIE aAA -lLr -aAA -aAA +lZP aAA +vTZ aAA +kXA aAA -ghX +mMk aAA kmY exP @@ -42418,13 +42598,13 @@ ykL wRT fpz aAA -lLr -aAA +jKU aAA +vIL aAA +shy aAA -aAA -ghX +exO aAA kmY ncg @@ -42672,7 +42852,7 @@ wgZ bow kxW foP -wRT +dZo gEM aAA lLr @@ -43959,7 +44139,7 @@ tGW jgV ffP xPG -aAA +vzG tBk aAA xNi @@ -44218,17 +44398,17 @@ eqZ eqZ eqZ clx -vzG +aAA xNi -mMk +riW wdb aAA ohh lzc -lzc -lzc -lzc -lzc +oWO +oWO +oWO +oWO inb iWZ iWZ @@ -44485,7 +44665,7 @@ lzc enZ mVg uKv -lzc +oWO csW iWZ fos @@ -44730,19 +44910,19 @@ gUb sXg qfN hUb -eqZ +oGC nao lTi rtq lTi ggc -aAA -aAA +lTi +lTi lzc drW cCo -nZE -lzc +hKT +oWO csW iWZ cqw @@ -44987,19 +45167,19 @@ djv ycc knP gUb -eqZ +kFS pRl +pYL xIK -xIK -xIK +jXK hPN xIK -xIK +khQ lEQ pnU -ojS +msi qIp -lzc +oWO csW dSA lRV @@ -45254,9 +45434,9 @@ ojS nZE lzc nqw -ojS -ojS -lzc +msi +msi +oWO csW iWZ eYD @@ -45505,15 +45685,15 @@ hmD jvK cLP mIT -ojS +cLP hWe ihX -ojS +cLP tDW -ojS -ojS -ojS -lzc +eIf +eIf +lpE +oWO csW iWZ iWZ @@ -45764,13 +45944,13 @@ gmz ojS ojS siR -shy +ojS dAR lzc nEc ycI -ojS -lzc +msi +oWO csW csW csW @@ -46024,10 +46204,10 @@ iXT cCd kyN lzc -lzc -lzc +oWO +oWO wmc -lzc +oWO tod rsm rsm From 49a2812a981cd1a0c96d6900234d99e0573ec358 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Fri, 28 Jul 2023 08:59:06 -0400 Subject: [PATCH 03/11] kitchen shutters, bar closets --- _maps/map_files/Oshan/oshan.dmm | 124 ++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 46 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 55518e82b495..3ed4a97957b9 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2295,8 +2295,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "rndlab2"; - name = "Secondary Research and Development Shutter" + id = "roboticsprivacy"; + name = "Kitchen Shutters" }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -2807,7 +2807,8 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "cCo" = ( -/obj/item/chair/wood, +/obj/structure/chair/wood, +/obj/effect/landmark/start/bartender, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "cCM" = ( @@ -3750,6 +3751,15 @@ /area/station/service/chapel) "drW" = ( /obj/machinery/requests_console/directional/north, +/obj/item/vending_refill/cigarette, +/obj/structure/closet, +/obj/item/wrench, +/obj/item/stack/sheet/glass{ + amount = 30 + }, +/obj/item/stack/sheet/iron{ + amount = 30 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "dsp" = ( @@ -4657,8 +4667,9 @@ /turf/open/floor/iron, /area/station/engineering/main) "enZ" = ( -/obj/structure/reagent_dispensers/beerkeg, /obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/directional/west, +/obj/machinery/vending/wardrobe/bar_wardrobe, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "eoD" = ( @@ -6522,6 +6533,13 @@ }, /turf/closed/wall, /area/station/service/kitchen) +"gca" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/sink/kitchen/directional/west, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "gdm" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ dir = 6 @@ -7328,14 +7346,14 @@ "gOH" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rndlab2"; - name = "Secondary Research and Development Shutter" - }, /obj/structure/displaycase/forsale/kitchen{ pixel_y = 8 }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "roboticsprivacy"; + name = "Kitchen Shutters" + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gPj" = ( @@ -8283,7 +8301,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "hKT" = ( -/obj/machinery/light/directional/south, +/obj/structure/table/wood, +/obj/item/gun/ballistic/shotgun/doublebarrel, +/obj/item/ammo_casing/shotgun/improvised, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/photo_album/bar, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "hLd" = ( @@ -9111,6 +9133,10 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"iAn" = ( +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/engine, +/area/station/maintenance/port/central) "iAv" = ( /obj/structure/closet/crate/coffin, /turf/open/floor/carpet/lone/star, @@ -13782,15 +13808,7 @@ /turf/open/floor/iron, /area/station/cargo/storage) "mVg" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ - pixel_x = -5; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/glass/drinkingglass{ - pixel_x = 7; - pixel_y = 4 - }, +/obj/machinery/light_switch/directional/west, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "mVu" = ( @@ -14048,8 +14066,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "rndlab2"; - name = "Secondary Research and Development Shutter" + id = "roboticsprivacy"; + name = "Kitchen Shutters" }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -14491,7 +14509,7 @@ /turf/open/floor/iron, /area/station/cargo/miningoffice) "nEc" = ( -/obj/machinery/vending/wardrobe/bar_wardrobe, +/obj/structure/closet/secure_closet/bar, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "nFf" = ( @@ -15283,6 +15301,12 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) +"one" = ( +/obj/structure/table/wood, +/obj/item/reagent_containers/cup/glass/shaker, +/obj/item/holosign_creator/robot_seat/bar, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar/backroom) "ont" = ( /obj/structure/fans/tiny/forcefield, /obj/machinery/door/poddoor/shutters{ @@ -16275,9 +16299,7 @@ /turf/open/floor/engine, /area/station/engineering/atmos/office) "pnU" = ( -/obj/effect/landmark/start/bartender, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/effect/mapping_helpers/airlock/access/all/service/bar, +/obj/machinery/holopad, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "pnW" = ( @@ -17664,7 +17686,15 @@ }, /area/station/security/checkpoint/customs) "qIp" = ( -/obj/machinery/light_switch/directional/south, +/obj/item/reagent_containers/cup/glass/drinkingglass{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/reagent_containers/cup/glass/bottle/vodka/badminka{ + pixel_x = -5; + pixel_y = 6 + }, +/obj/structure/table/wood, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "qIz" = ( @@ -18099,7 +18129,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/central) "rfa" = ( -/obj/structure/sink/kitchen/directional/west, +/obj/machinery/button/door/directional/north{ + id = "roboticsprivacy"; + name = "Kitchen Shutter Control"; + req_access = list("kitchen"); + pixel_y = 0; + pixel_x = 25 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "rfd" = ( @@ -20591,8 +20627,8 @@ /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ dir = 8; - id = "rndlab2"; - name = "Secondary Research and Development Shutter" + id = "roboticsprivacy"; + name = "Kitchen Shutters" }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) @@ -21527,11 +21563,6 @@ }, /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "rndlab2"; - name = "Secondary Research and Development Shutter" - }, /obj/item/reagent_containers/condiment/peppermill{ pixel_x = 6; pixel_y = -2 @@ -21540,6 +21571,11 @@ pixel_y = 5; pixel_x = 6 }, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "roboticsprivacy"; + name = "Kitchen Shutters" + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "uxK" = ( @@ -21799,12 +21835,8 @@ /turf/open/floor/iron/grimy, /area/station/service/theater/abandoned) "uKv" = ( -/obj/structure/table/wood, -/obj/item/holosign_creator/robot_seat/bar, -/obj/item/reagent_containers/cup/glass/shaker, -/obj/item/storage/box/drinkingglasses, -/obj/item/gun/ballistic/shotgun/sc_pump, -/obj/item/ammo_casing/shotgun/improvised, +/obj/machinery/camera/autoname/directional/south, +/obj/structure/reagent_dispensers/beerkeg, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "uKC" = ( @@ -25256,7 +25288,7 @@ /turf/open/floor/wood, /area/station/security/detectives_office) "ycI" = ( -/obj/machinery/camera/autoname/directional/east, +/obj/machinery/light/small/directional/east, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar/backroom) "ydk" = ( @@ -41062,7 +41094,7 @@ pqp jsA pqp pqp -pVh +gca kam oyT pug @@ -44920,7 +44952,7 @@ lTi lTi lzc drW -cCo +msi hKT oWO csW @@ -45177,7 +45209,7 @@ xIK khQ lEQ pnU -msi +cCo qIp oWO csW @@ -45435,7 +45467,7 @@ nZE lzc nqw msi -msi +one oWO csW iWZ @@ -46461,7 +46493,7 @@ hKd mSq mSq mSq -wdT +iAn wdT wdT wdT From b89abb67d93ffe5f7cd490f61bca6204a3ab7710 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Fri, 28 Jul 2023 09:31:01 -0400 Subject: [PATCH 04/11] lighting changes --- _maps/map_files/Oshan/oshan.dmm | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 3ed4a97957b9..3413ad735751 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -3231,6 +3231,10 @@ }, /turf/open/floor/iron, /area/station/security/office) +"cXX" = ( +/obj/machinery/light/small/directional/west, +/turf/open/floor/plating, +/area/station/maintenance/port/central) "cYd" = ( /obj/structure/nestbox, /turf/open/floor/grass, @@ -7152,7 +7156,6 @@ /turf/open/floor/iron, /area/station/security/office) "gEM" = ( -/obj/machinery/light/directional/north, /obj/machinery/jukebox, /turf/open/floor/wood, /area/station/commons/lounge) @@ -7336,11 +7339,11 @@ /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/cmo) "gOG" = ( -/obj/structure/extinguisher_cabinet/directional/north, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "gOH" = ( @@ -12525,6 +12528,7 @@ /area/station/service/theater) "lIE" = ( /obj/effect/spawner/random/entertainment/arcade, +/obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "lIL" = ( @@ -13888,7 +13892,6 @@ /turf/open/floor/iron/grimy, /area/station/service/lawoffice) "nao" = ( -/obj/machinery/light/directional/north, /obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 4 @@ -13897,6 +13900,7 @@ dir = 4 }, /obj/effect/landmark/start/psychologist, +/obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "naN" = ( @@ -15589,6 +15593,10 @@ /obj/effect/turf_decal/tile/dark_red/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/supply) +"oAW" = ( +/obj/machinery/light/directional/west, +/turf/open/floor/wood, +/area/station/commons/lounge) "oBe" = ( /obj/machinery/conveyor/auto{ dir = 1 @@ -18106,7 +18114,7 @@ /turf/closed/wall, /area/station/service/cafeteria) "rdz" = ( -/obj/machinery/airalarm/directional/north, +/obj/machinery/light/small/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) "rdF" = ( @@ -18528,6 +18536,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/station/commons/lounge) "rwi" = ( @@ -21751,7 +21760,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "uGk" = ( -/obj/machinery/light/directional/south, /obj/machinery/camera/motion/directional/east{ c_tag = "E.V.A. Storage" }, @@ -41601,14 +41609,14 @@ xvl ddU wRT xRh -aAA +oAW dvZ bFn aAA aAA aAA aAA -aAA +oAW ghX pug qGs @@ -44435,7 +44443,7 @@ xNi riW wdb aAA -ohh +aAA lzc oWO oWO @@ -44685,14 +44693,14 @@ azZ sXg rob alx -eqZ +oGC gOG xLZ xNi lxt lxt aAA -aAA +ohh lzc enZ mVg @@ -44942,7 +44950,7 @@ gUb sXg qfN hUb -oGC +eqZ nao lTi rtq @@ -45985,7 +45993,7 @@ msi oWO csW csW -csW +cXX csW jBl vhO From 87fe73bfa255d56177d639456509aa91ed46b824 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Fri, 28 Jul 2023 09:56:57 -0400 Subject: [PATCH 05/11] bar fixes --- _maps/map_files/Oshan/oshan.dmm | 67 +++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 3413ad735751..36bf7ba06898 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -425,9 +425,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, /obj/structure/table/wood, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) @@ -2207,7 +2204,7 @@ "cbq" = ( /obj/structure/table/wood, /obj/machinery/chem_dispenser/drinks/beer{ - dir = 1 + dir = 2 }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) @@ -3710,9 +3707,6 @@ /area/station/engineering/main) "dqA" = ( /obj/structure/table/wood, -/obj/machinery/chem_dispenser/drinks/beer{ - dir = 2 - }, /obj/structure/cable, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) @@ -11016,9 +11010,11 @@ /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) "khQ" = ( -/obj/structure/table/wood/fancy/black, -/obj/effect/spawner/random/food_or_drink, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Bar" + }, +/obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "kiI" = ( @@ -12854,6 +12850,22 @@ /obj/machinery/light/directional/north, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/hop) +"lWZ" = ( +/obj/structure/table/wood/fancy/black, +/obj/machinery/door/firedoor, +/obj/item/reagent_containers/condiment/peppermill{ + pixel_x = 6; + pixel_y = -2 + }, +/obj/item/reagent_containers/condiment/saltshaker{ + pixel_y = 5; + pixel_x = 6 + }, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_y = 7 + }, +/turf/open/floor/carpet/neon/simple/green/nodots, +/area/station/service/bar) "lXt" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/door/poddoor/preopen{ @@ -13899,7 +13911,6 @@ /obj/structure/chair/wood{ dir = 4 }, -/obj/effect/landmark/start/psychologist, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) @@ -16854,16 +16865,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/condiment/saltshaker{ - pixel_y = 5; - pixel_x = 6 - }, -/obj/item/reagent_containers/condiment/peppermill{ - pixel_x = 6; - pixel_y = -2 - }, /obj/machinery/door/firedoor, +/obj/machinery/smartfridge/drinks{ + icon_state = "boozeomat" + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "pRH" = ( @@ -16970,10 +16975,10 @@ /area/station/service/hydroponics) "pYL" = ( /obj/structure/table/wood/fancy/black, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_y = 7 - }, /obj/machinery/door/firedoor, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "pYM" = ( @@ -21660,9 +21665,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/smartfridge/drinks{ - icon_state = "boozeomat" - }, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "uBI" = ( @@ -23274,6 +23276,13 @@ }, /turf/open/floor/engine, /area/station/cargo/miningoffice) +"weF" = ( +/obj/structure/chair/wood{ + dir = 4 + }, +/obj/effect/landmark/start/psychologist, +/turf/open/floor/wood, +/area/station/commons/lounge) "weK" = ( /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/cmo) @@ -24887,6 +24896,8 @@ "xIK" = ( /obj/structure/table/wood/fancy/black, /obj/machinery/door/firedoor, +/obj/effect/spawner/random/food_or_drink, +/obj/structure/window/plasma/spawner/directional/south, /turf/open/floor/carpet/neon/simple/green/nodots, /area/station/service/bar) "xIO" = ( @@ -44952,12 +44963,12 @@ qfN hUb eqZ nao -lTi +weF rtq lTi ggc lTi -lTi +aAA lzc drW msi @@ -45210,7 +45221,7 @@ gUb kFS pRl pYL -xIK +lWZ jXK hPN xIK From fab9d891b0e6feadd30e661d746ebf241b16f871 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Fri, 28 Jul 2023 10:01:21 -0400 Subject: [PATCH 06/11] fixes a dumb extra chair --- _maps/map_files/Oshan/oshan.dmm | 3 --- 1 file changed, 3 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 36bf7ba06898..4188eb5bbce6 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -13908,9 +13908,6 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/chair/wood{ - dir = 4 - }, /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/wood, /area/station/commons/lounge) From b51d5e953e76daa22a87c765898fd88d83d28ba0 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:04:37 -0400 Subject: [PATCH 07/11] fix conflict pls? --- _maps/map_files/Oshan/oshan.dmm | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 4188eb5bbce6..99397f32c8a8 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2491,9 +2491,6 @@ /turf/open/floor/iron/white, /area/station/science/robotics/mechbay) "cmi" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/table, /obj/machinery/microwave{ pixel_y = 3 @@ -7261,6 +7258,8 @@ /area/station/maintenance/starboard/aft) "gJY" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "gKd" = ( @@ -14534,6 +14533,13 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"nFt" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "nFP" = ( /obj/machinery/airalarm/directional/north, /obj/structure/table/wood, @@ -14909,9 +14915,6 @@ pixel_y = 4 }, /obj/item/reagent_containers/condiment/flour, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "nTi" = ( @@ -18761,7 +18764,9 @@ /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "rFz" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "rFD" = ( @@ -19183,7 +19188,9 @@ /area/station/cargo/miningoffice) "scN" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) "sdJ" = ( @@ -19645,9 +19652,6 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) "sze" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/table, /obj/machinery/reagentgrinder{ @@ -39305,7 +39309,7 @@ xJM gbP loJ pqp -pqp +kam kam pqp jsA @@ -39562,8 +39566,8 @@ vrw uJu eYH pqp +gJY pqp -kam pqp jsA pqp @@ -39818,7 +39822,7 @@ dYl aRH oyT lYO -rFz +pqp gJY cmi rkZ @@ -40076,8 +40080,8 @@ utm abR sKC pqp +gJY pqp -kam pqp djR sKC @@ -40333,7 +40337,7 @@ aTZ tUD sTo cFC -cFC +nFt sze pFY oFK @@ -40590,7 +40594,7 @@ utm juw pqp pqp -pqp +rFz kam pVh ibt @@ -44452,7 +44456,7 @@ riW wdb aAA aAA -lzc +wRT oWO oWO oWO @@ -44709,7 +44713,7 @@ lxt lxt aAA ohh -lzc +wRT enZ mVg uKv @@ -44966,7 +44970,7 @@ lTi ggc lTi aAA -lzc +wRT drW msi hKT From 721930309a81811f70993745751ee99bc7a967ec Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:16:48 -0400 Subject: [PATCH 08/11] Adjustments --- _maps/map_files/Oshan/oshan.dmm | 42 ++++++++++----------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 99397f32c8a8..29549438b0e5 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2893,8 +2893,7 @@ /turf/open/floor/wood, /area/station/service/cafeteria) "cEY" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/wood, /area/station/commons/lounge) "cFb" = ( @@ -6956,11 +6955,6 @@ /obj/machinery/light/very_dim/directional/south, /turf/open/floor/iron, /area/station/hallway/primary/central) -"gyq" = ( -/obj/machinery/duct/industrial/waste, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/commons/lounge) "gyA" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 4 @@ -8131,6 +8125,7 @@ "hxL" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/lounge) "hyj" = ( @@ -18223,10 +18218,6 @@ /obj/effect/mapping_helpers/airlock/access/all/science/general, /turf/open/floor/plating, /area/station/science/ordnance/storage) -"riW" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/wood, -/area/station/commons/lounge) "rja" = ( /obj/structure/table/wood/fancy/blue, /turf/open/floor/wood, @@ -23242,12 +23233,6 @@ /obj/machinery/door/airlock/public/glass, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"wdb" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/wood, -/area/station/commons/lounge) "wdc" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -25026,10 +25011,6 @@ /obj/structure/cable/industrial, /turf/open/floor/iron, /area/station/engineering/main) -"xNi" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/wood, -/area/station/commons/lounge) "xOE" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/cable, @@ -25111,6 +25092,7 @@ "xSI" = ( /obj/machinery/duct/industrial/waste, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/commons/lounge) "xSR" = ( @@ -42912,7 +42894,7 @@ aAA aAA aAA aAA -aAA +cEY ghX uGk pug @@ -43681,7 +43663,7 @@ ogb aVK ogb hxL -cEY +ogb ogb ogb ogb @@ -43938,7 +43920,7 @@ oPI apm oPI xSI -gyq +oPI oPI oPI oPI @@ -44194,8 +44176,8 @@ xPG vzG tBk aAA -xNi -riW +jSP +aAA aAA bvn aAA @@ -44451,9 +44433,9 @@ eqZ eqZ clx aAA -xNi -riW -wdb +jSP +aAA +aAA aAA aAA wRT @@ -44708,7 +44690,7 @@ alx oGC gOG xLZ -xNi +jSP lxt lxt aAA From 3a8252702187e6b8898bc6b1b9f9b40e73f0a07d Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Sun, 6 Aug 2023 22:33:34 -0400 Subject: [PATCH 09/11] bat hell --- _maps/map_files/Oshan/oshan.dmm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index 29549438b0e5..e833c20c8ed8 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -2892,10 +2892,6 @@ }, /turf/open/floor/wood, /area/station/service/cafeteria) -"cEY" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/wood, -/area/station/commons/lounge) "cFb" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -22064,6 +22060,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/disposal) +"uXR" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/turf/open/floor/wood, +/area/station/commons/lounge) "uYw" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /obj/structure/cable, @@ -42894,7 +42896,7 @@ aAA aAA aAA aAA -cEY +aAA ghX uGk pug @@ -43150,7 +43152,7 @@ lLr aAA aAA aAA -aAA +uXR aAA rvS wRT From a04853abcaf649531b89e62990e941f74d101090 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Sun, 6 Aug 2023 23:00:02 -0400 Subject: [PATCH 10/11] Last commit before bed, i'll look at stuff later --- _maps/map_files/Oshan/oshan.dmm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index e833c20c8ed8..b2018a821964 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -14510,10 +14510,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"nEc" = ( -/obj/structure/closet/secure_closet/bar, -/turf/open/floor/carpet/neon/simple/green/nodots, -/area/station/service/bar/backroom) "nFf" = ( /obj/machinery/door/window/left/directional/north{ base_state = "right"; @@ -44440,7 +44436,7 @@ aAA aAA aAA aAA -wRT +oWO oWO oWO oWO @@ -44697,7 +44693,7 @@ lxt lxt aAA ohh -wRT +oWO enZ mVg uKv @@ -44954,7 +44950,7 @@ lTi ggc lTi aAA -wRT +oWO drW msi hKT @@ -45983,7 +45979,7 @@ siR ojS dAR lzc -nEc +msi ycI msi oWO From 5a55d9560f85928a5d0d9937d1004f90e5030564 Mon Sep 17 00:00:00 2001 From: Momo <136583113+MomoBerri@users.noreply.github.com> Date: Mon, 7 Aug 2023 16:55:59 -0400 Subject: [PATCH 11/11] maybe this fixes it? --- _maps/map_files/Oshan/oshan.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_maps/map_files/Oshan/oshan.dmm b/_maps/map_files/Oshan/oshan.dmm index b2018a821964..5fb9f720f653 100644 --- a/_maps/map_files/Oshan/oshan.dmm +++ b/_maps/map_files/Oshan/oshan.dmm @@ -43145,10 +43145,10 @@ wRT wRT rdz lLr +uXR aAA aAA aAA -uXR aAA rvS wRT