diff --git a/maps/offmap_vr/talon/talon1.dmm b/maps/offmap_vr/talon/talon1.dmm index 92db904df67..ba71141c7db 100644 --- a/maps/offmap_vr/talon/talon1.dmm +++ b/maps/offmap_vr/talon/talon1.dmm @@ -118,14 +118,14 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_port) "an" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "ao" = ( @@ -462,15 +462,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating/eris/under/airless, /area/talon/maintenance/deckone_starboard_fore_wing) -"bb" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/eris/dark/cyancorner, -/area/talon/deckone/bridge) "bc" = ( /obj/structure/catwalk, /obj/structure/handrail{ @@ -739,6 +730,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = -26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bE" = ( @@ -798,12 +792,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "bI" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/structure/closet/hydrant{ - pixel_y = 32 - }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bJ" = ( @@ -958,6 +947,9 @@ id = "talon_sensor"; name = "sensor blast shields" }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "bX" = ( @@ -1929,6 +1921,9 @@ /area/talon/deckone/starboard_eng) "hQ" = ( /obj/structure/table/steel, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "id" = ( @@ -2525,9 +2520,13 @@ /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) "nT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/emblem/talon, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled/eris/white/golden, /area/talon/deckone/bridge) "nW" = ( @@ -2699,6 +2698,9 @@ /obj/structure/closet/autolok_wall{ pixel_y = -24 }, +/obj/structure/closet/hydrant{ + pixel_x = 26 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "pJ" = ( @@ -4075,9 +4077,6 @@ /obj/machinery/computer/ship/helm{ req_one_access = list(301) }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Gb" = ( @@ -4248,9 +4247,6 @@ /area/talon/deckone/bridge_hallway) "HW" = ( /obj/machinery/computer/ship/sensors, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "Id" = ( @@ -5140,13 +5136,11 @@ /turf/simulated/floor/hull/airless, /area/talon/maintenance/deckone_starboard_aft_wing) "RS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/structure/table/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 + dir = 4 }, -/turf/simulated/floor/tiled/eris/white/golden, +/turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "RV" = ( /obj/structure/cable/green{ @@ -5418,6 +5412,9 @@ id = "talon_windows"; name = "window blast shields" }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/tiled/eris/dark/cyancorner, /area/talon/deckone/bridge) "UC" = ( @@ -15410,7 +15407,7 @@ aa af ab ac -bb +bI Nz bW tw @@ -15694,11 +15691,11 @@ aa ag ae al +ao +ao an ao ao -ao -ao as ac KP @@ -15836,8 +15833,8 @@ aa aa ai IM -RS -on +LH +LH nT on uy @@ -15978,10 +15975,10 @@ aa aa ai IM +LH +LH wm LH -LH -LH cC zy ac @@ -16122,7 +16119,7 @@ ab ac HW oS -hQ +RS Os VU YT diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 9e395c460a2..0de494fc59d 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -8359,7 +8359,9 @@ /area/tether/surfacebase/surface_three_hall) "ani" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "anj" = ( @@ -8680,14 +8682,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "anN" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "anO" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/universal, @@ -9529,15 +9531,19 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "api" = ( -/obj/machinery/light{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, -/obj/machinery/appliance/cooker/grill, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/button/remote/blast_door{ + id = "kitchen2"; + name = "Kitchen shutters"; + pixel_x = -24 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 9 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -11522,12 +11528,12 @@ /area/tether/surfacebase/surface_three_hall) "asw" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asx" = ( @@ -11702,24 +11708,6 @@ dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"asM" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asN" = ( @@ -11832,6 +11820,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "ata" = ( @@ -11870,9 +11859,10 @@ /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "atf" = ( -/obj/machinery/appliance/cooker/fryer, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12014,10 +12004,8 @@ /obj/machinery/camera/network/outside{ dir = 5 }, -/obj/machinery/appliance/cooker/oven, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 - }, +/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atx" = ( @@ -12056,9 +12044,9 @@ "atA" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -12126,7 +12114,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atK" = ( @@ -12139,24 +12127,11 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) -"atL" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ - pixel_x = -3 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "atM" = ( /obj/structure/table/standard, -/obj/machinery/microwave, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/item/weapon/material/knife/butch, +/obj/item/weapon/material/kitchen/rollingpin, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( @@ -12168,29 +12143,28 @@ /area/crew_quarters/bar) "atO" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/effect/landmark/start{ - name = "Chef" +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/dropper, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/item/weapon/reagent_containers/food/condiment/enzyme{ + layer = 5 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atP" = ( -/obj/machinery/button/remote/blast_door{ - id = "kitchen"; - name = "Kitchen shutters"; - pixel_x = -24; - pixel_y = -24 - }, /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/cereal, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 4 + dir = 8 }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atQ" = ( @@ -12199,9 +12173,14 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/table/standard, -/obj/item/weapon/material/knife/butch, -/obj/item/weapon/material/kitchen/rollingpin, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atR" = ( @@ -12930,6 +12909,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/woodentable, /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( @@ -13130,13 +13110,6 @@ /obj/effect/floor_decal/corner/beige{ dir = 6 }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 25 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avB" = ( @@ -13153,13 +13126,13 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "avD" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/machinery/appliance/mixer/candy, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 6 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/obj/machinery/button/remote/blast_door{ + id = "kitchen"; + name = "Kitchen shutters"; + pixel_x = -24 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -13235,8 +13208,12 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "avL" = ( -/obj/machinery/chem_master/condimaster, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + name = "Hydroponics"; + req_one_access = list(35,28) + }, +/turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "avM" = ( /obj/effect/floor_decal/corner/beige{ @@ -13392,13 +13369,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) -"awc" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "awd" = ( /obj/machinery/librarycomp, /obj/structure/table/woodentable, @@ -13573,14 +13543,15 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "awv" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -25 +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/blast/shutters{ + id = "kitchen2"; + layer = 3.3; + name = "Kitchen Shutters" }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -14228,16 +14199,14 @@ }, /obj/machinery/door/firedoor/glass, /obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ - pixel_x = 3 + dir = 1 }, /obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ pixel_x = -3 }, -/obj/machinery/chemical_dispenser/bar_soft/full, -/obj/machinery/recharger, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "axu" = ( @@ -15989,6 +15958,8 @@ icon_state = "1-2" }, /obj/structure/table/standard, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAa" = ( @@ -16435,12 +16406,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/structure/table/standard, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/machinery/chem_master/condimaster, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, -/obj/item/weapon/packageWrap, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aAM" = ( @@ -16889,14 +16861,13 @@ /turf/simulated/floor/tiled, /area/rnd/staircase/thirdfloor) "aBx" = ( -/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBy" = ( @@ -16962,15 +16933,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aBD" = ( -/obj/structure/table/standard, -/obj/item/weapon/storage/box/donkpockets{ - pixel_x = 3; - pixel_y = 3 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker{ - pixel_x = 5 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 }, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/machinery/appliance/mixer/cereal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aBE" = ( @@ -17348,8 +17317,11 @@ /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCf" = ( -/obj/structure/table/standard, -/obj/item/weapon/book/manual/chef_recipes, +/obj/machinery/appliance/mixer/candy, +/obj/effect/floor_decal/industrial/warning/dust, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCg" = ( @@ -17452,11 +17424,6 @@ dir = 8 }, /obj/structure/closet/secure_closet/freezer/meat, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aCr" = ( @@ -18877,14 +18844,16 @@ /turf/simulated/floor/carpet, /area/library) "aES" = ( -/obj/structure/table/standard, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ - layer = 5 +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, -/obj/item/weapon/reagent_containers/dropper, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aET" = ( @@ -19686,10 +19655,17 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGh" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/freezer{ + name = "Kitchen"; + req_access = list(28) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGi" = ( @@ -19698,9 +19674,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/table/standard, -/obj/machinery/reagentgrinder, +/obj/machinery/appliance/cooker/fryer, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 5 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( @@ -19815,21 +19795,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGr" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/table/standard, -/obj/item/weapon/storage/box/beakers{ - name = "box of measuring cups"; - pixel_x = 2; - pixel_y = 3; - starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "aGs" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/research{ @@ -20192,6 +20157,8 @@ dir = 8; pixel_x = -28 }, +/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/weapon/storage/pill_bottle/dice_nerd, /turf/simulated/floor/wood, /area/library) "aGZ" = ( @@ -20449,11 +20416,10 @@ /turf/simulated/floor/plating, /area/crew_quarters/bar) "aHs" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHt" = ( @@ -20540,10 +20506,10 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHB" = ( -/obj/structure/table/gamblingtable, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aHC" = ( @@ -20962,13 +20928,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIg" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIh" = ( @@ -21255,7 +21221,7 @@ /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIH" = ( -/obj/structure/table/gamblingtable, +/obj/structure/table/marble, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aII" = ( @@ -21315,12 +21281,20 @@ /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIN" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/deck/cards, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/bar) +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aIO" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) @@ -21675,11 +21649,11 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJv" = ( -/obj/structure/table/gamblingtable, -/obj/item/weapon/storage/pill_bottle/dice_nerd, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/marble, +/obj/machinery/recharger, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJw" = ( @@ -21813,7 +21787,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aJK" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -21821,6 +21794,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aJL" = ( @@ -22126,11 +22100,11 @@ /turf/simulated/floor/tiled/techmaint, /area/crew_quarters/bar) "aKo" = ( -/obj/item/weapon/stool/padded, /obj/effect/floor_decal/spline/plain{ dir = 4 }, /obj/structure/disposalpipe/segment, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( @@ -22179,10 +22153,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/hologram/holopad, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKv" = ( @@ -22228,16 +22200,11 @@ /area/tether/surfacebase/surface_three_hall) "aKy" = ( /obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/sink/kitchen{ + pixel_y = 28 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -22503,9 +22470,6 @@ /area/tether/surfacebase/servicebackroom) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/landmark/start{ name = "Chef" }, @@ -26954,6 +26918,7 @@ /area/hallway/lower/third_south) "aUq" = ( /obj/structure/closet/secure_closet/freezer/meat, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "aUr" = ( @@ -29545,20 +29510,6 @@ }, /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_first_aid) -"aZg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aZh" = ( /obj/machinery/door/airlock/glass_command{ name = "Bridge"; @@ -30053,9 +30004,6 @@ /obj/effect/floor_decal/borderfloor{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ - dir = 4 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, @@ -30068,11 +30016,21 @@ /obj/effect/floor_decal/corner/beige/bordercorner2{ dir = 6 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 5 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/foodcart, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aZY" = ( @@ -30366,16 +30324,14 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/corner/beige/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ +/obj/effect/floor_decal/steeldecal/steel_decals4, +/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, /turf/simulated/floor/tiled, @@ -30406,13 +30362,13 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baA" = ( -/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, /obj/machinery/light{ dir = 8 }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "baB" = ( @@ -30427,10 +30383,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "baC" = ( /obj/machinery/vending/cola{ @@ -30461,14 +30414,21 @@ /area/hallway/lower/third_south) "baE" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/structure/table/standard, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baF" = ( @@ -30575,21 +30535,18 @@ /area/tether/surfacebase/surface_three_hall) "baM" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/button/remote/blast_door{ - id = "kitchen2"; - name = "Kitchen shutters"; - pixel_x = -24 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 6 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "baN" = ( @@ -30601,12 +30558,31 @@ /turf/simulated/floor/tiled, /area/crew_quarters/heads/hop) "baO" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/vending/dinnerware{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/floor_decal/borderfloor{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/effect/floor_decal/corner/beige/border{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/beige/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) "baP" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30669,6 +30645,10 @@ dir = 1; pixel_y = -25 }, +/obj/machinery/computer/guestpass{ + dir = 8; + pixel_x = 25 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baX" = ( @@ -30800,11 +30780,6 @@ /area/tether/surfacebase/entertainment) "bbm" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/item/weapon/paper{ - desc = ""; - info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; - name = "Important notice from Rancher Jim" - }, /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -31072,6 +31047,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "bbJ" = ( @@ -31254,7 +31232,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/camera/network/civilian, +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bcb" = ( @@ -31302,9 +31283,16 @@ /area/tether/surfacebase/servicebackroom) "bcf" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/table/standard, +/obj/item/frame/noticeboard{ + pixel_x = 32 }, +/obj/item/weapon/paper{ + desc = ""; + info = "Yes hello, the goat in the freezer is named 'Spike'. Please do not fuck with Spike. He doesn't have the best temper."; + name = "Important notice from Rancher Jim" + }, +/obj/item/weapon/book/manual/chef_recipes, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bcg" = ( @@ -31907,19 +31895,17 @@ /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bda" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/donkpockets{ + pixel_x = 3; + pixel_y = 3 }, -/obj/machinery/door/airlock/freezer{ - name = "Kitchen"; - req_access = list(28) - }, -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/weapon/reagent_containers/glass/beaker{ + pixel_x = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdb" = ( @@ -32157,10 +32143,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bdy" = ( @@ -32208,18 +32194,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) -"bdE" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) "bdF" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -32331,9 +32305,6 @@ /area/crew_quarters/bar) "bdR" = ( /obj/structure/kitchenspike, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bdS" = ( @@ -32466,15 +32437,21 @@ /area/crew_quarters/barrestroom) "bej" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 8 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -23; + pixel_y = 22 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bek" = ( @@ -32487,6 +32464,9 @@ /obj/item/device/radio/intercom{ pixel_y = -25 }, +/obj/machinery/vending/dinnerware{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bel" = ( @@ -32596,11 +32576,6 @@ /area/crew_quarters/kitchen) "bev" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -32609,28 +32584,28 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/effect/landmark/start{ + name = "Chef" + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bew" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/machinery/light_switch{ - pixel_x = 24 - }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bex" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, +/obj/machinery/computer/guestpass{ + pixel_y = 23 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bey" = ( @@ -32658,6 +32633,8 @@ /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/standard, +/obj/machinery/microwave, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beA" = ( @@ -32712,8 +32689,8 @@ /area/hydroponics) "beF" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -32741,9 +32718,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "beI" = ( @@ -32919,7 +32894,7 @@ "bfb" = ( /obj/machinery/door/airlock/freezer{ name = "Service"; - req_access = list(28) + req_one_access = list(35,28) }, /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -32938,18 +32913,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bfe" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/camera/network/civilian{ - dir = 1 +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -25 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -33045,13 +33015,10 @@ /area/tether/surfacebase/servicebackroom) "bfn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/standard, +/obj/machinery/reagentgrinder, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -33409,6 +33376,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bga" = ( @@ -33442,7 +33412,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bgf" = ( -/obj/machinery/camera/network/civilian, +/obj/item/frame/noticeboard{ + pixel_y = 26 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgg" = ( @@ -33517,12 +33489,22 @@ /area/tether/surfacebase/southhall) "bgn" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/table/standard, +/obj/item/weapon/storage/box/beakers{ + name = "box of measuring cups"; + pixel_x = 2; + pixel_y = 3; + starts_with = list(/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup = 7) + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgo" = ( @@ -33533,41 +33515,51 @@ /area/tether/surfacebase/entertainment/stage) "bgp" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"bgq" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, +/obj/structure/table/standard, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"bgr" = ( -/obj/effect/floor_decal/corner/grey/diagonal, +"bgq" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/appliance/cooker/oven, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bgr" = ( /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 +/obj/machinery/appliance/cooker/grill, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 6 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 10 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgs" = ( -/obj/machinery/hologram/holopad, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/standard, +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgt" = ( @@ -33588,6 +33580,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/alarm{ + pixel_y = 25 + }, +/obj/item/weapon/tool/wrench, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgu" = ( @@ -33619,9 +33615,6 @@ icon_state = "4-8" }, /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/sink/kitchen{ - pixel_y = 28 - }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bgy" = ( @@ -35627,14 +35620,14 @@ /obj/structure/window/reinforced{ dir = 8 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) "bkO" = ( @@ -37192,6 +37185,23 @@ }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"bsa" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 + }, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bsb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -37338,6 +37348,13 @@ dir = 4 }, /obj/effect/map_helper/airlock/door/simple, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "cbn" = ( @@ -37494,6 +37511,9 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"cGs" = ( +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "cGt" = ( /obj/structure/cable/green{ d1 = 4; @@ -37685,15 +37705,15 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; dir = 4; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/cockpit) "dgA" = ( @@ -38283,15 +38303,6 @@ }, /turf/simulated/wall, /area/tether/surfacebase/medical/storage) -"fNt" = ( -/obj/structure/cable/green{ - dir = 1 - }, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/structure/window/reinforced, -/turf/simulated/floor/tiled/steel_dirty, -/area/shuttle/tourbus/engines) "fNA" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/floor_decal/borderfloor{ @@ -39271,6 +39282,13 @@ req_one_access = list(19,43,67); specialfunctions = 4 }, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/tourbus/general) "jPW" = ( @@ -39285,6 +39303,11 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"jRO" = ( +/obj/effect/floor_decal/spline/plain, +/obj/item/weapon/stool/padded, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/bar) "jSV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -39337,6 +39360,11 @@ /obj/structure/closet/emergsuit_wall{ pixel_y = 32 }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "tourbus_windows"; + name = "window blast shields" + }, /turf/simulated/floor/tiled/eris/white/orangecorner, /area/shuttle/tourbus/cockpit) "keg" = ( @@ -39443,11 +39471,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) "kun" = ( -/obj/machinery/power/apc{ - name = "south bump"; - pixel_y = -28; - req_access = list(67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, @@ -39524,8 +39547,9 @@ }, /obj/effect/floor_decal/industrial/outline/red, /obj/machinery/portable_atmospherics/canister/phoron, -/obj/structure/window/reinforced{ - dir = 1 +/obj/machinery/door/window/southleft{ + dir = 1; + req_one_access = list(19,43,67) }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) @@ -40290,6 +40314,13 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +"nXZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "nYB" = ( /obj/structure/cable/green{ d1 = 1; @@ -40482,6 +40513,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"oII" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "oIJ" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_scrubber/on, @@ -40975,6 +41013,14 @@ /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/structure/window/reinforced, +/obj/machinery/door/blast/regular{ + density = 0; + dir = 4; + icon_state = "pdoor0"; + id = "tourbus_windows"; + name = "Shuttle Blast Doors"; + opacity = 0 + }, /turf/simulated/floor/tiled/steel_dirty, /area/shuttle/tourbus/engines) "qoL" = ( @@ -41235,6 +41281,14 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +"rBz" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "rCt" = ( /obj/structure/closet/lawcloset, /obj/effect/floor_decal/spline/plain{ @@ -41414,6 +41468,21 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"soG" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Chef" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"sts" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "suT" = ( /obj/structure/cable/green{ d1 = 4; @@ -41488,13 +41557,13 @@ d2 = 4; icon_state = "1-4" }, -/obj/machinery/door/window/southleft{ - dir = 1; - req_one_access = list(19,43,67) - }, /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 9 }, +/obj/machinery/door/window/southright{ + dir = 1; + req_one_access = list(19,43,67) + }, /turf/simulated/floor/tiled/eris/dark/bluecorner, /area/shuttle/tourbus/engines) "sJv" = ( @@ -42437,6 +42506,20 @@ /obj/structure/window/reinforced/full, /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) +"wju" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wlf" = ( /obj/structure/table/glass, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -42543,16 +42626,36 @@ /obj/structure/window/reinforced{ dir = 4 }, +/obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; - id = "shuttle blast"; + id = "tourbus_windows"; name = "Shuttle Blast Doors"; opacity = 0 }, -/obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating/eris/under, /area/shuttle/tourbus/general) +"wBv" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor/glass, +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "wKZ" = ( /obj/effect/landmark/start{ name = "Medical Doctor" @@ -54635,7 +54738,7 @@ rbR hCB wQf tLv -fNt +qom aKU aOI aPb @@ -57014,7 +57117,7 @@ xUo fOj ahR arG -akH +xEB akH akH aGv @@ -57157,7 +57260,7 @@ apS ajX aZW baw -baw +baO avn avn aKx @@ -57298,8 +57401,8 @@ aXT aXT bbN aru -avp -avp +aGh +aru avp atl avd @@ -57434,12 +57537,12 @@ aqh agw apc asZ -aVy +anN aVO ate -aop -aZg -bda +ate +baB +asD baM api atf @@ -57452,10 +57555,10 @@ bfZ aHy bee aCT -aIl +cGs aHs baA -aIN +aIl aIO bgD asX @@ -57576,18 +57679,18 @@ aqi apc apc avg -aVy +anN aVO ate -aop +ate baB -aru +awv asw beF -anj +bda atO +soG anj -awc bfe avy bgf @@ -57598,7 +57701,7 @@ aIl aHB aJv aIH -aIO +jRO bcc bdM bdQ @@ -57728,10 +57831,10 @@ beu aqY anj anj +oII anj -aGh aLc -avo +wBv avz avM asX @@ -57872,7 +57975,7 @@ azZ atJ atQ bfd -awc +anj avm avz avM @@ -58007,14 +58110,14 @@ aVO bdB ayL baP -aru +avp asL bdx bez beI bgn aKu -awc +anj avo avz avM @@ -58149,14 +58252,14 @@ aVO ate aFK bbI -aru +avp aCq -beH +baq atM -atL +bgx aBx -bfn -aLc +baq +anj avo avz avM @@ -58294,11 +58397,11 @@ aru aru aKy beH -anj +bfn baq bgp baE -awc +aLc axt avA aCi @@ -58432,17 +58535,17 @@ aWE aWE beE beM -aru +amY ani -bcf -bdE anj -baq -bgp -baE -awv -aru -aru +bgx +anj +bgx +nXZ +bgx +anj +wju +bsa aru bgj aET @@ -58575,16 +58678,16 @@ beC beK bcN bcg -anN +anj atA aAL -avL +anj aGi bgq bgr anj -aZX -baO +anj +anj aru avJ aIM @@ -58716,15 +58819,15 @@ aVP aVP aFS beO -amY +aru +aES +aIN +aCf +anj +bgx +nXZ baq anj -aCf -aru -bgx -anj -baE -bgs anj anj bcu @@ -58858,13 +58961,13 @@ aVy aVy aop aKm -aru -asM -anj +avL +atA +aZX aBD -aES -aGr anj +bgx +rBz bew bfp bfl @@ -59145,10 +59248,10 @@ awQ aru bgt bbm -baX -anj +bcf +bgs bch -anj +sts aru bge bfm