diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 804b0f5e667a..f22c3e9f4a85 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -10726,7 +10726,7 @@ /area/awaymission/snowdin/post/mining_main) "IV" = ( /obj/structure/table, -/obj/machinery/microwave/engineering/cell_included, +/obj/machinery/microwave, /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/awaymission/snowdin/post/mining_main) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 7525d08afa85..5221b2baca40 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -980,6 +980,12 @@ }, /turf/open/floor/iron, /area/station/maintenance/port) +"agg" = ( +/obj/machinery/computer/mechpad, +/obj/effect/turf_decal/bot, +/obj/structure/sign/poster/official/build/directional/north, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "agh" = ( /obj/structure/rack, /obj/item/circuitboard/machine/teleporter_hub{ @@ -1584,6 +1590,24 @@ }, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"amx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/photocopier/prebuilt, +/obj/machinery/button/door/directional/east{ + id = "left_arrivals_shutters"; + name = "Left Arrivals Hallway Shutters"; + pixel_y = 6 + }, +/obj/machinery/button/door/directional/east{ + id = "right_arrivals_shutters"; + name = "Right Arrivals Hallway Shutters"; + pixel_y = -4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/fore) "amB" = ( /obj/structure/sign/warning/electric_shock{ pixel_y = -32 @@ -2422,6 +2446,18 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"atV" = ( +/obj/machinery/restaurant_portal/bar, +/obj/effect/turf_decal/delivery/red, +/obj/machinery/light_switch/directional/south{ + pixel_x = 8 + }, +/obj/effect/turf_decal/tile/red/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/turf/open/floor/iron, +/area/station/commons/lounge) "aue" = ( /obj/machinery/camera/directional/north{ c_tag = "Chapel - Confessional"; @@ -2605,11 +2641,6 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"awY" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/checker, -/area/station/hallway/secondary/service) "axa" = ( /obj/structure/filingcabinet/chestdrawer, /obj/effect/turf_decal/bot, @@ -3599,6 +3630,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"aJR" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "aJU" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -8517,6 +8555,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/detectives_office) +"bJm" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/status_display/ai/directional/north, +/obj/structure/reagent_dispensers/wall/peppertank/directional/east, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/dark, +/area/station/security/detectives_office) "bJn" = ( /obj/structure/rack, /obj/item/storage/briefcase{ @@ -9372,6 +9419,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"bPW" = ( +/obj/machinery/defibrillator_mount/directional/south, +/obj/item/emergency_bed{ + pixel_y = 6 + }, +/obj/item/emergency_bed{ + pixel_y = 11 + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "bPZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12173,13 +12233,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/port) -"ckO" = ( -/obj/item/storage/box/rxglasses, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "cla" = ( /obj/structure/sign/warning/electric_shock/directional/south, /obj/structure/cable, @@ -13438,13 +13491,6 @@ }, /turf/open/floor/wood, /area/station/engineering/break_room) -"cwC" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/office) "cwF" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -14000,12 +14046,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) -"cCA" = ( -/obj/machinery/light_switch/directional/north, -/obj/machinery/photocopier/prebuilt, -/obj/machinery/light/directional/north, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain) "cCC" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/opposingcorners, @@ -14069,6 +14109,16 @@ }, /turf/open/floor/iron, /area/station/medical/paramedic) +"cDo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "cDp" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14677,16 +14727,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/command/gateway) -"cLt" = ( -/obj/machinery/duct, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/secondary/exit/departure_lounge) "cLu" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -16998,12 +17038,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/main) -"dcb" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/service/library) "dce" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -17361,18 +17395,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/library) -"ddc" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/photocopier/prebuilt, -/obj/item/newspaper{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/newspaper, -/turf/open/floor/plating, -/area/station/security/detectives_office/private_investigators_office) "ddd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17531,6 +17553,15 @@ /obj/structure/sink/directional/west, /turf/open/floor/iron, /area/station/maintenance/department/science) +"ddU" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/science/research) "ddW" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/warning{ @@ -17744,15 +17775,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/science/lab) -"dfw" = ( -/obj/item/stack/medical/wrap/gauze, -/obj/item/stack/medical/mesh, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/north, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "dfx" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -17763,19 +17785,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"dfz" = ( -/obj/item/stack/medical/wrap/gauze, -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Treatment Center"; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/stack/medical/suture, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "dfD" = ( /obj/effect/spawner/random/vending/snackvend, /obj/effect/turf_decal/bot, @@ -17946,17 +17955,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/service/chapel) -"dgV" = ( -/obj/effect/landmark/start/hangover, -/obj/structure/table/wood, -/obj/machinery/door/firedoor, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 6 - }, -/turf/open/floor/iron/dark/smooth_half{ - dir = 1 - }, -/area/station/service/bar) "dgX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -18225,19 +18223,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"div" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "dix" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/grimy, @@ -18378,13 +18363,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/station/maintenance/fore) -"djk" = ( -/obj/machinery/computer/operating, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/obj/machinery/vitals_reader/directional/north, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "djo" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -18763,6 +18741,16 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"dlN" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Central Hallway"; + dir = 9; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/medical/medbay) "dlO" = ( /turf/closed/wall/r_wall, /area/station/security/checkpoint/medical/medsci) @@ -19167,15 +19155,6 @@ /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"dod" = ( -/obj/structure/rack, -/obj/item/holosign_creator/robot_seat/restaurant{ - pixel_y = -5 - }, -/obj/effect/turf_decal/bot, -/obj/item/toy/figure/chef, -/turf/open/floor/iron/dark, -/area/station/service/kitchen) "doi" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/oil, @@ -19443,19 +19422,6 @@ }, /turf/open/floor/iron/large, /area/station/science/research) -"dqC" = ( -/obj/machinery/defibrillator_mount/directional/south, -/obj/item/emergency_bed{ - pixel_y = 6 - }, -/obj/item/emergency_bed{ - pixel_y = 11 - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "dqL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -21539,6 +21505,18 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) +"dEj" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cafe_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen, +/turf/open/floor/iron/white/smooth_corner{ + dir = 8 + }, +/area/station/service/kitchen) "dEk" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/dresser, @@ -22808,21 +22786,6 @@ dir = 1 }, /area/station/medical/morgue) -"dNS" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "dNT" = ( /obj/effect/turf_decal/trimline/neutral/mid_joiner{ dir = 4 @@ -24980,11 +24943,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"efv" = ( -/obj/machinery/photocopier/prebuilt, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/carpet/royalblack, -/area/station/service/chapel/office) "efw" = ( /obj/structure/sign/nanotrasen{ pixel_y = 32 @@ -25219,20 +25177,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/virology) -"eiY" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Engineering Hallway - Starboard"; - name = "hallway camera" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "ejc" = ( /turf/open/floor/iron/chapel{ dir = 8 @@ -26688,6 +26632,12 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/commons/toilet/restrooms) +"eFi" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave, +/obj/structure/sign/poster/random/directional/west, +/turf/open/floor/wood, +/area/station/engineering/break_room) "eFk" = ( /obj/structure/cable, /obj/machinery/door/window/brigdoor/right/directional/south{ @@ -28310,12 +28260,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"fbP" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave/engineering/cell_included, -/obj/structure/sign/poster/random/directional/west, -/turf/open/floor/wood, -/area/station/engineering/break_room) "fbS" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -28508,15 +28452,23 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay) -"ffb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 +"ffd" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/requests_console/directional/north{ + department = "Head of Security's Desk"; + name = "Head of Security's Requests Console" }, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) +/obj/effect/mapping_helpers/requests_console/announcement, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/structure/sign/nanotrasen{ + pixel_x = 32; + pixel_y = 32 + }, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hos) "ffk" = ( /obj/machinery/airalarm/directional/west, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -30246,6 +30198,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"fDN" = ( +/obj/item/stack/medical/wrap/gauze, +/obj/machinery/camera/directional/north{ + c_tag = "Medbay - Treatment Center"; + name = "medbay camera"; + network = list("ss13","medbay") + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/stack/medical/suture, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "fDU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -30504,15 +30469,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) -"fHz" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot_white, -/obj/machinery/vitals_reader/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "fHF" = ( /obj/machinery/meter, /obj/machinery/atmospherics/pipe/smart/manifold/cyan/visible{ @@ -32231,6 +32187,19 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"gke" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "gko" = ( /obj/structure/sign/poster/random/directional/west, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -32442,13 +32411,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/station/medical/virology) -"gno" = ( -/obj/machinery/restaurant_portal/restaurant, -/obj/effect/turf_decal/delivery/red, -/obj/item/radio/intercom/directional/west, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/white/smooth_large, -/area/station/service/cafeteria) "gnq" = ( /obj/structure/rack, /obj/item/wrench, @@ -32583,6 +32545,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"goP" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/checker, +/area/station/hallway/secondary/service) "goR" = ( /obj/structure/lattice/catwalk, /turf/open/space, @@ -35049,6 +35016,21 @@ /obj/machinery/status_display/evac/directional/east, /turf/open/floor/iron, /area/station/science/robotics/lab) +"gYh" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "gYj" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -40020,6 +40002,16 @@ /obj/machinery/portable_atmospherics/canister/carbon_dioxide, /turf/open/floor/engine/co2, /area/station/engineering/atmos) +"ikX" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "ild" = ( /obj/structure/chair/wood{ dir = 8 @@ -40919,6 +40911,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"izv" = ( +/obj/effect/landmark/start/hangover, +/obj/structure/table/wood, +/obj/machinery/door/firedoor, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 6 + }, +/turf/open/floor/iron/dark/smooth_half{ + dir = 1 + }, +/area/station/service/bar) "izB" = ( /obj/machinery/newscaster/directional/west, /obj/structure/cable, @@ -41264,14 +41267,6 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/qm) -"iDB" = ( -/obj/machinery/atmospherics/components/unary/bluespace_sender, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/radio/intercom/directional/east, -/turf/open/floor/iron/textured, -/area/station/engineering/atmos) "iDG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -41700,6 +41695,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"iKf" = ( +/obj/machinery/photocopier/prebuilt, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/carpet/royalblack, +/area/station/service/chapel/office) "iKm" = ( /obj/effect/turf_decal/siding/white{ dir = 9 @@ -42179,6 +42179,14 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron, /area/station/engineering/main) +"iRp" = ( +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "iRw" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -42943,13 +42951,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"jey" = ( -/obj/structure/mannequin/skeleton, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "jeI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -42969,14 +42970,6 @@ }, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"jfu" = ( -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "jfA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/grimy, @@ -43948,11 +43941,6 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) -"juJ" = ( -/obj/effect/turf_decal/stripes/white/line, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood, -/area/station/engineering/break_room) "jvc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/office, @@ -44219,6 +44207,16 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/virology) +"jyW" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "jzr" = ( /obj/item/storage/box/lights/mixed, /obj/structure/rack, @@ -44357,13 +44355,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"jBN" = ( -/obj/machinery/photocopier/prebuilt, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/box/white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/ce) "jBO" = ( /obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ @@ -44583,15 +44574,6 @@ /obj/structure/sign/warning/no_smoking, /turf/closed/wall, /area/station/engineering/main) -"jEL" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/machinery/status_display/evac/directional/north, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/medical/morgue) "jEN" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/north, /obj/machinery/camera/directional/north{ @@ -45136,15 +45118,6 @@ }, /turf/open/floor/iron, /area/station/tcommsat/server) -"jMB" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/central/fore) "jMD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -45246,6 +45219,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"jNF" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/service/library) "jNV" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -45603,6 +45582,14 @@ "jTi" = ( /turf/closed/wall, /area/station/engineering/break_room) +"jTk" = ( +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/textured, +/area/station/engineering/atmos) "jTo" = ( /obj/structure/sink/kitchen/directional/south, /turf/open/floor/iron/cafeteria, @@ -46606,6 +46593,18 @@ /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, /area/station/engineering/atmos) +"khe" = ( +/obj/machinery/defibrillator_mount/directional/north, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "khf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -48890,15 +48889,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/theater) -"kPo" = ( -/obj/machinery/firealarm/directional/east, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/iron, -/area/station/medical/storage) "kPq" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, @@ -50677,6 +50667,18 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/electronic_marketing_den) +"loW" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/photocopier/prebuilt, +/obj/item/newspaper{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/newspaper, +/turf/open/floor/plating, +/area/station/security/detectives_office/private_investigators_office) "loX" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -50871,6 +50873,14 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/large, /area/station/science/research) +"lrF" = ( +/obj/item/kirbyplants/random, +/obj/machinery/bluespace_vendor/directional/east, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/yellow/opposingcorners, +/obj/machinery/light/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "lrL" = ( /obj/structure/chair, /obj/effect/landmark/start/hangover, @@ -51855,6 +51865,11 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/commons/storage/tools) +"lEN" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain/private) "lES" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 @@ -52602,6 +52617,13 @@ dir = 1 }, /area/station/commons/fitness/recreation) +"lRC" = ( +/obj/item/storage/box/rxglasses, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "lRD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment{ @@ -52632,16 +52654,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/maintenance/disposal) -"lSf" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Medbay - Central Hallway"; - dir = 9; - name = "medbay camera"; - network = list("ss13","medbay") - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/medical/medbay) "lSl" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -52660,6 +52672,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/security) +"lSF" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/computer/security/telescreen/entertainment/directional/north, +/turf/open/floor/wood/large, +/area/station/service/library) "lSI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/chair/office{ @@ -53682,16 +53699,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction) -"mgF" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/customs/aft) "mgK" = ( /obj/effect/decal/cleanable/blood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53927,6 +53934,15 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"mke" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/obj/machinery/vitals_reader/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "mkl" = ( /obj/machinery/atmospherics/pipe/layer_manifold/green/visible, /obj/machinery/status_display/evac/directional/west, @@ -54452,12 +54468,6 @@ }, /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) -"mrX" = ( -/obj/machinery/mechpad, -/obj/effect/turf_decal/bot, -/obj/structure/sign/warning/secure_area/directional/north, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "mrY" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -55085,23 +55095,6 @@ dir = 8 }, /area/station/security/medical) -"mCp" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/requests_console/directional/north{ - department = "Head of Security's Desk"; - name = "Head of Security's Requests Console" - }, -/obj/effect/mapping_helpers/requests_console/announcement, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/structure/sign/nanotrasen{ - pixel_x = 32; - pixel_y = 32 - }, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hos) "mCs" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 4 @@ -56406,6 +56399,16 @@ /obj/structure/closet/firecloset, /turf/open/floor/iron, /area/station/engineering/main) +"mUF" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/bot_white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/customs/aft) "mUZ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" @@ -56673,6 +56676,12 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/command/heads_quarters/rd) +"mYI" = ( +/obj/machinery/light_switch/directional/north, +/obj/machinery/photocopier/prebuilt, +/obj/machinery/light/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/captain) "mYQ" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/newscaster/directional/west, @@ -57081,6 +57090,15 @@ "nfb" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) +"nfh" = ( +/obj/item/stack/medical/wrap/gauze, +/obj/item/stack/medical/mesh, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "nfp" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -57166,11 +57184,6 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"ngv" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/computer/security/telescreen/entertainment/directional/north, -/turf/open/floor/wood/large, -/area/station/service/library) "ngy" = ( /obj/structure/closet/emcloset/anchored, /obj/effect/turf_decal/bot, @@ -57545,18 +57558,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron, /area/station/command/teleporter) -"nls" = ( -/obj/machinery/defibrillator_mount/directional/north, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/masks, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "nly" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59033,14 +59034,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"nHU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/west, -/obj/structure/chair/stool/directional/east, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "nHW" = ( /obj/machinery/hydroponics/soil, /obj/effect/decal/cleanable/dirt, @@ -60629,6 +60622,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"ocD" = ( +/obj/machinery/photocopier/prebuilt, +/obj/structure/sign/poster/official/work_for_a_future/directional/east, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "ocM" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -64278,16 +64276,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/science) -"paN" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "paR" = ( /obj/structure/cable, /turf/open/floor/iron/grimy, @@ -65531,6 +65519,15 @@ /obj/machinery/camera/directional/south, /turf/open/floor/iron/dark, /area/station/security/mechbay) +"pvs" = ( +/obj/machinery/firealarm/directional/east, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/iron, +/area/station/medical/storage) "pvy" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -65669,22 +65666,19 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron, /area/station/medical/virology) +"pxw" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/central/fore) "pxF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) -"pxG" = ( -/obj/machinery/defibrillator_mount/directional/north, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/syringe, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "pxU" = ( /obj/structure/table/reinforced, /obj/item/stack/sheet/iron/fifty, @@ -65898,27 +65892,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/command/bridge) -"pCu" = ( -/obj/structure/table/reinforced, -/obj/item/tank/internals/anesthetic{ - pixel_x = 3 - }, -/obj/item/tank/internals/anesthetic, -/obj/item/tank/internals/anesthetic{ - pixel_x = -3 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/door/window/left/directional/north{ - name = "Surgical Supplies"; - req_access = list("surgery") - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/item/clothing/mask/muzzle/breath, -/obj/item/clothing/mask/muzzle/breath, -/obj/item/clothing/mask/muzzle/breath, -/turf/open/floor/iron/dark, -/area/station/medical/surgery/theatre) "pCH" = ( /obj/machinery/computer/security{ dir = 4 @@ -66222,6 +66195,15 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/captain) +"pGC" = ( +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/obj/machinery/status_display/evac/directional/north, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/medical/morgue) "pGD" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -66682,6 +66664,13 @@ /obj/effect/mapping_helpers/airlock/access/any/service/maintenance, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) +"pNj" = ( +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "pNm" = ( /obj/structure/chair/office{ dir = 8 @@ -67105,17 +67094,6 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/commons/locker) -"pSD" = ( -/obj/vehicle/ridden/wheelchair{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/textured, -/area/station/medical/medbay) "pSE" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, @@ -67224,6 +67202,27 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"pUq" = ( +/obj/structure/table/reinforced, +/obj/item/tank/internals/anesthetic{ + pixel_x = 3 + }, +/obj/item/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic{ + pixel_x = -3 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/door/window/left/directional/north{ + name = "Surgical Supplies"; + req_access = list("surgery") + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/item/clothing/mask/muzzle/breath, +/obj/item/clothing/mask/muzzle/breath, +/obj/item/clothing/mask/muzzle/breath, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "pUv" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -67743,6 +67742,14 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/escape) +"qcI" = ( +/obj/effect/turf_decal/siding/thinplating/dark/corner, +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/dark_blue/filled/corner, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "qcT" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -68074,15 +68081,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"qgM" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/status_display/ai/directional/north, -/obj/structure/reagent_dispensers/wall/peppertank/directional/east, -/obj/effect/turf_decal/bot_white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, -/area/station/security/detectives_office) "qgN" = ( /obj/structure/table, /obj/effect/spawner/random/entertainment/drugs{ @@ -68407,6 +68405,15 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/port) +"qkE" = ( +/obj/structure/rack, +/obj/item/holosign_creator/robot_seat/restaurant{ + pixel_y = -5 + }, +/obj/effect/turf_decal/bot, +/obj/item/toy/figure/chef, +/turf/open/floor/iron/dark, +/area/station/service/kitchen) "qkN" = ( /obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible, /obj/effect/turf_decal/stripes/line{ @@ -69246,6 +69253,13 @@ dir = 8 }, /area/station/science/lobby) +"qxW" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/delivery/red, +/obj/item/radio/intercom/directional/west, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/cafeteria) "qxZ" = ( /obj/structure/railing, /obj/effect/decal/cleanable/dirt, @@ -69354,13 +69368,6 @@ /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"qzV" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/heads_quarters/qm) "qAm" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -70138,6 +70145,11 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/science) +"qKC" = ( +/obj/effect/turf_decal/stripes/white/line, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood, +/area/station/engineering/break_room) "qKF" = ( /obj/structure/chair{ dir = 4 @@ -70250,18 +70262,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) -"qMt" = ( -/obj/machinery/restaurant_portal/bar, -/obj/effect/turf_decal/delivery/red, -/obj/machinery/light_switch/directional/south{ - pixel_x = 8 - }, -/obj/effect/turf_decal/tile/red/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/turf/open/floor/iron, -/area/station/commons/lounge) "qMA" = ( /obj/structure/table/wood, /obj/item/papercutter{ @@ -70317,14 +70317,6 @@ /obj/structure/flora/bush/leavy/style_random, /turf/open/misc/grass, /area/station/hallway/primary/fore) -"qNz" = ( -/obj/item/kirbyplants/random, -/obj/machinery/bluespace_vendor/directional/east, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/tile/yellow/opposingcorners, -/obj/machinery/light/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "qNE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70907,17 +70899,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/primary) -"qVD" = ( -/obj/structure/sign/poster/official/report_crimes/directional/north, -/obj/structure/closet/secure_closet/personal/cabinet, -/obj/item/clothing/head/fedora{ - icon_state = "detective" - }, -/obj/item/clothing/gloves/color/black, -/obj/effect/mapping_helpers/broken_floor, -/obj/item/clothing/suit/jacket/leather_trenchcoat, -/turf/open/floor/wood, -/area/station/security/detectives_office/private_investigators_office) "qVG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, @@ -72372,18 +72353,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"rqW" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cafe_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/displaycase/forsale/kitchen, -/turf/open/floor/iron/white/smooth_corner{ - dir = 8 - }, -/area/station/service/kitchen) "rrb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/maintenance_hatch{ @@ -72573,15 +72542,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"rts" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/bluespace_vendor/directional/east, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "rtx" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass{ @@ -72878,6 +72838,12 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron/white, /area/station/medical/storage) +"ryp" = ( +/obj/machinery/mechpad, +/obj/effect/turf_decal/bot, +/obj/structure/sign/warning/secure_area/directional/north, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "ryt" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -73326,13 +73292,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) -"rFl" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/grimy, -/area/station/commons/vacant_room/office) "rFw" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm/directional/east, @@ -73927,6 +73886,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"rPg" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/broken/directional/south, +/turf/open/floor/plating, +/area/station/service/library/abandoned) "rPv" = ( /obj/structure/cable, /obj/effect/landmark/start/paramedic, @@ -75589,6 +75554,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"snO" = ( +/obj/machinery/computer/operating, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot_white, +/obj/machinery/vitals_reader/directional/north, +/turf/open/floor/iron/dark, +/area/station/medical/surgery/theatre) "snS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -77103,6 +77075,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/kitchen/abandoned) +"sKa" = ( +/obj/structure/cable, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood, +/area/station/command/meeting_room/council) "sKd" = ( /obj/effect/spawner/random/trash/box, /obj/effect/spawner/random/food_or_drink/seed, @@ -77297,14 +77274,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/maintenance/department/security) -"sNP" = ( -/obj/machinery/newscaster/directional/east, -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/bot_white, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/office) "sOa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -78609,6 +78578,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"tiI" = ( +/obj/machinery/newscaster/directional/east, +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/bot_white, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/security/office) "tiJ" = ( /obj/structure/filingcabinet/filingcabinet, /obj/machinery/airalarm/directional/north, @@ -79494,16 +79471,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/station/medical/medbay) -"txb" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/yellow{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "txe" = ( /obj/machinery/computer/station_alert{ dir = 8 @@ -79953,11 +79920,6 @@ /obj/effect/decal/cleanable/oil, /turf/open/floor/iron, /area/station/cargo/sorting) -"tEq" = ( -/obj/machinery/photocopier/prebuilt, -/obj/structure/sign/poster/official/work_for_a_future/directional/east, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "tEw" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -79978,6 +79940,14 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"tEy" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/camera/directional/east{ + c_tag = "Lawyer's Office" + }, +/turf/open/floor/wood, +/area/station/service/lawoffice) "tEB" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -80430,24 +80400,6 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"tKp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/photocopier/prebuilt, -/obj/machinery/button/door/directional/east{ - id = "left_arrivals_shutters"; - name = "Left Arrivals Hallway Shutters"; - pixel_y = 6 - }, -/obj/machinery/button/door/directional/east{ - id = "right_arrivals_shutters"; - name = "Right Arrivals Hallway Shutters"; - pixel_y = -4 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/customs/fore) "tKq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/circuit/green, @@ -80479,14 +80431,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/security/prison/visit) -"tKM" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/status_display/evac/directional/east, -/obj/machinery/camera/directional/east{ - c_tag = "Lawyer's Office" - }, -/turf/open/floor/wood, -/area/station/service/lawoffice) "tKN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -80592,6 +80536,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/genetics) +"tMm" = ( +/obj/machinery/photocopier/prebuilt, +/obj/item/radio/intercom/directional/south, +/obj/effect/turf_decal/box/white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/ce) "tMt" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer2{ dir = 6 @@ -82850,6 +82801,17 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison) +"uub" = ( +/obj/vehicle/ridden/wheelchair{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/light/small/directional/east, +/turf/open/floor/iron/textured, +/area/station/medical/medbay) "uui" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random/directional/south, @@ -83172,6 +83134,13 @@ }, /turf/open/floor/iron/white, /area/station/maintenance/fore) +"uyC" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/grimy, +/area/station/commons/vacant_room/office) "uyF" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -83440,13 +83409,6 @@ /obj/item/paper/fluff/holodeck/disclaimer, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) -"uBh" = ( -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron, -/area/station/medical/treatment_center) "uBn" = ( /obj/effect/landmark/event_spawn, /obj/machinery/light_switch/directional/north{ @@ -84060,11 +84022,6 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/commons/storage/primary) -"uJS" = ( -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "uKa" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 @@ -84284,6 +84241,13 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/engineering/main) +"uOw" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/heads_quarters/qm) "uOJ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84485,11 +84449,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/office) -"uRY" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/turf/open/floor/wood, -/area/station/command/heads_quarters/captain/private) "uSa" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -84693,6 +84652,15 @@ }, /turf/open/floor/iron/white, /area/station/medical/paramedic) +"uVq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "uVx" = ( /obj/structure/sink/directional/west, /obj/machinery/light_switch/directional/east, @@ -85170,11 +85138,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) -"vbB" = ( -/obj/structure/cable, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood, -/area/station/command/meeting_room/council) "vbE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -87156,15 +87119,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"vFn" = ( -/obj/machinery/firealarm/directional/east, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/science/research) "vFo" = ( /obj/item/reagent_containers/condiment/enzyme{ layer = 5 @@ -88982,6 +88936,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/bridge) +"wes" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/west, +/obj/structure/chair/stool/directional/east, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/commons/locker) "wet" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -89100,14 +89062,6 @@ }, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"wfS" = ( -/obj/effect/turf_decal/siding/thinplating/dark/corner, -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/corner, -/turf/open/floor/iron/dark, -/area/station/medical/morgue) "wfX" = ( /obj/structure/table/reinforced, /obj/item/stack/package_wrap, @@ -89223,6 +89177,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"whQ" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "whX" = ( /obj/structure/table, /obj/item/computer_disk{ @@ -89432,6 +89391,20 @@ /obj/structure/sign/poster/official/science/directional/west, /turf/open/floor/iron/white, /area/station/science/lobby) +"wkE" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Engineering Hallway - Starboard"; + name = "hallway camera" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/yellow{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "wkG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -89527,6 +89500,18 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/half, /area/station/engineering/main) +"wmc" = ( +/obj/machinery/defibrillator_mount/directional/north, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/masks, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron, +/area/station/medical/treatment_center) "wmf" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -90123,6 +90108,15 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/dark, /area/station/service/theater) +"wvd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/bluespace_vendor/directional/east, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "wvy" = ( /obj/structure/displaycase_chassis, /obj/effect/decal/cleanable/dirt, @@ -90937,6 +90931,16 @@ /obj/effect/spawner/random/trash/grille_or_waste, /turf/open/floor/plating, /area/station/maintenance/fore) +"wFJ" = ( +/obj/machinery/duct, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) "wFK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -91771,6 +91775,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"wPU" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/office) "wPX" = ( /obj/structure/table/wood, /obj/item/pai_card, @@ -93656,12 +93667,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/service/barber) -"xpC" = ( -/obj/machinery/computer/mechpad, -/obj/effect/turf_decal/bot, -/obj/structure/sign/poster/official/build/directional/north, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "xpD" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -94149,16 +94154,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison) -"xwl" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "xwR" = ( /obj/machinery/quantum_server, /obj/effect/turf_decal/bot/left, @@ -94821,6 +94816,17 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted, /turf/open/floor/iron, /area/station/commons/dorms) +"xGv" = ( +/obj/structure/sign/poster/official/report_crimes/directional/north, +/obj/structure/closet/secure_closet/personal/cabinet, +/obj/item/clothing/head/fedora{ + icon_state = "detective" + }, +/obj/item/clothing/gloves/color/black, +/obj/effect/mapping_helpers/broken_floor, +/obj/item/clothing/suit/jacket/leather_trenchcoat, +/turf/open/floor/wood, +/area/station/security/detectives_office/private_investigators_office) "xGw" = ( /obj/effect/landmark/start/hangover, /obj/effect/decal/cleanable/dirt, @@ -95337,12 +95343,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"xOy" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/light/small/broken/directional/south, -/turf/open/floor/plating, -/area/station/service/library/abandoned) "xOD" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -96028,13 +96028,6 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/station/engineering/supermatter/room) -"xYF" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "xYJ" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/trimline/neutral, @@ -96675,6 +96668,13 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"ygX" = ( +/obj/structure/mannequin/skeleton, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/morgue) "yhc" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -119287,7 +119287,7 @@ tcm rjj oVq kPH -fbP +eFi wBS ima rQB @@ -120060,7 +120060,7 @@ qVS kPH pqg cwz -juJ +qKC goG fLB rtP @@ -120329,7 +120329,7 @@ foo pQg oFe ibr -jBN +tMm xPF gIV pIG @@ -121073,7 +121073,7 @@ nfp pJT nfp dVM -iDB +jTk mFY rPb iUC @@ -125712,7 +125712,7 @@ bsr bui dhj bvu -rts +wvd ocb uLs bEM @@ -127780,7 +127780,7 @@ eVC ttg lqK sPw -txb +ikX bWD uxO sUE @@ -128107,7 +128107,7 @@ sKr uDH mvJ sHV -xOy +rPg ert ert ert @@ -128551,7 +128551,7 @@ alf alf alf alf -eiY +wkE bWD uxO xpB @@ -128782,7 +128782,7 @@ fQS pVs fQS hrf -dod +qkE fMz eFQ pzC @@ -129032,8 +129032,8 @@ rHU exj jRP vTb -gno -rqW +qxW +dEj qsY mLG pvk @@ -129072,7 +129072,7 @@ pQc fAP kOH lKp -mrX +ryp pRi vHf tZn @@ -129329,7 +129329,7 @@ pQc qRg akz lKp -xpC +agg eIL sxw sxw @@ -129360,7 +129360,7 @@ rkE cZa daE dct -vFn +ddU dFu jpO dhX @@ -130080,7 +130080,7 @@ vzA tCD xFX oky -rFl +uyC alf ghU alf @@ -132146,7 +132146,7 @@ fhT lRN uKR tZP -vbB +sKa pTo kcH wpW @@ -132174,7 +132174,7 @@ rFW tVn vhK jJG -ffb +uVq irp lTm fzO @@ -132633,7 +132633,7 @@ vQa wCG haD rBS -qMt +atV pwZ oSv qcp @@ -133916,7 +133916,7 @@ vfc hiM hXa vKb -dgV +izv aXI unM pwZ @@ -133956,7 +133956,7 @@ wVf sDz fOk xwZ -tEq +ocD wVo iYA reS @@ -134958,7 +134958,7 @@ ebo iHL jnG iHL -jMB +pxw nmC iIE twc @@ -135440,14 +135440,14 @@ fIY dMr arM uYz -xYF +aJR wKe wKe wKe wKe liV wKe -awY +goP vTS wKe qFH @@ -135540,7 +135540,7 @@ dlO duZ dsl duZ -lSf +dlN qrs dgR din @@ -136300,7 +136300,7 @@ odA tOF sNh ghw -pSD +uub whw bCf wCD @@ -136324,7 +136324,7 @@ vRm kUT kgt lmf -jEL +pGC gom kvi iyV @@ -136814,14 +136814,14 @@ cZp dbb dcN whw -pxG -uBh +khe +pNj dip dba wHY nAG -uBh -dqC +pNj +bPW sdI hpY ntV @@ -136836,9 +136836,9 @@ rub bDu jcE xfD -pCu +pUq lmf -dNS +gYh gom hPf vwC @@ -137071,7 +137071,7 @@ cZp dbc lYb whw -dfw +nfh dip diq dkg @@ -137356,7 +137356,7 @@ prY sJb dNx qtF -wfS +qcI lmf xlH xlH @@ -137772,7 +137772,7 @@ eqO wAv rzu duL -cwC +wPU pzB eDV llC @@ -137866,7 +137866,7 @@ dVm dVm aEi lmf -jey +ygX heX xVq sUz @@ -138002,7 +138002,7 @@ fIY akj akE alB -tKp +amx anx fiW vKY @@ -138055,7 +138055,7 @@ xTi pjP vfg glH -cCA +mYI lrp ilY gaN @@ -138063,7 +138063,7 @@ fwz jpd wQc rWM -uRY +lEN vtq lIk hft @@ -138118,10 +138118,10 @@ sdI pDJ dES eOx -djk +snO dCy mQc -fHz +mke lmf dNT cjY @@ -138241,7 +138241,7 @@ abi abi abi abi -qNz +lrF afc sFx mOC @@ -138356,16 +138356,16 @@ mOg dbh dcT whw -dfz +fDN dha dit pfC hPQ dnl eps -ckO +lRC sdI -kPo +pvs ong ldP aAm @@ -138599,7 +138599,7 @@ hff vto hxB vZj -xwl +cDo irp iJj cmm @@ -138613,8 +138613,8 @@ tHg wmA tHg wmA -nls -jfu +wmc +iRp diu ndH bXP @@ -138872,7 +138872,7 @@ bHL wmA wmA wmA -div +gke tqE qHl dpo @@ -139411,7 +139411,7 @@ bEA bEA cfQ bEA -cLt +wFJ hWZ rhA bNS @@ -141419,7 +141419,7 @@ csK cuu xaV tmP -uJS +whQ pwW pwW pkS @@ -141450,7 +141450,7 @@ jSo sec sec sec -ddc +loW nSm txo qfr @@ -142221,7 +142221,7 @@ wJy icy dsF sec -qVD +xGv fav dxG aJh @@ -142229,7 +142229,7 @@ sgL iBN fIV uDa -mgF +mUF oLE ubA vyC @@ -142398,7 +142398,7 @@ wvS tLy viJ nRx -qzV +uOw sqj eEM xAE @@ -143997,7 +143997,7 @@ mag nvx nvx xWC -ngv +lSF sNF cNN gFe @@ -144993,7 +144993,7 @@ aaa aaa aaa bHr -qgM +bJm xXz bNd bPk @@ -145311,7 +145311,7 @@ gaw doA jzr sec -efv +iKf xPr dmV aHu @@ -145550,7 +145550,7 @@ dbw cYc qRO qRO -dcb +jNF hWD xjz qMA @@ -145770,14 +145770,14 @@ oGt uLM bRn bHr -paN +jyW bXx szt fof fjU xKt pcN -tKM +tEy rCa qmf pNK @@ -145791,7 +145791,7 @@ iFs bdl ffY mDs -nHU +wes kea fAX bBD @@ -151404,7 +151404,7 @@ aaa aaa tuZ dIz -sNP +tiI uRO kmY ums @@ -152945,7 +152945,7 @@ aad aaa aad arn -mCp +ffd mqy lrZ jML diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 122d798bf559..785ebaa3b328 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -157,18 +157,6 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/commons/fitness) -"ade" = ( -/obj/structure/table/glass, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/syringe, -/obj/effect/turf_decal/tile/blue/full, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "adq" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -192,6 +180,11 @@ }, /turf/open/floor/plating, /area/station/science/xenobiology) +"adZ" = ( +/obj/effect/turf_decal/tile/brown/fourcorners, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) "aee" = ( /obj/structure/ladder, /obj/effect/mapping_helpers/broken_floor, @@ -1566,17 +1559,6 @@ }, /turf/open/lava/plasma/ice_moon, /area/icemoon/underground/explored) -"ayI" = ( -/obj/structure/chair/sofa/corp/right{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/light/small/directional/east, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "ayR" = ( /obj/machinery/airalarm/directional/east, /obj/structure/extinguisher_cabinet/directional/north, @@ -2149,6 +2131,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"aJs" = ( +/obj/machinery/restaurant_portal/bar, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) "aJu" = ( /obj/machinery/light/small/directional/east, /obj/machinery/space_heater, @@ -2312,10 +2299,6 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/wood, /area/station/commons/vacant_room/office) -"aLV" = ( -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "aLX" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -3508,6 +3491,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/prison/rec) +"bdq" = ( +/obj/machinery/camera{ + c_tag = "Medbay Stasis Center North"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "bdr" = ( /obj/effect/turf_decal/trimline/green/filled/line, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -4749,6 +4743,11 @@ }, /turf/open/floor/plating, /area/station/engineering/atmos/pumproom) +"bur" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/delivery/red, +/turf/open/floor/wood/parquet, +/area/station/service/bar/atrium) "buv" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ color = "#ff0000"; @@ -4848,6 +4847,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"bvL" = ( +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 9 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark/textured, +/area/station/medical/treatment_center) "bvS" = ( /obj/structure/ladder, /obj/effect/decal/cleanable/dirt, @@ -5123,13 +5130,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"bzI" = ( -/obj/machinery/bluespace_vendor/directional/west, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "bzJ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/camera/directional/north{ @@ -6865,16 +6865,6 @@ /obj/effect/spawner/random/techstorage/ai_all, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"bXI" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron/dark/textured_edge{ - dir = 1 - }, -/area/station/security/prison) "bXL" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/white, @@ -7699,6 +7689,16 @@ /obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"cjl" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "cjz" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/rack, @@ -8474,6 +8474,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"cuW" = ( +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron/dark, +/area/station/science/breakroom) "cvg" = ( /obj/effect/mapping_helpers/trapdoor_placer, /obj/effect/turf_decal/delivery, @@ -9452,12 +9460,6 @@ /obj/machinery/bookbinder, /turf/open/floor/wood, /area/station/service/library) -"cIT" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/sign/calendar/directional/west, -/turf/open/floor/wood, -/area/station/commons/vacant_room/office) "cIU" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -9542,6 +9544,17 @@ }, /turf/open/floor/iron/dark/side, /area/station/security/processing) +"cKw" = ( +/obj/machinery/camera{ + c_tag = "Medbay Stasis Center South"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "cKA" = ( /obj/structure/window/reinforced/spawner/directional/north{ pixel_y = 2 @@ -9818,20 +9831,6 @@ /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/smooth_half, /area/station/security/brig/upper) -"cOs" = ( -/obj/effect/turf_decal/siding/white{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/item/stack/package_wrap{ - pixel_y = 2 - }, -/obj/item/book/manual/chef_recipes, -/obj/item/holosign_creator/robot_seat/restaurant, -/obj/structure/rack, -/turf/open/floor/iron/white/smooth_large, -/area/station/service/kitchen) "cOC" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -10635,14 +10634,6 @@ /obj/item/cultivator, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) -"daU" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "daX" = ( /obj/structure/sign/warning/gas_mask, /turf/closed/wall, @@ -11118,6 +11109,18 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) +"dil" = ( +/obj/structure/table/glass, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "dip" = ( /obj/machinery/holopad, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -11992,6 +11995,19 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/science/ordnance/office) +"duG" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "duI" = ( /obj/structure/rack, /obj/structure/window/reinforced/spawner/directional/west, @@ -13482,6 +13498,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/mine/laborcamp) +"dRq" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/sign/picture_frame/portrait/bar{ + pixel_x = 32 + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/iron, +/area/station/service/bar) "dRr" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -16510,6 +16537,20 @@ }, /turf/open/floor/iron/smooth, /area/station/engineering/lobby) +"eNR" = ( +/obj/effect/turf_decal/siding/white{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/item/stack/package_wrap{ + pixel_y = 2 + }, +/obj/item/book/manual/chef_recipes, +/obj/item/holosign_creator/robot_seat/restaurant, +/obj/structure/rack, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) "eNS" = ( /obj/structure/sign/warning/xeno_mining, /turf/closed/wall, @@ -16795,6 +16836,19 @@ }, /turf/open/floor/carpet/black, /area/station/security/prison/safe) +"eTf" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver{ + pixel_x = 6 + }, +/obj/item/reagent_containers/syringe, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/obj/machinery/light/cold/directional/north, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "eTi" = ( /obj/machinery/telecomms/broadcaster/preset_left, /turf/open/floor/iron/dark/telecomms, @@ -16841,6 +16895,18 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/starboard/fore) +"eTQ" = ( +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/textured_large, +/area/station/medical/cryo) "eUe" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner, /turf/open/floor/iron/white, @@ -17598,6 +17664,11 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"fgm" = ( +/obj/machinery/photocopier/prebuilt, +/obj/structure/sign/poster/official/random/directional/east, +/turf/open/floor/wood, +/area/station/service/library) "fgo" = ( /obj/effect/spawner/random/trash/mess, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17711,14 +17782,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"fil" = ( -/obj/structure/table/glass, -/obj/machinery/microwave/engineering/cell_included, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/break_room) "fio" = ( /obj/structure/marker_beacon/burgundy{ name = "landing marker" @@ -18790,21 +18853,6 @@ }, /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/surface/outdoors/nospawn) -"fzo" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west{ - pixel_y = -5 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/light_switch/directional/west{ - pixel_y = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "fzv" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -20211,25 +20259,6 @@ /obj/machinery/duct, /turf/open/floor/wood/large, /area/station/service/bar) -"fWn" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/surgery{ - pixel_x = -4; - pixel_y = 3 - }, -/obj/machinery/camera{ - c_tag = "Surgery A"; - dir = 1; - network = list("ss13","medbay"); - pixel_x = 22 - }, -/obj/item/surgery_tray/full, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/vitals_reader/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "fWo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -20824,17 +20853,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/cafeteria, /area/station/commons/storage/art) -"gfL" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 6 - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "gfY" = ( /obj/effect/spawner/random/structure/tank_holder, /obj/structure/sign/poster/official/wtf_is_co2/directional/east, @@ -20871,10 +20889,6 @@ /obj/effect/spawner/random/trash/bin, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"ggE" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood, -/area/station/command/meeting_room) "ggG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -21250,6 +21264,10 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/virology) +"gmk" = ( +/obj/machinery/mechpad, +/turf/open/floor/iron/smooth, +/area/mine/mechbay) "gmD" = ( /obj/machinery/door/window/right/directional/east{ base_state = "left"; @@ -22659,6 +22677,14 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/commons/dorms) +"gJI" = ( +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron/showroomfloor, +/area/station/engineering/atmos) "gJM" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23786,6 +23812,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"hbp" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood, +/area/station/command/meeting_room) "hbt" = ( /obj/effect/decal/cleanable/cobweb, /obj/effect/spawner/random/clothing/mafia_outfit, @@ -24486,6 +24516,12 @@ }, /turf/open/openspace, /area/station/science/xenobiology) +"hnP" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/cafeteria{ + dir = 8 + }, +/area/station/science/research) "hnV" = ( /obj/structure/table/glass, /obj/item/stack/cable_coil, @@ -25307,6 +25343,12 @@ dir = 4 }, /area/station/science/research) +"hAo" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/sign/calendar/directional/west, +/turf/open/floor/wood, +/area/station/commons/vacant_room/office) "hAq" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25533,11 +25575,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"hDH" = ( -/obj/machinery/photocopier/prebuilt, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron, -/area/station/cargo/office) "hDI" = ( /obj/machinery/computer/order_console/cook{ dir = 4 @@ -25881,11 +25918,6 @@ }, /turf/open/floor/iron, /area/station/commons/locker) -"hJN" = ( -/obj/machinery/photocopier/prebuilt, -/obj/structure/sign/poster/official/random/directional/east, -/turf/open/floor/wood, -/area/station/service/library) "hJY" = ( /obj/structure/closet/l3closet/janitor, /obj/machinery/airalarm/directional/north, @@ -26167,10 +26199,6 @@ dir = 1 }, /area/station/medical/chemistry) -"hOo" = ( -/obj/machinery/mechpad, -/turf/open/floor/iron/smooth, -/area/mine/mechbay) "hOt" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -26369,21 +26397,6 @@ "hRA" = ( /turf/closed/wall, /area/station/medical/psychology) -"hRD" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/computer/mechpad{ - dir = 8 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/light/small/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/mine/mechbay) "hRE" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, @@ -26868,14 +26881,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/bar/atrium) -"iab" = ( -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "iag" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -28033,6 +28038,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"iqv" = ( +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "iqx" = ( /obj/structure/railing, /obj/structure/lattice/catwalk, @@ -28247,6 +28259,14 @@ }, /turf/open/floor/glass/reinforced/icemoon, /area/icemoon/surface/outdoors/nospawn) +"itK" = ( +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "itN" = ( /obj/item/toy/snowball{ pixel_x = 6; @@ -28339,11 +28359,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"ivk" = ( -/obj/effect/turf_decal/tile/brown/fourcorners, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "ivo" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -28460,6 +28475,10 @@ }, /turf/open/floor/iron/grimy, /area/station/commons/vacant_room/office) +"ixe" = ( +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "ixu" = ( /obj/machinery/camera/directional/north{ c_tag = "Teleporter" @@ -28530,6 +28549,19 @@ }, /turf/open/floor/plating, /area/mine/living_quarters) +"iyK" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "iyL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -29755,6 +29787,15 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) +"iSz" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = -6 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "iSA" = ( /obj/machinery/conveyor{ dir = 4; @@ -30110,15 +30151,6 @@ "iYb" = ( /turf/closed/wall, /area/station/maintenance/central/greater) -"iYs" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, -/obj/structure/sink/directional/west, -/obj/structure/mirror/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "iYt" = ( /obj/effect/spawner/structure/window/hollow/reinforced/middle{ dir = 1 @@ -30184,18 +30216,6 @@ /obj/item/kitchen/spoon/plastic, /turf/open/floor/iron, /area/station/security/prison/mess) -"iZx" = ( -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/iron/textured_large, -/area/station/medical/cryo) "iZz" = ( /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/labor_camp) @@ -32187,6 +32207,15 @@ /obj/item/clothing/suit/hazardvest, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"jHh" = ( +/obj/item/stack/medical/mesh, +/obj/item/wrench/medical, +/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, +/obj/structure/table/glass, +/obj/machinery/light/cold/directional/east, +/obj/machinery/status_display/ai/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "jHF" = ( /obj/item/trash/boritos/red, /obj/structure/cable, @@ -33241,6 +33270,17 @@ /obj/structure/sign/departments/rndserver/directional/south, /turf/open/floor/iron/white, /area/station/science/research) +"jVQ" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 10 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "jWl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -33494,6 +33534,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"kaw" = ( +/obj/machinery/photocopier/prebuilt, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron, +/area/station/cargo/office) "kax" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 5 @@ -33761,6 +33806,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/science/explab) +"kez" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/firealarm/directional/west{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = -5 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "keA" = ( /obj/effect/turf_decal/weather/snow/corner{ dir = 8 @@ -34461,11 +34519,6 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"kmO" = ( -/obj/machinery/computer/mechpad, -/obj/structure/sign/poster/official/random/directional/north, -/turf/open/floor/iron/textured, -/area/mine/mechbay) "kmS" = ( /obj/structure/fence{ dir = 4 @@ -38591,12 +38644,6 @@ "lwR" = ( /turf/closed/wall/r_wall, /area/mine/living_quarters) -"lwT" = ( -/obj/machinery/mechpad, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/textured, -/area/mine/mechbay) "lxb" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -39956,12 +40003,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"lRu" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/cafeteria{ - dir = 8 - }, -/area/station/science/research) "lRx" = ( /obj/effect/turf_decal/tile/dark_green, /turf/open/floor/iron/dark, @@ -40571,17 +40612,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/tcommsat/computer) -"mbB" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/structure/bed/medical/emergency, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "mbG" = ( /obj/machinery/door/airlock/maintenance{ name = "Chapel Maintenance" @@ -40865,6 +40895,15 @@ }, /turf/open/floor/iron, /area/station/science/robotics/lab) +"mgz" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/chair/sofa/bench/right{ + dir = 1 + }, +/obj/effect/landmark/start/hangover, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "mgD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/engine, @@ -41275,11 +41314,6 @@ }, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) -"mnY" = ( -/obj/machinery/newscaster/directional/north, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron, -/area/station/command/heads_quarters/hop) "moc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -42811,14 +42845,6 @@ "mNY" = ( /turf/closed/wall/r_wall, /area/station/maintenance/port/aft) -"mOc" = ( -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/breakroom) "mOf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/meter/layer4, @@ -44320,16 +44346,6 @@ /obj/effect/spawner/random/trash/mess, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) -"njR" = ( -/obj/effect/turf_decal/siding/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/obj/machinery/sleeper/stasis/cryo, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison) "njT" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -44634,10 +44650,31 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"nnA" = ( +/obj/effect/turf_decal/siding/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/sleeper/stasis/cryo, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) "nnB" = ( /obj/machinery/vending/assist, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"nnL" = ( +/obj/structure/chair/sofa/corp/right{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/vending/wallmed/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "nnR" = ( /obj/machinery/holopad, /turf/open/floor/carpet, @@ -45424,6 +45461,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"nzc" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the morgue."; + name = "corpse disposal" + }, +/obj/structure/disposalpipe/trunk, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/vending/wallmed/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "nzh" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 @@ -45935,6 +45985,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"nER" = ( +/obj/machinery/computer/mechpad, +/obj/structure/sign/poster/official/random/directional/north, +/turf/open/floor/iron/textured, +/area/mine/mechbay) "nEU" = ( /obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/tile/neutral/half, @@ -47718,6 +47773,18 @@ dir = 4 }, /area/station/hallway/secondary/entry) +"oiJ" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Dormitory North" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "oiK" = ( /obj/machinery/door/airlock{ id_tag = "commissarydoor"; @@ -47868,11 +47935,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"okX" = ( -/obj/machinery/restaurant_portal/restaurant, -/obj/effect/turf_decal/delivery/red, -/turf/open/floor/wood/parquet, -/area/station/service/bar/atrium) "olf" = ( /turf/open/floor/carpet, /area/station/commons/dorms) @@ -48701,17 +48763,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron, /area/station/security/prison/workout) -"owj" = ( -/obj/machinery/firealarm/directional/west{ - pixel_y = -4 - }, -/obj/machinery/light_switch/directional/west{ - pixel_y = 5 - }, -/obj/machinery/photocopier/prebuilt, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/wood, -/area/station/hallway/secondary/service) "owk" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -50195,15 +50246,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) -"oRu" = ( -/obj/item/stack/medical/mesh, -/obj/item/wrench/medical, -/obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, -/obj/structure/table/glass, -/obj/machinery/light/cold/directional/east, -/obj/machinery/status_display/ai/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "oRy" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50290,17 +50332,6 @@ /obj/structure/stairs/south, /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"oSQ" = ( -/obj/machinery/camera{ - c_tag = "Medbay Stasis Center North"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "oSR" = ( /obj/machinery/door/firedoor, /obj/structure/cable, @@ -50397,6 +50428,11 @@ "oTA" = ( /turf/open/floor/iron/dark, /area/station/service/chapel) +"oTG" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron, +/area/station/commons/locker) "oTM" = ( /obj/item/flashlight/lantern, /obj/structure/table/wood, @@ -50762,6 +50798,17 @@ dir = 4 }, /area/station/security/prison) +"oZB" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/warning{ + dir = 1 + }, +/obj/structure/bed/medical/emergency, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "oZL" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 4; @@ -51426,17 +51473,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/mine/laborcamp/security) -"piI" = ( -/obj/machinery/camera{ - c_tag = "Medbay Stasis Center South"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "piJ" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/space_heater, @@ -51573,14 +51609,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"pkQ" = ( -/obj/machinery/atmospherics/components/unary/bluespace_sender, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/showroomfloor, -/area/station/engineering/atmos) "pkW" = ( /obj/effect/turf_decal/plaque{ icon_state = "L4" @@ -52842,6 +52870,16 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/commons/dorms/laundry) +"pEj" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/textured_large, +/area/station/medical/cryo) "pEq" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/medical{ @@ -54334,19 +54372,6 @@ /obj/structure/closet/wardrobe/mixed, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"qaU" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/firealarm/directional/west{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/light_switch/directional/west{ - pixel_y = -5 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "qbb" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -55266,21 +55291,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos/mix) -"qpb" = ( -/obj/machinery/disposal/bin{ - desc = "A pneumatic waste disposal unit. This one leads to the morgue."; - name = "corpse disposal" - }, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/item/radio/intercom/directional/south, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "qpd" = ( /obj/effect/landmark/blobstart, /obj/structure/disposalpipe/segment{ @@ -56013,15 +56023,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/commons/locker) -"qyO" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/firealarm/directional/west{ - pixel_y = -6 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "qyR" = ( /turf/open/openspace, /area/station/medical/treatment_center) @@ -56032,6 +56033,15 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningdock) +"qzm" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 4 + }, +/obj/structure/sink/directional/west, +/obj/structure/mirror/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/medbay/aft) "qzq" = ( /obj/structure/sign/departments/cargo, /turf/closed/wall/r_wall, @@ -56312,11 +56322,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"qDM" = ( -/obj/machinery/restaurant_portal/bar, -/obj/effect/turf_decal/delivery/red, -/turf/open/floor/wood/parquet, -/area/station/service/bar/atrium) "qEa" = ( /obj/structure/cable/layer3, /turf/open/floor/iron/dark, @@ -56603,19 +56608,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron/dark, /area/station/science/breakroom) -"qHz" = ( -/obj/machinery/disposal/bin{ - desc = "A pneumatic waste disposal unit. This one leads to the morgue."; - name = "corpse disposal" - }, -/obj/structure/disposalpipe/trunk, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 1 - }, -/obj/item/radio/intercom/directional/north, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "qHD" = ( /obj/machinery/computer/prisoner/management, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -56623,15 +56615,6 @@ }, /turf/open/floor/iron, /area/station/command/bridge) -"qHO" = ( -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/chair/sofa/bench/right{ - dir = 1 - }, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "qIa" = ( /obj/structure/table, /obj/item/food/deadmouse/moldy{ @@ -57752,19 +57735,6 @@ /obj/structure/flora/bush/jungle/c/style_random, /turf/open/floor/grass, /area/station/medical/virology) -"qXR" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "qXY" = ( /obj/effect/spawner/random/trash, /turf/open/floor/plating, @@ -57844,6 +57814,12 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"qZa" = ( +/obj/machinery/mechpad, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/light/small/directional/north, +/turf/open/floor/iron/textured, +/area/mine/mechbay) "qZh" = ( /obj/structure/table, /obj/item/folder/white, @@ -58636,6 +58612,21 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/science/ordnance) +"rmu" = ( +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/computer/mechpad{ + dir = 8 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/mine/mechbay) "rmv" = ( /obj/structure/rack, /obj/item/wrench, @@ -59117,6 +59108,13 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos/storage/gas) +"rus" = ( +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/sleeper/stasis/cryo, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison) "rut" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60132,20 +60130,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet) -"rKX" = ( -/obj/machinery/camera{ - c_tag = "Surgery B"; - network = list("ss13","medbay"); - pixel_x = 22 - }, -/obj/structure/cable, -/obj/structure/table/glass, -/obj/item/stack/medical/wrap/sticky_tape/surgical, -/obj/item/stack/medical/bone_gel, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/vitals_reader/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "rKZ" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, /obj/effect/turf_decal/stripes/line{ @@ -60465,6 +60449,17 @@ "rQf" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"rQk" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "kitchencounter"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen, +/turf/open/floor/iron/white/smooth_large, +/area/station/service/kitchen) "rQl" = ( /obj/structure/lattice/catwalk, /obj/structure/railing/corner, @@ -60720,13 +60715,6 @@ dir = 4 }, /area/station/hallway/secondary/entry) -"rUw" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/obj/machinery/sleeper/stasis/cryo, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison) "rUz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -61185,6 +61173,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"sbi" = ( +/obj/machinery/newscaster/directional/north, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron, +/area/station/command/heads_quarters/hop) "sbv" = ( /obj/structure/closet/secure_closet/personal{ anchored = 1 @@ -63520,6 +63513,17 @@ /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron, /area/station/maintenance/port/fore) +"sHS" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 6 + }, +/obj/effect/turf_decal/tile/green/fourcorners, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "sHV" = ( /obj/machinery/atmospherics/components/tank/air{ initialize_directions = 2 @@ -63925,13 +63929,6 @@ "sOn" = ( /turf/closed/wall, /area/station/cargo/lobby) -"sOu" = ( -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/full, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "sOz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64316,16 +64313,6 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) -"sVm" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/iron/textured_large, -/area/station/medical/cryo) "sVn" = ( /obj/machinery/light_switch/directional/north, /turf/open/floor/iron/freezer, @@ -64955,19 +64942,6 @@ /mob/living/simple_animal/bot/secbot/beepsky/armsky, /turf/open/floor/iron/dark/textured, /area/station/ai_monitored/security/armory) -"tht" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver{ - pixel_x = 6 - }, -/obj/item/reagent_containers/syringe, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/full, -/obj/machinery/light/cold/directional/north, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron/large, -/area/station/medical/treatment_center) "thA" = ( /turf/open/genturf/blue, /area/icemoon/underground/unexplored/rivers/deep/shoreline) @@ -65536,6 +65510,21 @@ "trm" = ( /turf/open/floor/plating, /area/station/science/ordnance/testlab) +"trp" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west{ + pixel_y = -5 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "trr" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -65826,6 +65815,13 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/dark/textured_edge, /area/station/security/evidence) +"tvV" = ( +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/full, +/turf/open/floor/iron/large, +/area/station/medical/treatment_center) "tvW" = ( /obj/machinery/computer/telecomms/monitor{ dir = 4; @@ -66559,6 +66555,20 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/mine/laborcamp) +"tGY" = ( +/obj/machinery/camera{ + c_tag = "Surgery B"; + network = list("ss13","medbay"); + pixel_x = 22 + }, +/obj/structure/cable, +/obj/structure/table/glass, +/obj/item/stack/medical/wrap/sticky_tape/surgical, +/obj/item/stack/medical/bone_gel, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/vitals_reader/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "tHi" = ( /obj/machinery/requests_console/directional/west{ department = "Captain's Desk"; @@ -66947,14 +66957,6 @@ "tLF" = ( /turf/closed/wall, /area/station/hallway/primary/starboard) -"tLM" = ( -/obj/machinery/camera/directional/south{ - c_tag = "Robotics Lab - South"; - network = list("ss13","rd") - }, -/obj/machinery/mechpad, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "tLN" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/disposal/bin{ @@ -66993,15 +66995,6 @@ }, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"tMe" = ( -/obj/machinery/computer/mechpad{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/robotics/lab) "tMk" = ( /obj/machinery/duct, /obj/structure/cable, @@ -67519,19 +67512,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"tWs" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/medical/medbay/aft) "tWy" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -68130,6 +68110,11 @@ /obj/structure/cable, /turf/open/floor/stone, /area/station/commons/lounge) +"ufv" = ( +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "ufw" = ( /obj/machinery/door/firedoor, /obj/effect/landmark/start/hangover, @@ -69261,6 +69246,21 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/engine/vacuum, /area/station/engineering/atmos) +"uxR" = ( +/obj/machinery/disposal/bin{ + desc = "A pneumatic waste disposal unit. This one leads to the morgue."; + name = "corpse disposal" + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/vending/wallmed/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "uxZ" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, @@ -70012,18 +70012,6 @@ /obj/effect/turf_decal/tile/red/half, /turf/open/floor/iron/smooth_half, /area/station/security/brig/upper) -"uKj" = ( -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/effect/turf_decal/tile/blue/full, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/turf/open/floor/iron/textured_large, -/area/station/medical/cryo) "uKx" = ( /obj/structure/closet, /obj/item/clothing/suit/hooded/wintercoat{ @@ -70075,6 +70063,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"uKV" = ( +/obj/machinery/computer/mechpad{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "uKW" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -70133,6 +70130,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/commons/storage/emergency/port) +"uLY" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark/textured_edge{ + dir = 1 + }, +/area/station/security/prison) "uMm" = ( /turf/open/floor/iron/white/corner{ dir = 4 @@ -71612,17 +71619,6 @@ /obj/effect/turf_decal/tile/yellow, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"vjV" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 10 - }, -/obj/effect/turf_decal/tile/green/fourcorners, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "vjZ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -73403,6 +73399,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"vLt" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) "vLC" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -73663,14 +73667,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/cargo/lobby) -"vRo" = ( -/obj/machinery/shower/directional/north, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 9 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark/textured, -/area/station/medical/treatment_center) "vRy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/disposalpipe/segment{ @@ -73953,6 +73949,18 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) +"vUZ" = ( +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/effect/turf_decal/tile/blue/full, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/turf/open/floor/iron/textured_large, +/area/station/medical/cryo) "vVj" = ( /obj/effect/turf_decal/bot_white/left, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -73983,6 +73991,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"vWc" = ( +/obj/machinery/firealarm/directional/west{ + pixel_y = -4 + }, +/obj/machinery/light_switch/directional/west{ + pixel_y = 5 + }, +/obj/machinery/photocopier/prebuilt, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) "vWe" = ( /obj/effect/turf_decal/siding/yellow{ dir = 4 @@ -74446,16 +74465,6 @@ }, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) -"wck" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "wcv" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -75452,11 +75461,6 @@ initial_gas_mix = "ICEMOON_ATMOS" }, /area/icemoon/underground/explored/graveyard) -"wpQ" = ( -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/commons/locker) "wpY" = ( /obj/effect/mapping_helpers/airlock/abandoned, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78193,6 +78197,25 @@ /obj/structure/flora/bush/snow/style_random, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) +"xga" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/surgery{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/machinery/camera{ + c_tag = "Surgery A"; + dir = 1; + network = list("ss13","medbay"); + pixel_x = 22 + }, +/obj/item/surgery_tray/full, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/vitals_reader/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "xgc" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, @@ -79543,6 +79566,14 @@ }, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) +"xAD" = ( +/obj/machinery/camera/directional/south{ + c_tag = "Robotics Lab - South"; + network = list("ss13","rd") + }, +/obj/machinery/mechpad, +/turf/open/floor/iron/white, +/area/station/science/robotics/lab) "xAQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79870,17 +79901,6 @@ /obj/structure/closet/bombcloset, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"xEw" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 8; - id = "kitchencounter"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/displaycase/forsale/kitchen, -/turf/open/floor/iron/white/smooth_large, -/area/station/service/kitchen) "xEE" = ( /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, @@ -79902,18 +79922,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/carpet/black, /area/station/security/prison/safe) -"xEJ" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Dormitory North" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "xEL" = ( /obj/effect/turf_decal/delivery, /obj/structure/window/reinforced/spawner/directional/west, @@ -81485,11 +81493,14 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"ydT" = ( -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/station/hallway/primary/central) +"yed" = ( +/obj/structure/table/glass, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/break_room) "yef" = ( /obj/machinery/airalarm/directional/north, /obj/machinery/suit_storage_unit/industrial/loader, @@ -81812,17 +81823,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/aft) -"ylI" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/sign/picture_frame/portrait/bar{ - pixel_x = 32 - }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/iron, -/area/station/service/bar) "ylM" = ( /obj/machinery/light/directional/south, /obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ @@ -102586,7 +102586,7 @@ ydu tYz scm uUT -hRD +rmu nKV uwM dsn @@ -102843,7 +102843,7 @@ mtn tYz qiF gIu -hOo +gmk sgA ceS uPv @@ -165271,7 +165271,7 @@ sTh kwo sPC ybV -qXR +duG vEq scw oif @@ -165526,9 +165526,9 @@ qxI qxI rVC kwo -vjV +jVQ slb -qXR +duG vEq iDt scw @@ -165783,9 +165783,9 @@ qxI qxI coT kwo -gfL +sHS slb -qXR +duG vEq iDt iDt @@ -166042,7 +166042,7 @@ dwI kwo bAx cwP -qXR +duG vEq ebd iDt @@ -170431,7 +170431,7 @@ mqs dTs oeP uUT -kmO +nER rtR lLY nUi @@ -170688,7 +170688,7 @@ rsY czq rsY uUT -lwT +qZa pXE lqA nUi @@ -170866,7 +170866,7 @@ jhH cIc sDQ oVY -bXI +uLY vVH vVH vVH @@ -175487,7 +175487,7 @@ gjq gjq gjq upw -rUw +rus iRV cvq xgL @@ -176001,7 +176001,7 @@ gjq gjq gjq upw -njR +nnA uRu uRu uRu @@ -226181,7 +226181,7 @@ fUR teE bKA nwT -cIT +hAo tzM vgj tKI @@ -226684,7 +226684,7 @@ nAH mVE xFs jLM -qHO +mgz fUR juu kBU @@ -230027,7 +230027,7 @@ nct gAB ykG ykG -wpQ +oTG tOw sVn wlt @@ -234663,7 +234663,7 @@ tKI tKI tKI tKI -hDH +kaw vkF rTt sOJ @@ -235675,7 +235675,7 @@ iFj hDU abL ons -aLV +ixe bXm bXm bXm @@ -238511,7 +238511,7 @@ xyl dnq qjm dxK -ggE +hbp oyp phf sEl @@ -238522,7 +238522,7 @@ odN iZq dpH gfb -ydT +ufv iIA fSC iIA @@ -239292,7 +239292,7 @@ iYb txI xvZ iYb -mnY +sbi jWP ool jRC @@ -241282,7 +241282,7 @@ bln lbc nbp lau -daU +vLt dlK pbI jIm @@ -241579,7 +241579,7 @@ vVY uog uog nfU -bzI +iqv uog fWI mny @@ -243177,7 +243177,7 @@ jkx fLq hro tKi -ivk +adZ dxA oht rSC @@ -244912,7 +244912,7 @@ skl eFW rlV ygB -xEJ +oiJ gJC akD qIU @@ -245744,7 +245744,7 @@ tTY hHN jlV hHN -pkQ +gJI cEw cEw cEw @@ -246724,7 +246724,7 @@ jlP ePq twU uja -owj +vWc dNf aKw dLc @@ -249045,7 +249045,7 @@ ilI fUE rJy rut -qDM +aJs ptO dFV fgj @@ -249302,7 +249302,7 @@ ilI fUE gWQ rut -okX +bur izC mAR fRR @@ -249319,8 +249319,8 @@ iBj mcW sFG lwQ -tht -sOu +eTf +tvV xtv lup aCA @@ -249581,7 +249581,7 @@ evp juw tkf ikz -oSQ +bdq tHr pBA pBA @@ -249839,7 +249839,7 @@ lux eHZ lux fUL -qyO +iSz evp evp owr @@ -250101,7 +250101,7 @@ gHq ygF wGE rpM -vRo +bvL cvS oaX cvS @@ -250580,7 +250580,7 @@ kKL kKL aXD qTc -ylI +dRq gaR mcD mWh @@ -250615,7 +250615,7 @@ hRH dXi mmh ikz -piI +cKw cvS kRP kRP @@ -250861,7 +250861,7 @@ iAO niu pZm lwQ -iab +itK kQM rVq nji @@ -251096,7 +251096,7 @@ rzC bWr cpY cpY -xEw +rQk uIH uyJ uIH @@ -251118,7 +251118,7 @@ qPu niu uOW lwQ -ade +dil oeW aTZ fle @@ -251632,7 +251632,7 @@ mPG ted krS qkc -mbB +oZB rDa mrB jQD @@ -251642,7 +251642,7 @@ rjC qjF pPO wbN -tWs +iyK tOO qQp qQp @@ -252638,7 +252638,7 @@ kKL kKL cpY ctX -cOs +eNR kMF qiS xEg @@ -252931,7 +252931,7 @@ krx gsT sCX eHU -iYs +qzm eHU wgc qOc @@ -253440,15 +253440,15 @@ tLe ufN vCz ufN -iZx +eTQ dDw -qHz +nzc ekE -fzo +trp czF -qaU +kez jtH -qpb +uxR mFE iZR nuN @@ -253697,7 +253697,7 @@ xuM wXh xCQ ufN -sVm +pEj dDw srb dUr @@ -253952,17 +253952,17 @@ lei klc pgY ufN -oRu +jHh hIe -uKj +vUZ dDw -fWn +xga qgu tYA vds mrD liz -rKX +tGY mFE nEc klk @@ -254202,7 +254202,7 @@ puB sZF sZF sxw -ayI +nnL ktD mSM ozN @@ -254221,7 +254221,7 @@ xMM nqd ttO mFE -fil +yed pWY rQI phj @@ -256514,7 +256514,7 @@ mtI mtI lKk tUX -tMe +uKV mtI nqP vzo @@ -256771,7 +256771,7 @@ otK iIe pKJ rIU -tLM +xAD mtI vtA sfY @@ -257262,7 +257262,7 @@ bla sil hUD hUD -hJN +fgm qok iZn xzd @@ -259610,7 +259610,7 @@ kdJ vjj wLl wol -lRu +hnP gPE bpD wLl @@ -261131,7 +261131,7 @@ jbG nzV cYE dfB -wck +cjl pFg hXC mrw @@ -262690,7 +262690,7 @@ mEJ nSC gVe whP -mOc +cuW fVv krY oOb diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 192dcdd71688..3da10a718c3d 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -33071,7 +33071,7 @@ /obj/effect/turf_decal/siding/blue{ dir = 8 }, -/obj/structure/sign/warning/biohazard/directional/south, +/obj/structure/fireaxecabinet/jaws_of_life/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "goH" = ( diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index 484910a7992a..1b657f676ea4 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -3972,9 +3972,6 @@ dir = 8 }, /obj/structure/table/reinforced/rglass, -/obj/structure/item_dispenser/latex{ - pixel_x = -31 - }, /obj/item/storage/box/rxglasses, /obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera{ @@ -3982,6 +3979,7 @@ dir = 8; network = list("ss13","medbay") }, +/obj/structure/fireaxecabinet/jaws_of_life/directional/west, /turf/open/floor/iron/white, /area/station/medical/storage) "boV" = ( @@ -25830,6 +25828,9 @@ /obj/machinery/disposal/bin, /obj/effect/turf_decal/stripes/box, /obj/structure/disposalpipe/trunk, +/obj/structure/item_dispenser/latex{ + pixel_y = 28 + }, /turf/open/floor/iron/dark, /area/station/medical/storage) "iwm" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 758063576916..1f2aea71a1e1 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -995,17 +995,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"aiX" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/firealarm/directional/west, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/cryo) "ajc" = ( /obj/machinery/conveyor{ dir = 1; @@ -2657,14 +2646,6 @@ }, /turf/open/space, /area/space/nearstation) -"ayl" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/camera/directional/east{ - c_tag = "Law Office" - }, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, -/area/station/service/lawoffice) "ayx" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -3696,12 +3677,6 @@ "aJS" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) -"aJT" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 3 - }, -/turf/open/floor/wood, -/area/station/service/library) "aJY" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -5715,6 +5690,17 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"bkU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/north{ + id = "AuxShower"; + name = "Lock Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) "bkV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5723,14 +5709,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"bla" = ( -/obj/machinery/restaurant_portal/restaurant, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/wood, -/area/station/commons/lounge) "blh" = ( /obj/machinery/computer/security/telescreen/entertainment/directional/west, /obj/machinery/camera/autoname/directional/west, @@ -6893,6 +6871,21 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central) +"bCp" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 10 + }, +/obj/machinery/sleeper/stasis/cryo{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/security/prison) +"bCz" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/bluespace_vendor/directional/east, +/obj/machinery/photobooth, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "bCC" = ( /obj/machinery/light_switch/directional/west, /obj/machinery/power/smes/engineering, @@ -8045,6 +8038,15 @@ }, /turf/open/floor/iron/white, /area/station/science/robotics/lab) +"bSu" = ( +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "bSS" = ( /turf/closed/wall, /area/station/hallway/primary/central) @@ -8054,20 +8056,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) -"bSY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/structure/sign/map/meta/right{ - name = "station map"; - pixel_y = -32 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "bTe" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -8366,11 +8354,6 @@ /obj/machinery/light/small/dim/directional/west, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"bWb" = ( -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral, -/turf/open/floor/iron, -/area/station/commons/locker) "bWv" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/junction{ @@ -8800,16 +8783,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"cbM" = ( -/obj/machinery/door/poddoor/shutters{ - dir = 4; - id = "abandoned_kitchen" - }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "cca" = ( /turf/open/floor/iron/white, /area/station/medical/medbay/central) @@ -9216,6 +9189,18 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"chF" = ( +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/bar) "chR" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -9830,6 +9815,14 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat/foyer) +"cop" = ( +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/vitals_reader/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "cor" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -10154,18 +10147,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"crl" = ( -/obj/structure/table/glass, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/blood_filter, -/obj/item/bonesetter, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "crm" = ( /obj/structure/closet/crate/freezer/surplus_limbs, /obj/machinery/firealarm/directional/south, @@ -10498,6 +10479,15 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"cwe" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/long_term_storage) "cwn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -11389,6 +11379,16 @@ }, /turf/open/floor/wood/parquet, /area/station/medical/psychology) +"cGU" = ( +/obj/structure/table/glass, +/obj/item/retractor, +/obj/item/hemostat, +/obj/item/cautery, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/digital_clock/directional/south, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "cHb" = ( /obj/structure/bed/medical/emergency, /obj/effect/turf_decal/tile/blue/fourcorners, @@ -12959,6 +12959,20 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"daL" = ( +/obj/structure/sign/map/meta/left{ + pixel_y = -32; + name = "station map" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "daV" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -13155,16 +13169,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) -"ddR" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave/engineering/cell_included, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/light/small/directional/west, -/turf/open/floor/iron/checker, -/area/station/engineering/storage_shared) "ddV" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=7.5-Starboard-Aft-Corner"; @@ -13214,6 +13218,15 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/station/security/prison/garden) +"deY" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/photocopier/prebuilt, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hos) "dfo" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/brown/filled/line, @@ -13558,6 +13571,14 @@ }, /turf/open/space/basic, /area/space) +"djO" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/station/commons/lounge) "djS" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/delivery, @@ -13850,16 +13871,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/service/hydroponics) -"doQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/structure/chair/sofa/corp/left{ - dir = 1 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/office) "doZ" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -14141,15 +14152,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/office) -"dtV" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/long_term_storage) "dtZ" = ( /obj/structure/rack, /obj/effect/spawner/random/clothing/costume, @@ -14500,6 +14502,14 @@ /obj/effect/spawner/random/structure/crate, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"dxQ" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/east, +/obj/item/stack/medical/wrap/gauze, +/obj/item/stack/medical/suture, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "dxV" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/computer/slot_machine{ @@ -14843,10 +14853,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/locker) -"dEF" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/science/research) "dER" = ( /obj/machinery/requests_console/directional/west{ department = "Detective"; @@ -14982,16 +14988,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/command) -"dIb" = ( -/obj/structure/tank_holder/extinguisher, -/obj/machinery/camera/directional/east{ - c_tag = "Medbay Cryogenics"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "dIj" = ( /obj/effect/turf_decal/trimline/purple/corner{ dir = 1 @@ -15089,6 +15085,15 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/service/hydroponics) +"dKs" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/long_term_storage) "dKx" = ( /obj/structure/sign/directions/evac, /turf/closed/wall/r_wall, @@ -15203,6 +15208,16 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"dMe" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/reagent_containers/chem_pack, +/obj/item/reagent_containers/chem_pack{ + pixel_x = 7; + pixel_y = 6 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "dMo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -15334,19 +15349,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/bar, /turf/open/floor/wood, /area/station/service/bar/backroom) -"dOT" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 3 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/small/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/brig) "dPa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -16184,6 +16186,12 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) +"eeL" = ( +/obj/machinery/computer/mechpad{ + dir = 8 + }, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) "eeW" = ( /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ @@ -16266,6 +16274,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"egZ" = ( +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ehn" = ( /obj/machinery/door/airlock/grunge{ name = "Cell 3" @@ -16721,6 +16740,16 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/wood, /area/station/commons/lounge) +"epQ" = ( +/obj/machinery/door/poddoor/shutters{ + dir = 4; + id = "abandoned_kitchen" + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "epU" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -17104,6 +17133,13 @@ "evl" = ( /turf/closed/wall, /area/station/medical/chem_storage) +"evp" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/red, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "evq" = ( /obj/machinery/power/port_gen/pacman/pre_loaded, /turf/open/floor/plating, @@ -17788,6 +17824,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/starboard/greater) +"eJb" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/stripes/corner, +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/turf/open/floor/iron, +/area/station/engineering/break_room) "eJf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -17966,6 +18009,18 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/aft) +"eMM" = ( +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 6 + }, +/area/station/medical/treatment_center) "eMU" = ( /obj/item/food/snowcones/clown, /turf/open/floor/fake_snow, @@ -17973,17 +18028,6 @@ "eMW" = ( /turf/closed/wall, /area/station/service/library) -"eMZ" = ( -/obj/structure/cable, -/obj/machinery/bluespace_vendor/directional/west, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "eNg" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -18340,18 +18384,6 @@ /obj/machinery/light/no_nightlight/directional/west, /turf/open/floor/iron, /area/station/engineering/atmos) -"eSv" = ( -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/bar) "eSx" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -18498,6 +18530,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"eVX" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/firealarm/directional/west, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "eWd" = ( /turf/closed/wall, /area/station/science/lab) @@ -19253,15 +19296,6 @@ /obj/structure/railing, /turf/open/space/basic, /area/space/nearstation) -"flP" = ( -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "fme" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, @@ -19437,6 +19471,34 @@ }, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"foH" = ( +/obj/structure/table/glass, +/obj/structure/cable, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/beaker/cryoxadone{ + pixel_x = 6; + pixel_y = 6 + }, +/obj/item/storage/pill_bottle/mannitol, +/obj/item/reagent_containers/dropper{ + pixel_y = 6 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/north, +/obj/machinery/power/apc/auto_name/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "foL" = ( /obj/machinery/status_display/evac/directional/north, /obj/machinery/camera/directional/north{ @@ -19731,6 +19793,15 @@ /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, /area/station/science/lobby) +"ftn" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "ftS" = ( /obj/machinery/door/firedoor, /obj/machinery/computer/cargo/request{ @@ -20439,6 +20510,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"fFD" = ( +/obj/structure/cable, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "fFJ" = ( /obj/structure/table, /obj/structure/disposalpipe/segment, @@ -20991,21 +21067,6 @@ /obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"fPr" = ( -/obj/machinery/shower/directional/west, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light_switch/directional/east{ - pixel_y = 5 - }, -/obj/machinery/button/door/directional/east{ - pixel_y = -6; - pixel_x = 28; - id = "main_surgery"; - name = "privacy shutters control" - }, -/turf/open/floor/iron/white/textured, -/area/station/medical/surgery/theatre) "fPu" = ( /turf/open/floor/iron/chapel{ dir = 4 @@ -21337,6 +21398,20 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"fWs" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/siding/white/corner, +/obj/item/storage/box/gloves{ + pixel_y = 8 + }, +/obj/item/storage/box/masks{ + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 9 + }, +/area/station/medical/treatment_center) "fWD" = ( /obj/effect/landmark/blobstart, /obj/structure/cable, @@ -21685,6 +21760,12 @@ "gdP" = ( /turf/open/floor/carpet, /area/station/service/theater) +"gdY" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 3 + }, +/turf/open/floor/wood, +/area/station/service/library) "gep" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/space_heater, @@ -22195,6 +22276,18 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/chapel/funeral) +"goI" = ( +/obj/structure/table/glass, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/white/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/side{ + dir = 10 + }, +/area/station/medical/treatment_center) "goQ" = ( /obj/structure/table, /obj/item/stock_parts/subspace/transmitter, @@ -22508,6 +22601,13 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/dark/corner, /area/station/engineering/storage_shared) +"gwZ" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "gxv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -22590,6 +22690,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore) +"gyD" = ( +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron, +/area/station/commons/locker) "gyI" = ( /obj/structure/table/reinforced, /obj/machinery/camera/directional/north{ @@ -23376,6 +23481,15 @@ /obj/effect/turf_decal/tile/purple/anticorner/contrasted, /turf/open/floor/iron/white, /area/station/science/lobby) +"gNm" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/radio/intercom/directional/north, +/obj/machinery/vitals_reader/directional/west, +/obj/item/stack/medical/wrap/gauze, +/obj/item/stack/medical/mesh, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "gNY" = ( /obj/effect/turf_decal/trimline/purple/filled/line, /obj/effect/turf_decal/trimline/brown/filled/warning, @@ -23497,15 +23611,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/service/hydroponics) -"gQS" = ( -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "gQU" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 1; @@ -24976,6 +25081,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"htK" = ( +/obj/machinery/mechpad, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) "htM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -25404,6 +25513,16 @@ /obj/effect/landmark/navigate_destination, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) +"hDF" = ( +/obj/structure/tank_holder/extinguisher, +/obj/machinery/camera/directional/east{ + c_tag = "Medbay Cryogenics"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "hDG" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -26878,14 +26997,6 @@ }, /turf/open/floor/plating, /area/station/science/server) -"iek" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/atmospherics/components/unary/bluespace_sender, -/turf/open/floor/iron, -/area/station/engineering/atmos) "ien" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -27236,6 +27347,14 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +"ilm" = ( +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/west, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/commons/dorms) "ilt" = ( /obj/machinery/computer/atmos_control/carbon_tank{ dir = 1 @@ -27377,20 +27496,6 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/storage/gas) -"inv" = ( -/obj/structure/sign/map/meta/left{ - pixel_y = -32; - name = "station map" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "inF" = ( /obj/structure/sign/map/meta/left{ pixel_y = 32; @@ -27418,13 +27523,6 @@ /obj/effect/turf_decal/trimline/brown/warning, /turf/open/floor/iron/white, /area/station/science/lobby) -"iov" = ( -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "ioR" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/hidden{ dir = 5 @@ -27647,6 +27745,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/atmos) +"isH" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/science/research) "isK" = ( /obj/machinery/atmospherics/pipe/layer_manifold/cyan/visible, /obj/effect/turf_decal/tile/yellow{ @@ -27763,20 +27865,6 @@ }, /turf/open/floor/wood, /area/station/security/office) -"iuH" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/siding/white/corner, -/obj/item/storage/box/gloves{ - pixel_y = 8 - }, -/obj/item/storage/box/masks{ - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/side{ - dir = 9 - }, -/area/station/medical/treatment_center) "iuX" = ( /obj/effect/landmark/event_spawn, /obj/structure/cable, @@ -27999,6 +28087,18 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /turf/open/floor/iron, /area/station/cargo/sorting) +"iBq" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/machinery/light_switch/directional/south, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/dark, +/area/station/medical/cryo) "iBF" = ( /obj/machinery/vending/hydroseeds{ slogan_delay = 700 @@ -28064,6 +28164,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/office) +"iCT" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "iCV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/circuit, @@ -28258,6 +28369,16 @@ "iFZ" = ( /turf/closed/wall, /area/station/cargo/sorting) +"iGc" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "iGm" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -29856,16 +29977,6 @@ /obj/machinery/vending/medical, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"jpN" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/light/directional/north, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "jpP" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -30816,16 +30927,6 @@ }, /turf/open/floor/carpet, /area/station/medical/psychology) -"jIK" = ( -/obj/structure/chair{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "jIY" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/aisat/exterior) @@ -30835,18 +30936,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"jJq" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/machinery/light_switch/directional/south, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/dark, -/area/station/medical/cryo) "jJK" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -31039,6 +31128,18 @@ "jNL" = ( /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"jNT" = ( +/obj/structure/table/glass, +/obj/item/scalpel{ + pixel_y = 12 + }, +/obj/item/circular_saw, +/obj/item/blood_filter, +/obj/item/bonesetter, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vending/wallmed/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "jOd" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -31075,14 +31176,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/science/research) -"jOl" = ( -/obj/structure/cable, -/obj/machinery/bluespace_vendor/directional/west, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/commons/dorms) "jOr" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/button/door/directional/south{ @@ -32130,6 +32223,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"kjv" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood, +/area/station/service/library) "kjG" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -32501,17 +32599,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"ksP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/north{ - id = "AuxShower"; - name = "Lock Control"; - normaldoorcontrol = 1; - specialfunctions = 4 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) "ksV" = ( /obj/structure/chair{ dir = 8 @@ -32867,6 +32954,12 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/commons/locker) +"kyN" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/security/office) "kyS" = ( /obj/structure/lattice/catwalk, /obj/item/stack/rods, @@ -33945,6 +34038,13 @@ /obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/iron, /area/station/security/holding_cell) +"kVs" = ( +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "kVt" = ( /obj/machinery/disposal/bin{ desc = "A pneumatic waste disposal unit. This one leads into space!"; @@ -34509,13 +34609,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"lgc" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/wood, -/area/station/commons/lounge) "lgf" = ( /obj/effect/spawner/random/maintenance, /obj/structure/cable, @@ -34640,18 +34733,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood/large, /area/station/service/theater) -"ljx" = ( -/obj/structure/table/glass, -/obj/item/scalpel{ - pixel_y = 12 - }, -/obj/item/circular_saw, -/obj/item/blood_filter, -/obj/item/bonesetter, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "ljG" = ( /obj/structure/chair/sofa/corp/left{ dir = 1 @@ -35336,6 +35417,15 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/station/service/hydroponics) +"lws" = ( +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/cold/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "lwx" = ( /obj/effect/turf_decal/delivery, /obj/effect/mapping_helpers/airlock/cyclelink_helper, @@ -36376,15 +36466,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/iron, /area/station/cargo/warehouse) -"lTo" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave/engineering/cell_included, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "lTt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/window/reinforced/spawner/directional/north, @@ -36406,34 +36487,6 @@ /obj/structure/altar_of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) -"lUJ" = ( -/obj/structure/table/glass, -/obj/structure/cable, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/beaker/cryoxadone{ - pixel_x = 6; - pixel_y = 6 - }, -/obj/item/storage/pill_bottle/mannitol, -/obj/item/reagent_containers/dropper{ - pixel_y = 6 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/north, -/obj/machinery/power/apc/auto_name/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "lVw" = ( /obj/machinery/newscaster/directional/west, /obj/structure/cable, @@ -36623,13 +36676,6 @@ /obj/structure/sign/warning/secure_area/directional/south, /turf/open/floor/plating, /area/station/maintenance/aft/greater) -"lYd" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "lYl" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -36878,14 +36924,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"mci" = ( -/obj/machinery/computer/operating{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/vitals_reader/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "mcC" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -37472,6 +37510,16 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) +"mnx" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/structure/chair/sofa/corp/left{ + dir = 1 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/office) "mnI" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -37514,15 +37562,6 @@ /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, /area/station/science/research) -"mpg" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/long_term_storage) "mph" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, @@ -37701,6 +37740,12 @@ /obj/item/papercutter, /turf/open/floor/iron/dark, /area/station/command/bridge) +"msv" = ( +/obj/machinery/iv_drip, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "msy" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -38744,6 +38789,23 @@ /obj/machinery/light/floor, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"mMD" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/service/kitchen) "mME" = ( /obj/item/shard, /obj/effect/mapping_helpers/broken_floor, @@ -39614,12 +39676,6 @@ /obj/effect/turf_decal/tile/green/fourcorners, /turf/open/floor/iron/white, /area/station/medical/virology) -"nbp" = ( -/obj/machinery/computer/mechpad{ - dir = 8 - }, -/turf/open/floor/circuit/green, -/area/station/science/robotics/mechbay) "nbu" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/effect/turf_decal/trimline/red/filled/corner{ @@ -40042,14 +40098,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"njw" = ( -/obj/machinery/shower/directional/east, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/trash/soap{ - spawn_scatter_radius = 1 - }, -/turf/open/floor/iron, -/area/station/commons/toilet/auxiliary) "njH" = ( /obj/structure/chair/office{ dir = 4 @@ -40252,12 +40300,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"nnN" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/bluespace_vendor/directional/east, -/obj/machinery/photobooth, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "nnS" = ( /obj/structure/table, /obj/item/radio/intercom/directional/west, @@ -40820,19 +40862,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"nyq" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/radio/intercom/directional/south, -/obj/item/storage/box/rxglasses{ - pixel_x = -4; - pixel_y = 8 - }, -/obj/item/storage/box/bodybags{ - pixel_y = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "nyJ" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41297,6 +41326,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"nHP" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/commons/lounge) "nIa" = ( /obj/structure/table/reinforced, /obj/item/defibrillator/loaded{ @@ -41428,18 +41464,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"nKB" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/side{ - dir = 6 - }, -/area/station/medical/treatment_center) "nKE" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/east, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -41659,14 +41683,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/glass/reinforced, /area/station/science/research) -"nNX" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/east, -/obj/item/stack/medical/wrap/gauze, -/obj/item/stack/medical/suture, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "nOc" = ( /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) @@ -41763,16 +41779,6 @@ /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"nQw" = ( -/obj/structure/table/glass, -/obj/item/retractor, -/obj/item/hemostat, -/obj/item/cautery, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/vitals_reader/directional/west, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "nQG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41799,6 +41805,16 @@ "nQR" = ( /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"nQU" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/checker, +/area/station/engineering/storage_shared) "nRb" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating/airless, @@ -43571,6 +43587,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"ozC" = ( +/obj/structure/table/glass, +/obj/item/scalpel{ + pixel_y = 12 + }, +/obj/item/circular_saw, +/obj/item/blood_filter, +/obj/item/bonesetter, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vending/wallmed/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "ozJ" = ( /obj/machinery/door/airlock/hatch{ name = "Telecomms Server Room" @@ -44083,18 +44111,6 @@ dir = 8 }, /area/station/medical/chem_storage) -"oKv" = ( -/obj/structure/table/glass, -/obj/machinery/light_switch/directional/west{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/camera/directional/west{ - c_tag = "Medbay Primary Treatment Centre West"; - network = list("ss13","medbay") - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "oKy" = ( /obj/machinery/door/airlock/maintenance{ name = "Quartermaster Maintenance" @@ -44403,13 +44419,6 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"oRa" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "oRn" = ( /obj/structure/table, /obj/effect/turf_decal/siding{ @@ -44932,16 +44941,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron, /area/station/security/office) -"paX" = ( -/obj/structure/table/glass, -/obj/item/retractor, -/obj/item/hemostat, -/obj/item/cautery, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/digital_clock/directional/south, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/surgery/theatre) "pbd" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -45798,6 +45797,21 @@ /obj/item/reagent_containers/spray/pepper, /turf/open/floor/iron, /area/station/security/execution/transfer) +"ppY" = ( +/obj/machinery/shower/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light_switch/directional/east{ + pixel_y = 5 + }, +/obj/machinery/button/door/directional/east{ + pixel_y = -6; + pixel_x = 28; + id = "main_surgery"; + name = "privacy shutters control" + }, +/turf/open/floor/iron/white/textured, +/area/station/medical/surgery/theatre) "pqe" = ( /obj/structure/chair/wood{ dir = 4 @@ -46531,6 +46545,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"pEV" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/turf/open/floor/iron, +/area/station/engineering/atmos) "pEY" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -47024,6 +47046,18 @@ }, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) +"pOo" = ( +/obj/structure/table/glass, +/obj/machinery/light_switch/directional/west{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/camera/directional/west{ + c_tag = "Medbay Primary Treatment Centre West"; + network = list("ss13","medbay") + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "pOs" = ( /obj/effect/landmark/blobstart, /obj/structure/closet/secure_closet/detective, @@ -47842,11 +47876,6 @@ /obj/structure/sign/warning/biohazard, /turf/closed/wall/r_wall, /area/station/science/cytology) -"qfa" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood, -/area/station/service/library) "qfc" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -48841,6 +48870,24 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"qyZ" = ( +/obj/machinery/light_switch/directional/west{ + pixel_y = 26 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/rack, +/obj/item/hand_labeler, +/obj/item/stack/package_wrap, +/obj/item/stack/package_wrap, +/obj/item/holosign_creator/robot_seat/restaurant, +/turf/open/floor/iron/cafeteria, +/area/station/service/kitchen) "qzc" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -48995,10 +49042,6 @@ /obj/structure/window/reinforced/spawner/directional/north, /turf/open/space, /area/space/nearstation) -"qBH" = ( -/obj/machinery/mechpad, -/turf/open/floor/circuit/green, -/area/station/science/robotics/mechbay) "qCf" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -49245,23 +49288,6 @@ }, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"qFP" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - dir = 1; - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/service/kitchen) "qFR" = ( /obj/machinery/vending/security, /obj/machinery/firealarm/directional/east, @@ -51470,6 +51496,14 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"rCO" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/long_term_storage) "rDg" = ( /obj/structure/closet/secure_closet/miner, /obj/item/clothing/suit/hooded/wintercoat/miner, @@ -51549,6 +51583,16 @@ }, /turf/open/floor/wood, /area/station/commons/lounge) +"rFj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/bluespace_vendor/directional/north, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/light/directional/north, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "rFp" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -51806,14 +51850,6 @@ "rJv" = ( /turf/open/floor/plating, /area/station/hallway/primary/port) -"rJB" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/long_term_storage) "rJE" = ( /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/east, @@ -52027,14 +52063,6 @@ /obj/structure/cable, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"rOd" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/item/radio/intercom/directional/north, -/obj/effect/turf_decal/tile/green/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/long_term_storage) "rOi" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -52138,13 +52166,6 @@ /obj/effect/mapping_helpers/airlock/access/any/supply/mining, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"rPE" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/stripes/corner, -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/turf/open/floor/iron, -/area/station/engineering/break_room) "rPX" = ( /obj/machinery/shower/directional/west, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -53290,6 +53311,14 @@ /obj/structure/light_construct/directional/east, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"slR" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/green/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/long_term_storage) "slS" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, @@ -53934,6 +53963,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"syG" = ( +/obj/machinery/shower/directional/east, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/trash/soap{ + spawn_scatter_radius = 1 + }, +/turf/open/floor/iron, +/area/station/commons/toilet/auxiliary) "syS" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/purple/visible{ dir = 4 @@ -54254,14 +54291,6 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) -"sET" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/photocopier/prebuilt, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/office) "sFe" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -54433,18 +54462,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"sII" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/side{ - dir = 10 - }, -/area/station/medical/treatment_center) "sJA" = ( /obj/structure/chair/stool/directional/east, /obj/effect/turf_decal/trimline/red/warning{ @@ -54472,6 +54489,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"sJV" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 3 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/brig) "sKe" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/stripes/line{ @@ -54638,6 +54668,14 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"sOr" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/camera/directional/east{ + c_tag = "Law Office" + }, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/service/lawoffice) "sOs" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -55457,11 +55495,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"tdl" = ( -/obj/structure/cable, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "tdz" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance, @@ -56359,15 +56392,6 @@ /obj/effect/turf_decal/tile/red/fourcorners, /turf/open/floor/iron/white, /area/station/security/prison/safe) -"tvI" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/photocopier/prebuilt, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hos) "tvP" = ( /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Distro Loop" @@ -58790,6 +58814,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/solars/port/aft) +"uus" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/photocopier/prebuilt, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/office) "uuv" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line{ @@ -59100,12 +59132,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"uzN" = ( -/obj/machinery/iv_drip, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/status_display/ai/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "uzR" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -60184,16 +60210,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"uWf" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/reagent_containers/chem_pack, -/obj/item/reagent_containers/chem_pack{ - pixel_x = 7; - pixel_y = 6 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "uWm" = ( /obj/structure/flora/rock/pile/jungle/style_random, /turf/open/floor/grass, @@ -60947,17 +60963,6 @@ }, /turf/open/floor/iron, /area/station/security/office) -"vlz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/bluespace_vendor/directional/north, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "vlJ" = ( /obj/structure/closet/firecloset, /turf/open/floor/plating, @@ -62305,6 +62310,20 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"vMq" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/structure/sign/map/meta/right{ + name = "station map"; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "vMx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -63415,15 +63434,6 @@ /obj/machinery/duct, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"wki" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 10 - }, -/obj/machinery/sleeper/stasis/cryo{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/prison) "wkj" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos) @@ -63554,15 +63564,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/medical/morgue) -"wmP" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/radio/intercom/directional/north, -/obj/machinery/vitals_reader/directional/west, -/obj/item/stack/medical/wrap/gauze, -/obj/item/stack/medical/mesh, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "wmV" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -63836,24 +63837,6 @@ /obj/item/storage/box/bodybags, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) -"wta" = ( -/obj/machinery/light_switch/directional/west{ - pixel_y = 26 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/structure/rack, -/obj/item/hand_labeler, -/obj/item/stack/package_wrap, -/obj/item/stack/package_wrap, -/obj/item/holosign_creator/robot_seat/restaurant, -/turf/open/floor/iron/cafeteria, -/area/station/service/kitchen) "wtd" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/ordnance_burn_chamber_input{ dir = 1 @@ -64468,13 +64451,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"wGX" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/red, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "wHx" = ( /obj/machinery/light/directional/south, /obj/structure/rack, @@ -64796,6 +64772,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) +"wNe" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "wNm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67518,6 +67501,16 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/department/science/xenobiology) +"xPh" = ( +/obj/structure/table/glass, +/obj/item/retractor, +/obj/item/hemostat, +/obj/item/cautery, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/vitals_reader/directional/west, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/surgery/theatre) "xPF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -67525,6 +67518,19 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/commons/dorms) +"xQp" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/radio/intercom/directional/south, +/obj/item/storage/box/rxglasses{ + pixel_x = -4; + pixel_y = 8 + }, +/obj/item/storage/box/bodybags{ + pixel_y = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xQE" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -68498,12 +68504,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/storage) -"ykj" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/security/office) "ykr" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 8 @@ -82893,7 +82893,7 @@ jlv beL gFg bbK -jpN +rFj ong kqz rJv @@ -84701,7 +84701,7 @@ baE bnM baE baE -vlz +iCT fve bNK ikK @@ -84959,7 +84959,7 @@ hFc hFc dFc oHq -inv +daL ikK ikK ikK @@ -85216,9 +85216,9 @@ jCh fdG jfl jZV -bSY +vMq mwd -njw +syG oOc alK cBk @@ -85475,7 +85475,7 @@ mwd mwd mwd mwd -ksP +bkU rPX alK xYz @@ -86256,7 +86256,7 @@ jNC qHM koV dux -cbM +epQ hIt dux dux @@ -87038,13 +87038,13 @@ bUV dux mLD dux -nQw +xPh cpU cmk cnm coy cpU -paX +cGU dux eKh frp @@ -87552,13 +87552,13 @@ bYJ dux jLU dux -ljx +ozC ckW qLP cno axU whB -crl +jNT dux bXE mGo @@ -87784,7 +87784,7 @@ fhj eMW nxp kBZ -aJT +gdY nbM omo blh @@ -87794,7 +87794,7 @@ xnK eqw mvv eMW -qfa +kjv uDt ejn mht @@ -87830,7 +87830,7 @@ hdA ffu gHT tHB -uzN +msv xpZ cEE iHk @@ -88066,7 +88066,7 @@ dux xxb nLc dux -fPr +ppY cXe fFS sPt @@ -88344,7 +88344,7 @@ wEy ffu uWc gDK -mci +cop xpZ rMb fPJ @@ -88579,15 +88579,15 @@ dme dZY nLc dux -wmP -oKv +gNm +pOo nIN eFQ mYT dkG sNA tVS -uWf +dMe bXK bwf iCa @@ -88836,7 +88836,7 @@ uWR dux dux dux -flP +lws nCO gIf vjp @@ -89087,11 +89087,11 @@ alK qJF qQS alK -lUJ +foH olq gaP tqf -aiX +eVX mRw bFZ wjS @@ -89353,9 +89353,9 @@ iRL nIN pGd llx -iuH +fWs bJX -sII +goI wjS kjG axz @@ -89516,7 +89516,7 @@ arH ixt vrL yfg -wki +bCp fiu fiu wvy @@ -89569,7 +89569,7 @@ rVn fhB jdn vKw -lYd +wNe eGZ hRz iAO @@ -89631,7 +89631,7 @@ pPi pEM eOq jZY -lTo +ftn mjT dyH wCc @@ -89841,7 +89841,7 @@ eMW lTG gUu eMW -aJT +gdY xls lgw tTL @@ -89869,7 +89869,7 @@ yiv llx wQj fTG -nKB +eMM wjS rKP dPO @@ -90115,11 +90115,11 @@ auF dcr aqO alK -dIb +hDF raa jwA vXL -jJq +iBq mRw tMC oxQ @@ -90378,7 +90378,7 @@ iEO ifK gfu mRw -gQS +bSu duA uNh vsw @@ -90633,9 +90633,9 @@ pwf fDe rAm ljV -doQ +mnx mRw -nNX +dxQ iYO aNq fem @@ -90643,7 +90643,7 @@ xKj eMx uFV kUQ -nyq +xQp bXK cum nIa @@ -91914,7 +91914,7 @@ aWf vKT cHb ifK -sET +uus iCG sme cey @@ -92406,7 +92406,7 @@ nxX fdu tMo qcp -tdl +fFD hyz qnZ nxX @@ -93695,7 +93695,7 @@ vjo bJZ dxu nxX -nnN +bCz bzR veZ dDa @@ -93758,7 +93758,7 @@ cMS hpI cMg cMV -jIK +iGc eiR mSp cQJ @@ -94170,7 +94170,7 @@ afZ agQ pdx irI -dOT +sJV auW keY ukl @@ -96535,7 +96535,7 @@ doK gMj eCo lLe -iov +kVs bVj wRu fUR @@ -97007,7 +97007,7 @@ aBe aCp aDD aDC -wGX +evp aHD aIM aIR @@ -97318,7 +97318,7 @@ cxv lfN fbQ uax -nbp +eeL fWV ueF xpu @@ -97575,7 +97575,7 @@ cxv lfN qrp ctJ -qBH +htK euC jdN cDi @@ -98789,7 +98789,7 @@ hPK ris jLR mVh -ykj +kyN uEZ hBM lsL @@ -100352,7 +100352,7 @@ led oBX nXS iZl -ayl +sOr eZk vXF luN @@ -100412,7 +100412,7 @@ efD oiC oqy jeM -dEF +isH aVe suh hMa @@ -100624,7 +100624,7 @@ baT sgv bdO uBO -oRa +gwZ xir oIN nzd @@ -101614,7 +101614,7 @@ rqq tMV xVg gSo -tvI +deY vGk vGk vGk @@ -101643,7 +101643,7 @@ pRW mGQ pne dIw -bWb +gyD dnh meJ kMz @@ -101663,7 +101663,7 @@ rFc ehq rFY vss -eSv +chF jrj bzI tZf @@ -102427,7 +102427,7 @@ bBo bjw tFU nxG -lgc +nHP gYs xVk kLo @@ -102662,9 +102662,9 @@ wpL rpK xOr gsa -rJB +slR wQQ -mpg +dKs gsa lLr drO @@ -102919,9 +102919,9 @@ lks mGe oOj gsa -rOd +rCO dGp -mpg +dKs utC jKz oAC @@ -103176,9 +103176,9 @@ wpL ful ggP gsa -dtV +cwe uLh -mpg +dKs gsa ian gBl @@ -103465,7 +103465,7 @@ wfV fOs voI pha -wta +qyZ mTb ggE hyy @@ -103668,7 +103668,7 @@ tTW fvr scL lHu -eMZ +egZ dls pSI rfz @@ -103686,7 +103686,7 @@ sTJ dqy iPs tDs -jOl +ilm tYB oUt fBu @@ -103969,7 +103969,7 @@ pmA bjw dCM lBu -bla +djO glv otW iEa @@ -105261,7 +105261,7 @@ gII hEm wcl eKC -qFP +mMD fBD vUQ pGx @@ -109627,7 +109627,7 @@ kgQ owz xgO rvR -rPE +eJb pSK pSK iqL @@ -110387,7 +110387,7 @@ uQW fsk qKK rAh -ddR +nQU xMa atx oxe @@ -111184,7 +111184,7 @@ ptd dwd ptd mvS -iek +pEV eKy fJd caT diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index c90394d23ec2..e1c326ed9107 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -3810,6 +3810,11 @@ /obj/machinery/light/floor, /turf/open/floor/glass/reinforced, /area/station/science/lab) +"aDQ" = ( +/obj/structure/table/reinforced/rglass, +/obj/machinery/microwave, +/turf/open/floor/iron/dark/small, +/area/station/engineering/storage_shared) "aDT" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -4763,6 +4768,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"aKP" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/bot, +/obj/structure/sign/calendar/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/storage_shared) "aKQ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 6 @@ -5274,6 +5285,28 @@ }, /turf/open/floor/iron/dark/small, /area/station/engineering/atmos) +"aOr" = ( +/obj/structure/rack, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/south, +/obj/item/storage/medkit/fire, +/obj/item/storage/belt/utility, +/obj/item/lightreplacer{ + pixel_y = 7 + }, +/obj/item/flatpack/flatpacker{ + pixel_y = -3 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/storage_shared) "aOs" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -7067,6 +7100,11 @@ dir = 8 }, /area/station/engineering/atmos/storage) +"bcE" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/bot_white, +/turf/open/floor/iron/dark/textured, +/area/station/security/office) "bcJ" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -7559,6 +7597,15 @@ /obj/structure/secure_safe/directional/west, /turf/open/floor/wood/large, /area/station/commons/dorms) +"bgz" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/photocopier/prebuilt, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/wood/large, +/area/station/security/detectives_office) "bgN" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -7749,15 +7796,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) -"biP" = ( -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/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/white/smooth_large, -/area/station/medical/treatment_center) "biQ" = ( /obj/structure/flora/bush/fullgrass, /obj/structure/flora/bush/grassy/style_random, @@ -14742,18 +14780,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) -"ckO" = ( -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/bed/medical{ - dir = 4 - }, -/obj/item/bedsheet/medical, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "ckV" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -15776,20 +15802,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"ctj" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "ctp" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -16923,27 +16935,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron/dark/small, /area/station/command/teleporter) -"cAL" = ( -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/obj/item/radio/intercom/directional/east, -/obj/structure/closet/crate/trashcart/laundry, -/obj/machinery/bluespace_vendor/directional/south, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/siding/dark_blue{ - dir = 8 - }, -/obj/item/clothing/gloves/maid, -/obj/item/clothing/accessory/maidapron, -/obj/item/clothing/under/costume/maid, -/obj/item/clothing/neck/maid, -/obj/effect/spawner/random/clothing/kittyears_or_rabbitears, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/plastic, -/area/station/commons/dorms/laundry) "cAR" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -18601,6 +18592,14 @@ }, /turf/open/floor/iron/dark, /area/station/command) +"cNm" = ( +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/treatment_center) "cNs" = ( /obj/effect/turf_decal/tile/dark/opposingcorners, /obj/structure/railing{ @@ -19030,22 +19029,6 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) -"cRj" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/machinery/light/cold/directional/south{ - pixel_x = -16 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "cRl" = ( /obj/effect/turf_decal/siding/wideplating_new/dark/corner{ dir = 4 @@ -19190,13 +19173,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/command/heads_quarters/qm) -"cRX" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/delivery, -/obj/machinery/bluespace_vendor/directional/north, -/obj/structure/closet/crate, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/atmos) "cRZ" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -20179,22 +20155,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/hallway/secondary/exit/departure_lounge) -"cZC" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/structure/sign/warning/cold_temp/directional/south{ - pixel_x = 16 - }, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "cZG" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/trimline/dark_blue/filled/warning, @@ -22983,17 +22943,6 @@ /obj/effect/turf_decal/trimline/dark, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"dtP" = ( -/obj/effect/turf_decal/trimline/purple/corner{ - dir = 8 - }, -/obj/machinery/airalarm/directional/east, -/obj/structure/table/glass, -/obj/machinery/photocopier/prebuilt{ - pixel_y = 5 - }, -/turf/open/floor/iron/white, -/area/station/science/research) "dtW" = ( /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/trimline/blue/filled/corner, @@ -24205,18 +24154,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/small, /area/station/service/cafeteria) -"dCZ" = ( -/obj/effect/turf_decal/trimline/blue/end{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark/end{ - dir = 8 - }, -/obj/machinery/vitals_reader/directional/west{ - id_tag = "uppercryo" - }, -/turf/open/floor/iron/dark/small, -/area/station/medical/cryo) "dDn" = ( /obj/effect/turf_decal/tile/yellow, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -27463,17 +27400,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/hallway/primary/central) -"ecE" = ( -/obj/effect/turf_decal/trimline/green/line, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/south, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "ecG" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27668,6 +27594,20 @@ }, /turf/open/floor/plating, /area/station/maintenance/fore/greater) +"edS" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "edV" = ( /obj/effect/turf_decal/siding/thinplating_new/dark/corner{ dir = 4 @@ -28990,6 +28930,15 @@ dir = 8 }, /area/station/security/interrogation) +"eoe" = ( +/obj/structure/window/spawner/directional/south, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/photocopier/prebuilt, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/wood/large, +/area/station/service/lawoffice) "eof" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/cmo) @@ -29277,6 +29226,13 @@ /obj/machinery/modular_computer/preset/id, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/hos) +"eqm" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood/large, +/area/station/service/library) "eqr" = ( /obj/structure/railing{ dir = 1 @@ -29924,11 +29880,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/checkpoint/engineering) -"evk" = ( -/obj/machinery/atmospherics/components/unary/bluespace_sender, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/atmos) "evu" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/purple{ @@ -32859,6 +32810,12 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) +"eSx" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "eSD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34510,6 +34467,17 @@ /obj/effect/turf_decal/delivery/white, /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/aft/greater) +"ffa" = ( +/obj/machinery/restaurant_portal/bar, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/light/directional/south{ + color = "#ffcc99" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) "ffj" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -34563,6 +34531,11 @@ /obj/effect/turf_decal/siding/thinplating_new, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"ffC" = ( +/obj/effect/turf_decal/siding/wood/end, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood/large, +/area/station/service/chapel/office) "ffE" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -35179,26 +35152,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness/recreation/lasertag) -"fjZ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/obj/effect/turf_decal/siding/dark/corner, -/obj/effect/turf_decal/trimline/blue/line{ - dir = 9 - }, -/obj/effect/turf_decal/trimline/blue/corner, -/obj/machinery/duct, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/vitals_reader/directional/west{ - id_tag = "lowercryo" - }, -/turf/open/floor/iron/dark/small, -/area/station/medical/cryo) "fkb" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -36407,23 +36360,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"ful" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/red/line{ - dir = 8 - }, -/obj/machinery/sleeper/stasis/cryo{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/security/prison) "fut" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -37543,6 +37479,13 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/service/chapel/funeral) +"fDe" = ( +/obj/machinery/computer/mechpad, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) "fDg" = ( /obj/effect/decal/cleanable/shreds, /obj/structure/cable, @@ -39397,6 +39340,13 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/prison/workout) +"fRr" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/delivery, +/obj/machinery/bluespace_vendor/directional/north, +/obj/structure/closet/crate, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos) "fRu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -41761,14 +41711,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"giO" = ( -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/treatment_center) "giQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -41836,17 +41778,6 @@ /obj/effect/landmark/start/atmospheric_technician, /turf/open/floor/iron/dark/textured, /area/station/engineering/atmos/storage/gas) -"gjm" = ( -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/bluespace_vendor/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "gjq" = ( /obj/effect/turf_decal/trimline/red/line{ dir = 8 @@ -43800,6 +43731,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, /area/station/security/prison) +"gyj" = ( +/obj/structure/rack, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/bluespace_vendor/directional/north, +/obj/item/wallframe/digital_clock{ + pixel_y = 8 + }, +/obj/item/wallframe/digital_clock{ + pixel_y = 4 + }, +/obj/item/wallframe/digital_clock, +/turf/open/floor/iron/dark, +/area/station/commons/storage/primary) "gym" = ( /turf/open/space/basic, /area/space) @@ -45031,6 +44975,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/commons/fitness/recreation) +"gIo" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/item/ammo_casing/rocket{ + pixel_x = 4; + pixel_y = 15; + name = "Dud Rocket"; + desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure." + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/qm) "gIt" = ( /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) @@ -45705,6 +45662,13 @@ }, /turf/open/floor/wood/large, /area/station/service/chapel/office) +"gNo" = ( +/obj/machinery/light/directional/north, +/obj/effect/turf_decal/delivery, +/obj/machinery/portable_atmospherics/canister, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos) "gNp" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -46020,19 +45984,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/bridge) -"gPU" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/item/ammo_casing/rocket{ - pixel_x = 4; - pixel_y = 15; - name = "Dud Rocket"; - desc = "An 84mm High Explosive rocket. This one's a dud. Pretty sure." - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/qm) "gPZ" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -46954,12 +46905,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) -"gXI" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/bot, -/obj/structure/sign/calendar/directional/north, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/storage_shared) "gXM" = ( /obj/structure/closet/secure_closet/engineering_electrical, /obj/effect/turf_decal/siding/thinplating_new/dark{ @@ -49044,28 +48989,6 @@ /obj/structure/marker_beacon/lime, /turf/open/floor/grass, /area/station/security/brig) -"hmW" = ( -/obj/structure/rack, -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/line{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/south, -/obj/item/storage/medkit/fire, -/obj/item/storage/belt/utility, -/obj/item/lightreplacer{ - pixel_y = 7 - }, -/obj/item/flatpack/flatpacker{ - pixel_y = -3 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/storage_shared) "hmZ" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -49971,14 +49894,6 @@ dir = 8 }, /area/station/security/brig/lower) -"huc" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/machinery/digital_clock/directional/south, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/surgery/theatre) "hud" = ( /obj/structure/sign/warning/docking/directional/west, /obj/machinery/light/small/directional/west, @@ -50131,6 +50046,17 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white/small, /area/station/science/lobby) +"hvE" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 10 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark, +/area/station/cargo/office) "hvR" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 4 @@ -53297,6 +53223,23 @@ /obj/structure/cable, /turf/open/floor/iron/dark/diagonal, /area/station/science/xenobiology) +"hTf" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/red/line{ + dir = 8 + }, +/obj/machinery/sleeper/stasis/cryo{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/security/prison) "hTo" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible/layer1{ dir = 1 @@ -53330,20 +53273,6 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) -"hTw" = ( -/obj/machinery/sleeper/stasis/cryo{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark_green{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/green/half/contrasted, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "hTz" = ( /obj/structure/rack, /obj/item/emergency_bed, @@ -56713,18 +56642,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"itO" = ( -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/status_display/evac/directional/north, -/obj/structure/table/wood/fancy/red, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/wood/large, -/area/station/service/kitchen/diner) "iua" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -58838,17 +58755,6 @@ /obj/structure/lattice, /turf/open/space/basic, /area/space/nearstation) -"iJD" = ( -/obj/effect/turf_decal/trimline/white/line{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/white/line, -/obj/structure/table/reinforced/rglass, -/obj/machinery/photocopier/prebuilt{ - pixel_y = 4 - }, -/turf/open/floor/iron/dark/textured_large, -/area/station/hallway/secondary/service) "iJI" = ( /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, @@ -59751,13 +59657,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/textured_large, /area/station/maintenance/department/cargo) -"iQB" = ( -/obj/machinery/light/directional/north, -/obj/effect/turf_decal/delivery, -/obj/machinery/portable_atmospherics/canister, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron/dark/textured_large, -/area/station/engineering/atmos) "iQC" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -60170,13 +60069,6 @@ /obj/effect/turf_decal/tile/blue/diagonal_centre, /turf/open/floor/iron/white/diagonal, /area/station/science/breakroom) -"iUk" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood/large, -/area/station/service/library) "iUp" = ( /obj/effect/turf_decal/trimline/dark/warning, /obj/structure/chair/stool/directional/south, @@ -61072,15 +60964,6 @@ }, /turf/open/floor/iron/dark/smooth_edge, /area/station/hallway/primary/port) -"jbS" = ( -/obj/machinery/sleeper/stasis/cryo, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/siding/dark_green, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/commons/long_term_storage) "jbW" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 1 @@ -65922,19 +65805,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/cargo/miningoffice) -"jNk" = ( -/obj/structure/railing{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood/large, -/area/station/service/library/upper) "jNn" = ( /obj/effect/turf_decal/trimline/dark/warning{ dir = 4 @@ -66467,17 +66337,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) -"jQP" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 10 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark, -/area/station/cargo/office) "jQQ" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -70377,6 +70236,11 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"ksS" = ( +/obj/machinery/photocopier/prebuilt, +/obj/structure/sign/flag/ssc/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/meeting_room) "ksT" = ( /obj/structure/chair/sofa/corp, /obj/effect/landmark/start/assistant, @@ -70852,16 +70716,6 @@ name = "hyper-reinforced wall" }, /area/station/science/ordnance/bomb) -"kvR" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 - }, -/turf/open/floor/wood/tile, -/area/station/maintenance/starboard/central) "kvX" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor/border_only{ @@ -71711,6 +71565,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"kCo" = ( +/obj/machinery/atmospherics/components/unary/bluespace_sender, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark/textured_large, +/area/station/engineering/atmos) "kCp" = ( /obj/structure/sign/warning/secure_area{ desc = "A warning sign which reads 'SERVER ROOM'."; @@ -72308,10 +72167,6 @@ "kFj" = ( /turf/closed/wall, /area/station/cargo/lower) -"kFm" = ( -/obj/machinery/mechpad, -/turf/open/floor/circuit/green, -/area/station/science/robotics/mechbay) "kFn" = ( /obj/effect/turf_decal/trimline/dark/warning, /obj/effect/turf_decal/siding/thinplating_new/dark, @@ -74460,13 +74315,6 @@ }, /turf/open/floor/wood/large, /area/station/commons/vacant_room/office) -"kXY" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/ce) "kYa" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, @@ -74929,17 +74777,6 @@ }, /turf/open/floor/iron/dark, /area/station/cargo/storage) -"lcp" = ( -/obj/machinery/cryo_cell{ - dir = 4; - id_tag = "uppercryo" - }, -/obj/effect/turf_decal/bot_white{ - color = "#52B4E9" - }, -/obj/structure/sign/warning/cold_temp/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/medical/cryo) "lcq" = ( /obj/machinery/computer/operating, /obj/effect/turf_decal/siding{ @@ -75197,6 +75034,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet/red, /area/station/commons/dorms) +"lff" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark, +/area/station/command) "lfg" = ( /obj/structure/cable, /obj/structure/railing/corner{ @@ -75306,14 +75151,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"lfL" = ( -/obj/machinery/digital_clock/directional/south, -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/surgery/theatre) "lfV" = ( /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, @@ -77957,27 +77794,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) -"lAm" = ( -/obj/machinery/defibrillator_mount/directional/south, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/bed/medical{ - dir = 4 - }, -/obj/item/bedsheet/medical, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) -"lAq" = ( -/obj/machinery/cryo_cell{ - dir = 4; - id_tag = "lowercryo" - }, -/obj/effect/turf_decal/bot_white{ - color = "#52B4E9" - }, -/obj/structure/sign/warning/cold_temp/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/medical/cryo) "lAr" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -81239,6 +81055,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/central) +"mce" = ( +/obj/effect/turf_decal/trimline/green/line, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "mck" = ( /obj/machinery/airalarm/directional/south, /obj/structure/rack, @@ -81422,6 +81249,18 @@ /obj/item/reagent_containers/cup/rag, /turf/open/floor/iron/white/textured_large, /area/station/maintenance/department/medical) +"mdO" = ( +/obj/effect/turf_decal/trimline/blue/end{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/obj/machinery/vitals_reader/directional/west{ + id_tag = "uppercryo" + }, +/turf/open/floor/iron/dark/small, +/area/station/medical/cryo) "mdT" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -81708,6 +81547,10 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) +"mgd" = ( +/obj/machinery/mechpad, +/turf/open/floor/circuit/green, +/area/station/science/robotics/mechbay) "mgk" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -82072,11 +81915,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) -"miZ" = ( -/obj/effect/turf_decal/siding/wood/end, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood/large, -/area/station/service/chapel/office) "mjb" = ( /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ dir = 8 @@ -82164,6 +82002,27 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/mineral/plastitanium/airless, /area/space/nearstation) +"mjK" = ( +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/obj/item/radio/intercom/directional/east, +/obj/structure/closet/crate/trashcart/laundry, +/obj/machinery/bluespace_vendor/directional/south, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/siding/dark_blue{ + dir = 8 + }, +/obj/item/clothing/gloves/maid, +/obj/item/clothing/accessory/maidapron, +/obj/item/clothing/under/costume/maid, +/obj/item/clothing/neck/maid, +/obj/effect/spawner/random/clothing/kittyears_or_rabbitears, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plastic, +/area/station/commons/dorms/laundry) "mjN" = ( /obj/effect/turf_decal/bot, /obj/effect/spawner/random/structure/crate_abandoned, @@ -82244,6 +82103,13 @@ }, /turf/open/floor/iron/dark/small, /area/station/service/theater) +"mkr" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/ce) "mkx" = ( /obj/effect/turf_decal/plaque{ icon_state = "L12" @@ -83033,17 +82899,6 @@ /obj/structure/no_effect_signpost, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"mqZ" = ( -/obj/effect/turf_decal/tile/dark/opposingcorners, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "kitchen_counter"; - name = "Kitchen Counter Shutters" - }, -/obj/machinery/door/firedoor, -/obj/structure/table/reinforced, -/obj/item/holosign_creator/robot_seat/restaurant, -/turf/open/floor/iron/dark, -/area/station/service/kitchen) "mrb" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83981,6 +83836,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/herringbone, /area/station/service/janitor) +"myR" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/machinery/light_switch/directional/west, +/obj/machinery/status_display/evac/directional/north, +/obj/structure/table/wood/fancy/red, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/wood/large, +/area/station/service/kitchen/diner) "myU" = ( /obj/structure/rack, /obj/effect/spawner/random/trash/janitor_supplies, @@ -84810,6 +84677,18 @@ /obj/structure/marker_beacon/lime, /turf/open/floor/grass, /area/station/hallway/secondary/entry) +"mEP" = ( +/obj/effect/turf_decal/siding/thinplating_new/dark{ + dir = 10 + }, +/obj/effect/turf_decal/tile/yellow/diagonal_centre, +/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ + dir = 4 + }, +/obj/machinery/photocopier/prebuilt, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/diagonal, +/area/station/engineering/lobby) "mFe" = ( /obj/effect/decal/cleanable/confetti, /turf/open/floor/wood, @@ -84893,6 +84772,14 @@ }, /turf/open/floor/wood/large, /area/station/command/heads_quarters/hos) +"mFz" = ( +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/machinery/digital_clock/directional/south, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/surgery/theatre) "mFA" = ( /obj/structure/table/reinforced/plastitaniumglass, /obj/item/keyboard_shell{ @@ -85696,6 +85583,17 @@ }, /turf/open/floor/grass, /area/station/science/lower) +"mMf" = ( +/obj/effect/turf_decal/trimline/yellow/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/bluespace_vendor/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "mMr" = ( /obj/structure/tank_holder/extinguisher, /obj/machinery/light_switch/directional/south, @@ -91457,15 +91355,6 @@ /obj/structure/flora/tree/jungle/small/style_5, /turf/open/floor/grass, /area/station/service/chapel) -"nGA" = ( -/obj/structure/window/spawner/directional/south, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/photocopier/prebuilt, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/wood/large, -/area/station/service/lawoffice) "nGH" = ( /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, @@ -99280,14 +99169,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/lower) -"oNu" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/light_switch/directional/west, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark, -/area/station/command) "oNx" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 @@ -99411,6 +99292,30 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/plastic, /area/station/security/prison/work) +"oOm" = ( +/obj/machinery/button/door/directional/north{ + id = "medprivacy"; + name = "Medbay Shutters Control"; + pixel_x = -6; + req_access = list("medical") + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/bed/medical, +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/directional/north{ + pixel_x = 6; + pixel_y = 24 + }, +/obj/item/bedsheet/medical{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north{ + pixel_y = 36 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "oOr" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -99896,6 +99801,19 @@ }, /turf/open/floor/wood/large, /area/station/security/prison/rec) +"oQy" = ( +/obj/structure/railing{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood/large, +/area/station/service/library/upper) "oQA" = ( /obj/structure/stairs/north, /turf/open/floor/iron/dark, @@ -103689,17 +103607,6 @@ icon_state = "asteroid6" }, /area/space/nearstation) -"psu" = ( -/obj/machinery/restaurant_portal/bar, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/light/directional/south{ - color = "#ffcc99" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood/large, -/area/station/commons/lounge) "psy" = ( /turf/open/floor/carpet/royalblue, /area/station/command/heads_quarters/hop) @@ -105145,6 +105052,19 @@ /obj/structure/lattice, /turf/open/space/openspace, /area/space/nearstation) +"pCf" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/line{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "pCg" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 8 @@ -106038,11 +105958,6 @@ }, /turf/open/floor/iron/white, /area/station/hallway/primary/fore) -"pJh" = ( -/obj/structure/table/reinforced/rglass, -/obj/machinery/microwave/engineering/cell_included, -/turf/open/floor/iron/dark/small, -/area/station/engineering/storage_shared) "pJi" = ( /obj/effect/turf_decal/tile/dark_blue, /obj/effect/turf_decal/trimline/dark_blue/filled/line{ @@ -106382,20 +106297,16 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"pMp" = ( -/obj/structure/table/reinforced, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/iron/fifty, -/obj/item/grenade/chem_grenade/smart_metal_foam, -/obj/item/grenade/chem_grenade/smart_metal_foam, -/obj/item/clothing/shoes/magboots{ - pixel_x = -4; - pixel_y = 3 +"pMz" = ( +/obj/machinery/defibrillator_mount/directional/south, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/structure/bed/medical{ + dir = 4 }, -/obj/item/clothing/shoes/magboots, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron/dark/textured, -/area/station/engineering/engine_smes) +/obj/item/bedsheet/medical, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "pMB" = ( /obj/effect/turf_decal/trimline/purple/filled/shrink_ccw, /obj/effect/turf_decal/trimline/dark_red/line, @@ -106829,12 +106740,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/fore/greater) -"pPj" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "pPk" = ( /obj/structure/sign/poster/official/random/directional/north, /obj/effect/spawner/random/vending/snackvend, @@ -112130,16 +112035,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"qFz" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/structure/secure_safe/directional/north, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/hop) "qFE" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -114677,6 +114572,15 @@ }, /turf/open/floor/wood/tile, /area/station/service/cafeteria) +"qZr" = ( +/obj/machinery/sleeper/stasis/cryo, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/siding/dark_green, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "qZz" = ( /obj/effect/turf_decal/trimline/yellow, /obj/machinery/light/floor, @@ -117709,30 +117613,6 @@ /obj/effect/turf_decal/trimline/blue/corner, /turf/open/floor/iron/dark, /area/station/command/bridge) -"rwI" = ( -/obj/machinery/button/door/directional/north{ - id = "medprivacy"; - name = "Medbay Shutters Control"; - pixel_x = -6; - req_access = list("medical") - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/structure/bed/medical, -/obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north{ - pixel_x = 6; - pixel_y = 24 - }, -/obj/item/bedsheet/medical{ - dir = 4 - }, -/obj/machinery/digital_clock/directional/north{ - pixel_y = 36 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "rwS" = ( /obj/effect/turf_decal/trimline/dark/end{ dir = 1 @@ -120912,20 +120792,6 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) -"rVX" = ( -/obj/structure/table/wood/fancy/red, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/newscaster/directional/south, -/obj/machinery/light/directional/south{ - color = "#ffcc99" - }, -/obj/effect/turf_decal/siding/wood{ - dir = 10 - }, -/turf/open/floor/wood/large, -/area/station/commons/lounge) "rWr" = ( /obj/effect/turf_decal/box, /obj/machinery/light/floor, @@ -123406,6 +123272,17 @@ /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/iron/dark/textured, /area/station/maintenance/disposal/incinerator) +"srt" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/machinery/photocopier/prebuilt, +/obj/item/toy/figure/hos{ + pixel_y = 12; + pixel_x = 3 + }, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hos) "sry" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -126642,6 +126519,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) +"sSE" = ( +/obj/machinery/digital_clock/directional/south, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/surgery/theatre) "sSH" = ( /obj/structure/railing/corner{ dir = 1 @@ -126768,19 +126653,6 @@ /obj/structure/flora/bush/lavendergrass/style_random, /turf/open/misc/asteroid/airless, /area/space/nearstation) -"sTz" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/purple/line{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "sTA" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 8 @@ -128265,6 +128137,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/small, /area/station/maintenance/starboard/central) +"teT" = ( +/obj/structure/table/wood/fancy/red, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/newscaster/directional/south, +/obj/machinery/light/directional/south{ + color = "#ffcc99" + }, +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/turf/open/floor/wood/large, +/area/station/commons/lounge) "teV" = ( /obj/effect/turf_decal/trimline/green/corner, /obj/effect/turf_decal/trimline/green/corner{ @@ -129629,17 +129515,6 @@ }, /turf/open/openspace, /area/station/science/research) -"tpu" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/machinery/photocopier/prebuilt, -/obj/item/toy/figure/hos{ - pixel_y = 12; - pixel_x = 3 - }, -/turf/open/floor/wood/large, -/area/station/command/heads_quarters/hos) "tpv" = ( /turf/open/floor/iron/stairs{ color = "#3d3e42"; @@ -136175,13 +136050,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"uoc" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 3 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/wood/large, -/area/station/service/library/upper) "uof" = ( /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, @@ -137591,14 +137459,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/small, /area/station/maintenance/central) -"uzD" = ( -/obj/effect/turf_decal/siding/wood/end{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/restaurant_portal/restaurant, -/turf/open/floor/wood/large, -/area/station/service/kitchen/diner) "uzE" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -138821,6 +138681,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/small, /area/station/commons/fitness/recreation/pool) +"uKe" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "uKq" = ( /obj/machinery/atmospherics/pipe/smart/simple/purple/visible{ dir = 10 @@ -140370,6 +140244,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) +"uVy" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 4 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/secure_safe/directional/north, +/turf/open/floor/wood/large, +/area/station/command/heads_quarters/hop) "uVB" = ( /obj/structure/flora/bush/sparsegrass/style_random, /turf/open/floor/grass, @@ -141969,6 +141853,22 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark/textured, /area/station/command) +"vgs" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/machinery/light/cold/directional/south{ + pixel_x = -16 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "vgv" = ( /obj/structure/railing{ dir = 1 @@ -142391,6 +142291,17 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/project) +"viM" = ( +/obj/effect/turf_decal/trimline/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/white/line, +/obj/structure/table/reinforced/rglass, +/obj/machinery/photocopier/prebuilt{ + pixel_y = 4 + }, +/turf/open/floor/iron/dark/textured_large, +/area/station/hallway/secondary/service) "viP" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -146494,13 +146405,6 @@ dir = 8 }, /area/station/ai_monitored/turret_protected/aisat/atmos) -"vPe" = ( -/obj/machinery/computer/mechpad, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/circuit/green, -/area/station/science/robotics/mechbay) "vPg" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 5 @@ -146523,18 +146427,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/ai_monitored/security/armory) -"vPk" = ( -/obj/effect/turf_decal/siding/thinplating_new/dark{ - dir = 10 - }, -/obj/effect/turf_decal/tile/yellow/diagonal_centre, -/obj/effect/turf_decal/siding/thinplating_new/dark/corner{ - dir = 4 - }, -/obj/machinery/photocopier/prebuilt, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/diagonal, -/area/station/engineering/lobby) "vPm" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -146589,6 +146481,17 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat_interior) +"vPM" = ( +/obj/machinery/cryo_cell{ + dir = 4; + id_tag = "uppercryo" + }, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) "vPU" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -148195,15 +148098,6 @@ /obj/structure/flora/bush/sparsegrass/style_3, /turf/open/floor/grass, /area/station/ai_monitored/aisat/exterior) -"wco" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/photocopier/prebuilt, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/wood/large, -/area/station/security/detectives_office) "wcq" = ( /obj/structure/chair/sofa/corp, /obj/machinery/incident_display/delam/directional/north, @@ -149089,6 +148983,20 @@ }, /turf/open/floor/wood/large, /area/station/service/library/upper) +"wjB" = ( +/obj/structure/table/reinforced, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/iron/fifty, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/grenade/chem_grenade/smart_metal_foam, +/obj/item/clothing/shoes/magboots{ + pixel_x = -4; + pixel_y = 3 + }, +/obj/item/clothing/shoes/magboots, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron/dark/textured, +/area/station/engineering/engine_smes) "wjK" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -149534,11 +149442,6 @@ }, /turf/open/floor/iron/dark/small, /area/station/service/minibar) -"wna" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/bot_white, -/turf/open/floor/iron/dark/textured, -/area/station/security/office) "wnh" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/window/reinforced/spawner/directional/south, @@ -150103,6 +150006,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/textured, /area/station/security/checkpoint/science) +"wtc" = ( +/obj/machinery/cryo_cell{ + dir = 4; + id_tag = "lowercryo" + }, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, +/obj/structure/sign/warning/cold_temp/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/medical/cryo) "wti" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -150601,6 +150515,13 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/department/science) +"wwD" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 3 + }, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/wood/large, +/area/station/service/library/upper) "wwI" = ( /turf/open/floor/iron/dark/small, /area/station/engineering/atmos) @@ -151416,6 +151337,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/misc/asteroid/airless, /area/space/nearstation) +"wCZ" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 + }, +/turf/open/floor/wood/tile, +/area/station/maintenance/starboard/central) "wDd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/cobweb, @@ -153136,6 +153067,17 @@ /obj/effect/spawner/random/engineering/tool, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) +"wQt" = ( +/obj/effect/turf_decal/tile/dark/opposingcorners, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "kitchen_counter"; + name = "Kitchen Counter Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/table/reinforced, +/obj/item/holosign_creator/robot_seat/restaurant, +/turf/open/floor/iron/dark, +/area/station/service/kitchen) "wQC" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -156105,11 +156047,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/prison) -"xoW" = ( -/obj/machinery/photocopier/prebuilt, -/obj/structure/sign/flag/ssc/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/meeting_room) "xpa" = ( /obj/machinery/plumbing/synthesizer/beer, /obj/effect/turf_decal/trimline/brown/line{ @@ -156123,6 +156060,26 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/station/service/bar/backroom) +"xpk" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 9 + }, +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/trimline/blue/line{ + dir = 9 + }, +/obj/effect/turf_decal/trimline/blue/corner, +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/vitals_reader/directional/west{ + id_tag = "lowercryo" + }, +/turf/open/floor/iron/dark/small, +/area/station/medical/cryo) "xpl" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/window/spawner/directional/south, @@ -157213,6 +157170,17 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) +"xxS" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8 + }, +/obj/machinery/airalarm/directional/east, +/obj/structure/table/glass, +/obj/machinery/photocopier/prebuilt{ + pixel_y = 5 + }, +/turf/open/floor/iron/white, +/area/station/science/research) "xxU" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/turf_decal/siding/wood{ @@ -157633,6 +157601,18 @@ dir = 1 }, /area/station/medical/pharmacy) +"xBd" = ( +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/bed/medical{ + dir = 4 + }, +/obj/item/bedsheet/medical, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xBf" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -158758,19 +158738,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/maintenance/port/aft) -"xJr" = ( -/obj/structure/rack, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/bluespace_vendor/directional/north, -/obj/item/wallframe/digital_clock{ - pixel_y = 8 - }, -/obj/item/wallframe/digital_clock{ - pixel_y = 4 - }, -/obj/item/wallframe/digital_clock, -/turf/open/floor/iron/dark, -/area/station/commons/storage/primary) "xJz" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 @@ -159607,6 +159574,14 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) +"xPf" = ( +/obj/effect/turf_decal/siding/wood/end{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/wood/large, +/area/station/service/kitchen/diner) "xPk" = ( /turf/closed/wall/r_wall, /area/station/engineering/atmos/storage) @@ -160549,6 +160524,22 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/explab) +"xWO" = ( +/obj/machinery/sleeper/stasis/cryo{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark_green{ + dir = 1 + }, +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/structure/sign/warning/cold_temp/directional/south{ + pixel_x = 16 + }, +/turf/open/floor/iron/white, +/area/station/commons/long_term_storage) "xWR" = ( /obj/effect/turf_decal/trimline/yellow/end{ dir = 4 @@ -161357,6 +161348,15 @@ }, /turf/open/floor/plating, /area/station/medical/chemistry) +"ycS" = ( +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/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/white/smooth_large, +/area/station/medical/treatment_center) "ycT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -185952,7 +185952,7 @@ ajC ajC uUr nKG -cAL +mjK prx ltW alS @@ -186738,7 +186738,7 @@ nAv uXR uYw wdk -iUk +eqm hQo hhW bKj @@ -191380,7 +191380,7 @@ djI tpZ fYj rdK -pMp +wjB oWk atz fVj @@ -196430,7 +196430,7 @@ nnP mBN ufX oZM -gPU +gIo skL brW flO @@ -197309,7 +197309,7 @@ diw rqr mIi lnO -kXY +mkr diw aHQ cXo @@ -197815,7 +197815,7 @@ bfX vqm gHa suG -cRX +fRr tbP dmH ktl @@ -198603,7 +198603,7 @@ xBV qZz nzm iek -evk +kCo pbP qTF hVS @@ -200631,7 +200631,7 @@ cDk suG suG wFE -kvR +wCZ bcm qfr jQm @@ -200899,7 +200899,7 @@ aWI gnQ oQJ suG -iQB +gNo pQr dmH wAh @@ -201910,7 +201910,7 @@ roG iQc vqc aLU -wna +bcE lYc rsx wkV @@ -202668,7 +202668,7 @@ iUM gAJ mus isy -tpu +srt gBS pCG mzH @@ -211926,7 +211926,7 @@ ehw fnu uRf wFX -oNu +lff mqK fyL qEH @@ -236843,7 +236843,7 @@ kaT jIo eLb bMt -miZ +ffC wjK ewF txW @@ -242496,7 +242496,7 @@ jAf noR kKe aOZ -iJD +viM vHB sDr tqa @@ -247374,7 +247374,7 @@ oEJ wjg lLe aet -itO +myR sMh pOI pAP @@ -247400,7 +247400,7 @@ eXj uTF gZE eYM -rVX +teT ngL hTW vGe @@ -248658,7 +248658,7 @@ nuC lFs mRk eCl -mqZ +wQt iqS rer cjB @@ -249944,7 +249944,7 @@ tKF vTr mwA aet -uzD +xPf tmj rSd pAP @@ -249970,7 +249970,7 @@ sEi xdB exj mKD -psu +ffa ngL vJd rVK @@ -253283,12 +253283,12 @@ nxv hYO onh hCZ -uoc +wwD bsr cuf iyM ils -jNk +oQy aTs uTX xku @@ -253518,7 +253518,7 @@ axH rXn pPJ nHB -rwI +oOm aqQ vrR feR @@ -253528,11 +253528,11 @@ dCf aqQ gyf nHB -dCZ -lcp +mdO +vPM tMT -lAq -fjZ +wtc +xpk gIR bsL bsL @@ -254037,7 +254037,7 @@ myd erL rZy kvF -biP +ycS tjx wzO qTK @@ -254549,7 +254549,7 @@ lRl xby hFq mcX -giO +cNm gtI gpj oKN @@ -255317,7 +255317,7 @@ tJb gBN gBN nHB -ckO +xBd iTb toO kRr @@ -255325,7 +255325,7 @@ nqp clv toO fdM -lAm +pMz nHB axF axF @@ -255614,7 +255614,7 @@ hCZ tpb oRQ dfK -ecE +mce naa kKl wsj @@ -256623,7 +256623,7 @@ vlQ mkK oVs nyK -lfL +sSE hCZ kdV ioj @@ -257651,7 +257651,7 @@ reS wCn xOn jOc -huc +mFz hCZ htW gaY @@ -258642,7 +258642,7 @@ qUA dcm taD uyZ -jQP +hvE kLa bIz kyi @@ -260012,7 +260012,7 @@ unz gFi ggN mOg -vPk +mEP gFi mYB yfU @@ -261048,7 +261048,7 @@ agg npO tHx cAe -gXI +aKP iHY nrq ekj @@ -261285,7 +261285,7 @@ bkO ddf qkZ xAh -gjm +mMf oLT dIr jEG @@ -261307,7 +261307,7 @@ hqG qct mUg bSH -pJh +aDQ kwN thG cAe @@ -261763,7 +261763,7 @@ xiD wAV jmZ piW -sTz +pCf prp vvZ qpN @@ -262080,7 +262080,7 @@ uuP bIS gJs rXB -hmW +aOr cAe txW txW @@ -262306,10 +262306,10 @@ tDi cmp xQi sWO -jbS +qZr ogO ogO -hTw +uKe nVN mXZ uEE @@ -262563,10 +262563,10 @@ lMy ijB ued sWO -jbS +qZr ogO ogO -cZC +xWO lIM lIM pAZ @@ -262781,8 +262781,8 @@ bfo xDX rlH amP -kFm -vPe +mgd +fDe guw sxd eak @@ -262820,10 +262820,10 @@ czt ijB ued sWO -jbS +qZr ogO ogO -cRj +vgs lIM tqW lvi @@ -263077,10 +263077,10 @@ ijB fub udF sWO -jbS +qZr ogO ogO -ctj +edS lIM nOB fni @@ -263512,7 +263512,7 @@ pCa pCa pCa aGm -pPj +eSx lhh vMr iip @@ -265369,7 +265369,7 @@ xGM kmQ xGM xGM -xJr +gyj gYM mBs msw @@ -267138,7 +267138,7 @@ eGZ iyS vvX caI -dtP +xxS sjb vtP bSI @@ -269281,9 +269281,9 @@ jCB egF dIN hAa -ful +hTf tcY -ful +hTf bJw dIN iqP @@ -272076,7 +272076,7 @@ qpP sfP bzz fsP -wco +bgz gNB tfl ind @@ -272826,7 +272826,7 @@ xGM ebd xGM kcr -nGA +eoe eVi jGD trk @@ -275671,7 +275671,7 @@ jIV kmF pdM mzP -xoW +ksS uiw pCa txW @@ -276421,7 +276421,7 @@ fsc cvQ exz exz -qFz +uVy ocS dCb pUj diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index af0a05f97df5..6a6c57461315 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -360,12 +360,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"aeo" = ( -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/bot, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark/textured_large, -/area/station/service/library/printer) "aeu" = ( /obj/machinery/power/terminal{ dir = 1 @@ -967,11 +961,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig) -"amr" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/purple/opposingcorners, -/turf/open/floor/iron/white, -/area/station/science/circuits) "ams" = ( /obj/effect/turf_decal/tile/red/fourcorners, /obj/machinery/atmospherics/components/binary/pump/on{ @@ -1456,6 +1445,13 @@ /obj/machinery/telecomms/server/presets/science, /turf/open/floor/circuit/telecomms, /area/station/tcommsat/server) +"asE" = ( +/obj/structure/table, +/obj/item/holosign_creator/robot_seat/restaurant{ + pixel_y = -5 + }, +/turf/open/floor/iron/kitchen, +/area/station/service/kitchen) "asF" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3515,6 +3511,10 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/psychology, /turf/open/floor/catwalk_floor, /area/station/hallway/floor2/fore) +"aUA" = ( +/obj/machinery/restaurant_portal/restaurant, +/turf/open/floor/wood, +/area/station/service/kitchen/diner) "aUG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/structure/table_or_rack, @@ -4847,12 +4847,6 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark, /area/station/science/auxlab) -"biZ" = ( -/obj/machinery/microwave/engineering/cell_included, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/turf/open/floor/iron/white/textured, -/area/station/medical/break_room) "bja" = ( /obj/machinery/vending/cigarette, /obj/machinery/camera/autoname/directional/west, @@ -7361,17 +7355,6 @@ /obj/effect/spawner/random/maintenance/two, /turf/open/floor/pod/light, /area/station/maintenance/floor4/starboard) -"bPk" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/command/teleporter) "bPq" = ( /obj/effect/spawner/random/structure/grille, /obj/structure/disposalpipe/segment{ @@ -8927,10 +8910,6 @@ dir = 9 }, /area/station/command/teleporter) -"cix" = ( -/obj/machinery/restaurant_portal/restaurant, -/turf/open/floor/wood, -/area/station/service/kitchen/diner) "ciz" = ( /obj/structure/table/wood, /obj/item/folder/blue, @@ -9890,6 +9869,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +"cuK" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/hop) "cuL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -12863,18 +12846,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) -"djx" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/effect/turf_decal/tile/green/full, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/iron/dark/smooth_large, -/area/station/service/bar) "djy" = ( /turf/closed/wall/mineral/iron, /area/station/maintenance/floor3/starboard/aft) @@ -13388,12 +13359,6 @@ }, /turf/open/floor/wood/parquet, /area/station/service/lawoffice) -"drR" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/half{ - dir = 1 - }, -/area/station/engineering/lobby) "dsb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -26730,14 +26695,6 @@ }, /turf/open/floor/wood/large, /area/station/security/prison/safe) -"gWH" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/obj/machinery/defibrillator_mount/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) "gWN" = ( /obj/structure/railing{ dir = 1 @@ -31103,12 +31060,6 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/floor3/starboard/fore) -"idc" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/light_switch/directional/north, -/turf/open/floor/wood/tile, -/area/station/service/library) "idn" = ( /obj/structure/sign/directions/science/directional/west, /turf/open/floor/iron/dark/side{ @@ -41089,6 +41040,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/engine, /area/station/maintenance/floor4/starboard/aft) +"kFJ" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/light_switch/directional/north, +/turf/open/floor/wood/tile, +/area/station/service/library) "kFO" = ( /obj/effect/turf_decal/trimline/brown/warning{ dir = 1 @@ -46817,6 +46774,7 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/suit_storage_unit/medical, /obj/machinery/camera/autoname/directional/east, +/obj/structure/fireaxecabinet/jaws_of_life/directional/east, /turf/open/floor/iron/white/textured, /area/station/medical/storage) "mbe" = ( @@ -50801,6 +50759,11 @@ dir = 8 }, /area/station/commons/fitness/recreation) +"naI" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/purple/opposingcorners, +/turf/open/floor/iron/white, +/area/station/science/circuits) "naR" = ( /obj/structure/frame/computer{ dir = 4 @@ -52465,6 +52428,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"nvt" = ( +/obj/machinery/microwave, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white/textured, +/area/station/medical/break_room) "nvv" = ( /obj/effect/turf_decal/trimline/blue/corner{ dir = 1 @@ -53766,6 +53735,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/hallway/floor4/aft) +"nMD" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/half{ + dir = 1 + }, +/area/station/engineering/lobby) "nMI" = ( /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /obj/structure/cable, @@ -54660,6 +54635,10 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/floor3/aft) +"nXJ" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/science/lower) "nXO" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible/layer2, /obj/machinery/igniter/incinerator_atmos, @@ -55741,6 +55720,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/floor1/port/fore) +"omG" = ( +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/bot, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark/textured_large, +/area/station/service/library/printer) "omK" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/textured, @@ -57418,6 +57403,14 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/engineering/storage/tech) +"oKD" = ( +/obj/machinery/photocopier/prebuilt, +/obj/machinery/requests_console/directional/west{ + department = "Detective"; + name = "Detective Requests Console" + }, +/turf/open/floor/wood, +/area/station/security/detectives_office) "oKK" = ( /obj/effect/turf_decal/trimline/yellow/line{ dir = 6 @@ -58506,6 +58499,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/cytology) +"oYL" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/captain) "oYT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59162,10 +59161,6 @@ dir = 8 }, /area/station/engineering/storage/tech) -"pjc" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/hop) "pjf" = ( /turf/open/floor/light/colour_cycle/dancefloor_a, /area/station/maintenance/floor2/port/fore) @@ -60493,14 +60488,6 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/pod/light, /area/station/maintenance/floor3/starboard/aft) -"pAr" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/machinery/defibrillator_mount/directional/north, -/turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) "pAy" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/flora/bush/snow/style_random, @@ -60726,14 +60713,6 @@ /obj/machinery/duct, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) -"pDL" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/under/misc/assistantformal, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/machinery/bluespace_vendor/directional/east, -/turf/open/floor/iron/dark, -/area/station/commons/locker) "pDS" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, @@ -61738,6 +61717,14 @@ /obj/structure/lattice/catwalk, /turf/open/space/openspace, /area/space/nearstation) +"pRC" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/obj/machinery/defibrillator_mount/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) "pRD" = ( /obj/machinery/shower/directional/north, /obj/effect/turf_decal/trimline/green/end{ @@ -61807,6 +61794,17 @@ }, /turf/open/floor/iron/dark/side, /area/station/hallway/floor4/fore) +"pSz" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/command/teleporter) "pSE" = ( /obj/effect/turf_decal/trimline/yellow/corner, /turf/open/floor/iron/dark/side{ @@ -62043,6 +62041,12 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/medical/medbay/central) +"pVT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/displaycase/forsale/kitchen, +/obj/structure/table/reinforced, +/turf/open/floor/iron/kitchen/herringbone, +/area/station/service/kitchen) "pVZ" = ( /obj/effect/turf_decal/trimline/yellow/line, /obj/effect/decal/cleanable/dirt, @@ -69309,13 +69313,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/vacant_room/commissary) -"rRu" = ( -/obj/structure/table, -/obj/item/holosign_creator/robot_seat/restaurant{ - pixel_y = -5 - }, -/turf/open/floor/iron/kitchen, -/area/station/service/kitchen) "rRB" = ( /obj/effect/turf_decal/stripes, /obj/machinery/portable_atmospherics/canister/air, @@ -70334,6 +70331,11 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/floor4/port/aft) +"sfR" = ( +/obj/machinery/photocopier/prebuilt, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood/parquet, +/area/station/service/lawoffice) "sfS" = ( /obj/effect/turf_decal/trimline/green/line{ dir = 1 @@ -73125,11 +73127,6 @@ }, /turf/open/floor/carpet/orange, /area/station/service/chapel/office) -"sSu" = ( -/obj/machinery/photocopier/prebuilt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/wood/parquet, -/area/station/service/lawoffice) "sSz" = ( /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/white, @@ -73196,10 +73193,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint) -"sTA" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/science/lower) "sTD" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -74178,6 +74171,14 @@ /obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/commons/toilet) +"tee" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/under/misc/assistantformal, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/machinery/bluespace_vendor/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/locker) "teq" = ( /turf/closed/wall/r_wall, /area/station/maintenance/floor1/starboard/aft) @@ -75920,6 +75921,13 @@ /obj/item/toy/crayon/spraycan/roboticist, /turf/open/floor/iron/dark/smooth_large, /area/station/science/robotics/lab) +"tBG" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron/dark/side, +/area/station/hallway/floor1/fore) "tBN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/decal/cleanable/dirt, @@ -76664,12 +76672,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port) -"tMb" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/captain) "tMd" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 1 @@ -78560,12 +78562,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"umZ" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/displaycase/forsale/kitchen, -/obj/structure/table/reinforced, -/turf/open/floor/iron/kitchen/herringbone, -/area/station/service/kitchen) "una" = ( /obj/effect/turf_decal/siding/wideplating_new/corner{ dir = 8 @@ -80259,6 +80255,16 @@ dir = 4 }, /area/station/hallway/floor3/fore) +"uKg" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, +/obj/machinery/airalarm/directional/west, +/obj/effect/turf_decal/tile/bar/opposingcorners, +/obj/machinery/restaurant_portal/bar, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/iron/checker, +/area/station/service/bar/atrium) "uKl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -83854,14 +83860,6 @@ dir = 4 }, /area/station/engineering/storage/tech) -"vDD" = ( -/obj/machinery/photocopier/prebuilt, -/obj/machinery/requests_console/directional/west{ - department = "Detective"; - name = "Detective Requests Console" - }, -/turf/open/floor/wood, -/area/station/security/detectives_office) "vDJ" = ( /obj/effect/decal/cleanable/blood/old, /obj/machinery/vending/wardrobe/det_wardrobe, @@ -85679,16 +85677,6 @@ }, /turf/open/space/openspace, /area/space) -"wci" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 - }, -/obj/machinery/airalarm/directional/west, -/obj/effect/turf_decal/tile/bar/opposingcorners, -/obj/machinery/restaurant_portal/bar, -/obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron/checker, -/area/station/service/bar/atrium) "wcm" = ( /obj/structure/chair{ dir = 1 @@ -90680,6 +90668,14 @@ name = "xenobio BZ floor" }, /area/station/science/xenobiology) +"xoq" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/directional/north, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) "xot" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -91603,6 +91599,18 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) +"xAB" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/effect/turf_decal/tile/green/full, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/iron/dark/smooth_large, +/area/station/service/bar) "xAH" = ( /obj/effect/turf_decal/tile/green/half{ dir = 4 @@ -93326,13 +93334,6 @@ "xWM" = ( /turf/open/floor/iron/dark, /area/station/security/eva) -"xWO" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron/dark/side, -/area/station/hallway/floor1/fore) "xWT" = ( /obj/machinery/newscaster/directional/south, /obj/effect/turf_decal/siding/wood{ @@ -116371,7 +116372,7 @@ xBe gVw rpj gqU -xWO +tBG hJy fZZ qAK @@ -138989,7 +138990,7 @@ fXd pLJ eLQ rBP -drR +nMD wKT rBP uMl @@ -182147,7 +182148,7 @@ pmy srR bQs sxl -amr +naI lNN peN xuv @@ -184996,7 +184997,7 @@ hLz hLz hLz hLz -pDL +tee heC caP jjF @@ -190151,7 +190152,7 @@ xZB ccU bOx hRd -biZ +nvt lcv aal xhf @@ -191150,7 +191151,7 @@ aip gzM swk tYg -sTA +nXJ maW rxL rxL @@ -196819,7 +196820,7 @@ wMN tsN dhZ sRR -pAr +xoq rwv aTc dgm @@ -197847,7 +197848,7 @@ tEe fYt loQ sRR -gWH +pRC sEl vOo xwZ @@ -247182,13 +247183,13 @@ uUV ybY vaH poL -wci +uKg tQd fjo mso dFd awt -cix +aUA gjf gjf qoa @@ -248977,7 +248978,7 @@ lmU qyE aeg bKS -djx +xAB kAL gfe sjX @@ -249258,7 +249259,7 @@ jnm tMd ycW ycW -umZ +pVT gyr kXP jwP @@ -250540,7 +250541,7 @@ gyr sng iHx aOx -rRu +asE sFt sFt sFt @@ -262847,7 +262848,7 @@ qrd xPv lvW kGv -aeo +omG qrd qrd sSB @@ -267994,7 +267995,7 @@ hLd bfj bfj iMN -idc +kFJ oqd slz nqr @@ -311426,7 +311427,7 @@ xHe olV abP vLW -tMb +oYL wYR jZL kWx @@ -314019,7 +314020,7 @@ uqc jIJ ezm hzQ -bPk +pSz uIx uIx uIx @@ -315812,7 +315813,7 @@ jzF nFH bkT apq -vDD +oKD uqc xrh krU @@ -319649,7 +319650,7 @@ lkc spI rLM nPE -pjc +cuK ipn fBw tPG @@ -326853,7 +326854,7 @@ odP tme ohm upx -sSu +sfR dJF bVy vOE diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index 01dca5bcf8a6..f8466a904a9a 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -3514,6 +3514,7 @@ /obj/item/storage/medkit/regular{ pixel_z = 6 }, +/obj/structure/sign/poster/official/help_others/directional/south, /turf/open/floor/iron, /area/station/medical/storage) "ajF" = ( @@ -14902,7 +14903,6 @@ /obj/machinery/computer/operating{ dir = 8 }, -/obj/item/radio/intercom/directional/north, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 4 }, @@ -17563,6 +17563,7 @@ pixel_x = 1; pixel_y = 2 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/medical/morgue) "aXi" = ( @@ -22567,10 +22568,10 @@ /turf/open/floor/iron/checker, /area/station/engineering/storage) "buV" = ( -/obj/structure/sign/poster/official/help_others/directional/north, /obj/effect/turf_decal/bot_white, /obj/effect/turf_decal/siding/blue, /obj/machinery/vending/wardrobe/medi_wardrobe, +/obj/structure/fireaxecabinet/jaws_of_life/directional/north, /turf/open/floor/iron/dark/side{ dir = 1 }, diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 3c9c17c3f63f..444f42d90dd8 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -28790,6 +28790,7 @@ }, /obj/effect/turf_decal/tile/blue/half, /obj/machinery/suit_storage_unit/medical, +/obj/structure/fireaxecabinet/jaws_of_life/directional/south, /turf/open/floor/iron/white/smooth_half, /area/station/medical/storage) "cmU" = ( diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index abddcd674e38..0b55c8ce141f 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -1640,11 +1640,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) -"aft" = ( -/obj/effect/turf_decal/trimline/brown/filled/line, -/obj/machinery/bluespace_vendor/directional/south, -/turf/open/floor/iron, -/area/station/cargo/miningdock) "afu" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/item/radio/intercom/directional/south, @@ -3854,14 +3849,6 @@ /obj/machinery/transport/crossing_signal/southeast, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) -"ayB" = ( -/obj/machinery/restaurant_portal/restaurant, -/obj/machinery/camera/directional/north{ - c_tag = "Service - Bar Lounge North East" - }, -/obj/machinery/airalarm/directional/east, -/turf/open/floor/iron/checker, -/area/station/commons/lounge) "ayG" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -4390,6 +4377,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"aEt" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table/glass, +/obj/machinery/microwave, +/obj/structure/cable, +/obj/machinery/light/warm/directional/west, +/turf/open/floor/iron, +/area/station/engineering/break_room) "aEu" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 8 @@ -5103,14 +5101,6 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/genetics) -"aKZ" = ( -/obj/structure/chair/stool/bar/directional/east, -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "aLd" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -5942,6 +5932,21 @@ }, /turf/open/floor/iron/checker, /area/station/commons/lounge) +"aTM" = ( +/obj/machinery/sleeper/stasis{ + dir = 4 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/camera/directional/west{ + c_tag = "Medical - Treatment North-West"; + network = list("ss13","medbay") + }, +/obj/machinery/vitals_reader/directional/west, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "aTY" = ( /obj/structure/lattice/catwalk, /obj/machinery/power/solar{ @@ -6240,6 +6245,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"bbM" = ( +/obj/machinery/photocopier/prebuilt{ + pixel_y = 3 + }, +/obj/structure/sign/clock/directional/west, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/wood/large, +/area/station/service/library) "bck" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -6711,6 +6724,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) +"bnh" = ( +/obj/item/radio/intercom/directional/north, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/wood, +/area/station/service/lawoffice) "bnY" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -8004,21 +8022,6 @@ "bLe" = ( /turf/open/floor/carpet, /area/station/service/library) -"bLj" = ( -/obj/structure/table/glass, -/obj/item/book/manual/wiki/surgery{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/book/manual/wiki/medicine, -/obj/effect/turf_decal/stripes/corner, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/light/directional/west, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "bLk" = ( /obj/structure/table, /turf/open/floor/iron/cafeteria, @@ -10632,6 +10635,17 @@ }, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"cFR" = ( +/obj/machinery/sleeper/stasis{ + dir = 8 + }, +/obj/machinery/defibrillator_mount/directional/north, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/vitals_reader/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "cFS" = ( /obj/structure/railing, /obj/effect/turf_decal/trimline/tram/filled/line{ @@ -10803,10 +10817,6 @@ }, /turf/open/floor/plating, /area/station/service/hydroponics) -"cIv" = ( -/obj/machinery/mechpad, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "cIw" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -12218,6 +12228,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"dgI" = ( +/obj/effect/turf_decal/siding/thinplating/dark{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/bluespace_vendor/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/escapepodbay) "dgV" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/mix_input{ dir = 8 @@ -14510,16 +14532,6 @@ /obj/structure/sign/flag/terragov/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) -"dXo" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/chem_pack{ - pixel_x = 6; - pixel_y = 9 - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/reagent_containers/chem_pack, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "dXA" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -15031,14 +15043,6 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/command/teleporter) -"ejj" = ( -/obj/machinery/photocopier/prebuilt{ - pixel_y = 3 - }, -/obj/structure/sign/clock/directional/west, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/wood/large, -/area/station/service/library) "ejm" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -15495,6 +15499,16 @@ /mob/living/basic/bot/cleanbot, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"esm" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "esA" = ( /obj/machinery/iv_drip, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -17244,6 +17258,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/cargo/miningdock/oresilo) +"fcL" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/chem_pack{ + pixel_x = 6; + pixel_y = 9 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/reagent_containers/chem_pack, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "fdr" = ( /obj/machinery/duct, /obj/structure/cable, @@ -19865,6 +19889,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/arrivals) +"gbn" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/white, +/area/station/science/lower) "gbp" = ( /obj/structure/filingcabinet, /obj/structure/window/reinforced/spawner/directional/west, @@ -21208,17 +21239,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/tram/right) -"gBz" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, -/obj/item/storage/box/beakers{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/machinery/light/cold/directional/south, -/obj/item/storage/box/syringes, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "gBL" = ( /obj/structure/chair/comfy/beige, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -23374,14 +23394,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth, /area/station/hallway/primary/tram/right) -"hrr" = ( -/obj/structure/table/reinforced, -/obj/machinery/microwave/engineering/cell_included, -/obj/effect/turf_decal/tile/neutral/opposingcorners{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/medical/break_room) "hrF" = ( /obj/structure/table/wood, /turf/open/floor/wood/large, @@ -23951,6 +23963,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/showroomfloor, /area/station/security/warden) +"hES" = ( +/obj/structure/table/reinforced, +/obj/structure/window/spawner/directional/north, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/light/warm/directional/west, +/turf/open/floor/iron/dark, +/area/station/service/bar) "hEV" = ( /obj/effect/turf_decal/trimline/dark_green/filled/corner{ dir = 4 @@ -24204,6 +24225,14 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"hKR" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/anesthetic_mix, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "hKV" = ( /obj/machinery/vending/snack, /obj/effect/turf_decal/tile/bar/opposingcorners, @@ -25108,33 +25137,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"ibg" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "playerscantreadthis"; - name = "Kitchen Counter Shutters" - }, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/turf/open/floor/iron/checker, -/area/station/service/kitchen) -"ibp" = ( -/obj/machinery/sleeper/stasis{ - dir = 4 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/camera/directional/west{ - c_tag = "Medical - Treatment North-West"; - network = list("ss13","medbay") - }, -/obj/machinery/vitals_reader/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "ibs" = ( /obj/machinery/recharge_station, /obj/effect/turf_decal/box, @@ -25148,14 +25150,6 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) -"iby" = ( -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/anesthetic_mix, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/treatment_center) "ibW" = ( /obj/effect/spawner/xmastree, /turf/open/floor/carpet, @@ -28150,14 +28144,6 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/catwalk_floor, /area/station/solars/starboard/fore) -"jgn" = ( -/obj/structure/table/reinforced, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/light/warm/directional/east, -/turf/open/floor/iron/dark, -/area/station/service/bar) "jgq" = ( /obj/structure/railing/corner, /turf/open/floor/glass/reinforced, @@ -29910,17 +29896,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/commons/fitness) -"jKi" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/item/radio/intercom/directional/east, -/obj/machinery/light/directional/east, -/obj/item/stack/medical/mesh, -/obj/item/stack/medical/wrap/gauze, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "jKq" = ( /turf/closed/wall, /area/station/security/interrogation) @@ -29969,6 +29944,13 @@ "jLf" = ( /turf/open/floor/iron/chapel, /area/station/service/chapel) +"jLu" = ( +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "jLx" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -30114,6 +30096,10 @@ /obj/structure/chair, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"jOG" = ( +/obj/machinery/mechpad, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "jPd" = ( /obj/structure/transit_tube, /obj/effect/turf_decal/sand/plating, @@ -32473,10 +32459,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"kEu" = ( -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/grimy, -/area/station/service/library/lounge) "kEN" = ( /obj/structure/stairs/north, /turf/open/floor/iron/stairs/right, @@ -32783,17 +32765,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/command/gateway) -"kIh" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/obj/machinery/light/directional/south, -/obj/machinery/vitals_reader/directional/south{ - id_tag = "lowersurgery" - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "kIi" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -34085,6 +34056,21 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"lfF" = ( +/obj/structure/table/glass, +/obj/item/book/manual/wiki/surgery{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/medicine, +/obj/effect/turf_decal/stripes/corner, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "lfP" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -34590,6 +34576,16 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"loy" = ( +/obj/structure/rack, +/obj/item/book/manual/chef_recipes, +/obj/item/holosign_creator/robot_seat/restaurant, +/obj/item/reagent_containers/condiment/enzyme, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/service/kitchen) "loF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/ai_slipper{ @@ -34622,11 +34618,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"lpb" = ( -/obj/item/radio/intercom/directional/north, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/wood, -/area/station/service/lawoffice) "lpg" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -35452,6 +35443,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/storage) +"lCe" = ( +/obj/machinery/cryo_cell{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/iron/dark, +/area/station/medical/treatment_center) "lCk" = ( /obj/machinery/door/airlock/atmos{ name = "The Pipe Cave" @@ -35883,18 +35881,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) -"lIS" = ( -/obj/effect/turf_decal/siding/thinplating/dark{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/bluespace_vendor/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/escapepodbay) "lIZ" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ @@ -36479,17 +36465,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) -"lTE" = ( -/obj/machinery/sleeper/stasis{ - dir = 8 - }, -/obj/machinery/defibrillator_mount/directional/north, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/vitals_reader/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "lTP" = ( /obj/structure/stairs/south, /turf/open/floor/iron/stairs/medium{ @@ -39035,6 +39010,10 @@ }, /turf/open/floor/iron, /area/station/cargo/sorting) +"mNV" = ( +/obj/machinery/photocopier/prebuilt, +/turf/open/floor/iron/grimy, +/area/station/service/library/lounge) "mOi" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -39308,6 +39287,17 @@ /obj/structure/window/spawner/directional/north, /turf/open/floor/iron/dark/small, /area/station/commons/vacant_room) +"mVn" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/table/glass, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/light/cold/directional/south, +/obj/item/storage/box/syringes, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "mVo" = ( /obj/item/book/bible, /obj/structure/altar_of_gods, @@ -39368,13 +39358,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/security/prison) -"mXd" = ( -/obj/structure/table/optable{ - id_tag = "uppersurgery" - }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "mXi" = ( /obj/structure/transport/linear/tram, /obj/structure/tram, @@ -39795,15 +39778,6 @@ }, /turf/open/floor/glass/reinforced, /area/station/security/brig) -"neE" = ( -/obj/structure/table/optable{ - id_tag = "lowersurgery" - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "nfB" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -40614,16 +40588,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) -"nrV" = ( -/obj/structure/rack, -/obj/item/book/manual/chef_recipes, -/obj/item/holosign_creator/robot_seat/restaurant, -/obj/item/reagent_containers/condiment/enzyme, -/obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/service/kitchen) "nrX" = ( /turf/open/floor/iron/stairs/medium, /area/station/science/lower) @@ -41343,15 +41307,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"nGZ" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/structure/chair{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "nHi" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -43843,14 +43798,6 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"oAt" = ( -/obj/effect/turf_decal/trimline/dark_green/filled/corner{ - dir = 1 - }, -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/purple/fourcorners, -/turf/open/floor/iron/white, -/area/station/science/research) "oAG" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes{ @@ -45312,13 +45259,6 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/service/chapel/monastery) -"pgL" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/photocopier/prebuilt, -/turf/open/floor/iron/white, -/area/station/science/lower) "pgS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -45515,6 +45455,17 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) +"pkL" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/item/radio/intercom/directional/east, +/obj/machinery/light/directional/east, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/wrap/gauze, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "pkP" = ( /obj/machinery/computer/shuttle/labor{ dir = 1 @@ -46705,13 +46656,6 @@ }, /turf/open/floor/circuit/telecomms, /area/station/science/xenobiology) -"pEe" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 1 - }, -/obj/machinery/bluespace_vendor/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "pEx" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -47504,6 +47448,14 @@ /obj/machinery/computer/security/telescreen/test_chamber/directional/north, /turf/open/floor/iron/dark, /area/station/science/xenobiology) +"pTQ" = ( +/obj/machinery/restaurant_portal/restaurant, +/obj/machinery/camera/directional/north{ + c_tag = "Service - Bar Lounge North East" + }, +/obj/machinery/airalarm/directional/east, +/turf/open/floor/iron/checker, +/area/station/commons/lounge) "pUi" = ( /obj/structure/railing{ dir = 4 @@ -49834,11 +49786,6 @@ }, /turf/open/space/openspace, /area/station/solars/starboard/fore) -"qKo" = ( -/obj/machinery/photocopier/prebuilt, -/obj/structure/extinguisher_cabinet/directional/north, -/turf/open/floor/wood, -/area/station/command/heads_quarters/hop) "qKE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -50078,12 +50025,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/dorms) -"qPO" = ( -/obj/machinery/airalarm/directional/north, -/obj/machinery/photocopier/prebuilt, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/sorting) "qPV" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -50945,26 +50886,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/security/processing) -"rdJ" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/camera/directional/east{ - c_tag = "Medical - Treatment South-East"; - network = list("ss13","medbay") - }, -/obj/machinery/light/directional/east, -/obj/machinery/vending/wallmed/directional/south, -/obj/item/storage/box/bodybags{ - pixel_x = 5; - pixel_y = 5 - }, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "rdN" = ( /obj/machinery/mech_bay_recharge_port{ dir = 1 @@ -51264,6 +51185,14 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/commons/vacant_room) +"riO" = ( +/obj/structure/table/reinforced, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/obj/machinery/light/warm/directional/east, +/turf/open/floor/iron/dark, +/area/station/service/bar) "riS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -52020,6 +51949,11 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) +"rxN" = ( +/obj/machinery/photocopier/prebuilt, +/obj/structure/extinguisher_cabinet/directional/north, +/turf/open/floor/wood, +/area/station/command/heads_quarters/hop) "rxO" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, @@ -53312,6 +53246,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"rWN" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/obj/machinery/light/directional/south, +/obj/machinery/vitals_reader/directional/south{ + id_tag = "lowersurgery" + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "rWQ" = ( /obj/effect/turf_decal/delivery/white, /obj/structure/fluff/tram_rail/floor, @@ -53597,15 +53542,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) -"sct" = ( -/obj/structure/table/reinforced, -/obj/structure/window/spawner/directional/north, -/obj/structure/displaycase/forsale/kitchen{ - pixel_y = 8 - }, -/obj/machinery/light/warm/directional/west, -/turf/open/floor/iron/dark, -/area/station/service/bar) "scx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -54854,10 +54790,6 @@ /obj/effect/mapping_helpers/mail_sorting/supply/cargo_bay, /turf/open/floor/iron, /area/station/cargo/storage) -"sxW" = ( -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/iron/checker, -/area/station/commons/lounge) "sxX" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 @@ -55076,13 +55008,6 @@ "sDZ" = ( /turf/closed/wall, /area/station/maintenance/disposal/incinerator) -"sEe" = ( -/obj/machinery/cryo_cell{ - dir = 4 - }, -/obj/machinery/status_display/ai/directional/south, -/turf/open/floor/iron/dark, -/area/station/medical/treatment_center) "sEh" = ( /obj/effect/turf_decal/trimline/white/corner{ dir = 1 @@ -56492,6 +56417,21 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ted" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 9 + }, +/obj/machinery/camera/emp_proof{ + c_tag = "Engineering - Atmospherics Incinerator ACcess"; + dir = 9; + network = list("ss13","engineering") + }, +/obj/machinery/atmospherics/components/unary/bluespace_sender{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron, +/area/station/engineering/atmos) "tef" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -59153,25 +59093,11 @@ "uax" = ( /turf/open/floor/iron, /area/station/cargo/storage) -"uaJ" = ( -/obj/machinery/computer/mechpad, -/turf/open/floor/iron, -/area/station/science/robotics/mechbay) "uaM" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"uba" = ( -/obj/effect/turf_decal/trimline/neutral/filled/line{ - dir = 4 - }, -/obj/machinery/bluespace_vendor/directional/east, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "ubd" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -59327,6 +59253,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/interrogation) +"udM" = ( +/obj/structure/table/optable{ + id_tag = "lowersurgery" + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "udO" = ( /obj/structure/chair/stool/bar/directional/south, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -59779,6 +59714,13 @@ }, /turf/open/floor/iron, /area/station/command/bridge) +"ukL" = ( +/obj/structure/table/optable{ + id_tag = "uppersurgery" + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "ukS" = ( /obj/structure/table/reinforced, /obj/item/surgical_drapes, @@ -59851,6 +59793,14 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) +"ulE" = ( +/obj/structure/chair/stool/bar/directional/east, +/obj/effect/turf_decal/trimline/neutral/filled/line{ + dir = 1 + }, +/obj/machinery/bluespace_vendor/directional/north, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "ulJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/maint, @@ -61293,6 +61243,12 @@ "uGW" = ( /turf/closed/wall, /area/station/cargo/miningdock) +"uHb" = ( +/obj/machinery/airalarm/directional/north, +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) "uHj" = ( /obj/machinery/duct, /obj/machinery/light/directional/west, @@ -63667,6 +63623,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/construction/engineering) +"vvf" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/light/directional/north, +/obj/machinery/vitals_reader/directional/north{ + id_tag = "uppersurgery" + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/fore) "vvk" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 5 @@ -64181,6 +64148,14 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/misc/grass/jungle, /area/station/science/explab) +"vEp" = ( +/obj/structure/table/reinforced, +/obj/machinery/microwave, +/obj/effect/turf_decal/tile/neutral/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/medical/break_room) "vEq" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 8 @@ -64270,17 +64245,6 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"vGc" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/light/directional/north, -/obj/machinery/vitals_reader/directional/north{ - id_tag = "uppersurgery" - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/fore) "vGd" = ( /obj/machinery/firealarm/directional/south, /obj/effect/landmark/start/lawyer, @@ -64439,6 +64403,11 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/commons/vacant_room) +"vJa" = ( +/obj/effect/turf_decal/trimline/brown/filled/line, +/obj/machinery/bluespace_vendor/directional/south, +/turf/open/floor/iron, +/area/station/cargo/miningdock) "vJg" = ( /obj/structure/bodycontainer/morgue/beeper_off{ dir = 8 @@ -65175,6 +65144,18 @@ /obj/structure/ladder, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"vXo" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "playerscantreadthis"; + name = "Kitchen Counter Shutters" + }, +/obj/structure/displaycase/forsale/kitchen{ + pixel_y = 8 + }, +/turf/open/floor/iron/checker, +/area/station/service/kitchen) "vXL" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/iron, @@ -65735,13 +65716,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/cafeteria, /area/station/security/prison/mess) -"whF" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/item/storage/medkit/regular, -/obj/item/clothing/neck/stethoscope, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "whI" = ( /obj/machinery/computer/cargo{ dir = 4 @@ -66289,6 +66263,14 @@ /obj/structure/cable/multilayer/connected, /turf/open/floor/engine, /area/station/engineering/supermatter) +"wtw" = ( +/obj/effect/turf_decal/trimline/dark_green/filled/corner{ + dir = 1 + }, +/obj/machinery/photocopier/prebuilt, +/obj/effect/turf_decal/tile/purple/fourcorners, +/turf/open/floor/iron/white, +/area/station/science/research) "wtK" = ( /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/herringbone, @@ -66927,6 +66909,10 @@ }, /turf/open/floor/iron, /area/station/command/teleporter) +"wFh" = ( +/obj/machinery/computer/mechpad, +/turf/open/floor/iron, +/area/station/science/robotics/mechbay) "wFq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67614,6 +67600,15 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"wTL" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/bluespace_vendor/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "wTP" = ( /obj/structure/bodycontainer/morgue/beeper_off, /obj/structure/window/reinforced/spawner/directional/south, @@ -68416,17 +68411,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"xll" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table/glass, -/obj/machinery/microwave/engineering/cell_included, -/obj/structure/cable, -/obj/machinery/light/warm/directional/west, -/turf/open/floor/iron, -/area/station/engineering/break_room) "xlu" = ( /obj/structure/rack, /obj/item/clothing/under/color/blue, @@ -68566,6 +68550,26 @@ "xnI" = ( /turf/open/floor/iron, /area/station/maintenance/tram/left) +"xnN" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/camera/directional/east{ + c_tag = "Medical - Treatment South-East"; + network = list("ss13","medbay") + }, +/obj/machinery/light/directional/east, +/obj/machinery/vending/wallmed/directional/south, +/obj/item/storage/box/bodybags{ + pixel_x = 5; + pixel_y = 5 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xnS" = ( /obj/machinery/door/airlock/highsecurity{ name = "AI Upload Access" @@ -68775,6 +68779,13 @@ /obj/effect/turf_decal/trimline/white/filled/line, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"xsC" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/item/storage/medkit/regular, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "xsW" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -70556,6 +70567,10 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"ybI" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/iron/checker, +/area/station/commons/lounge) "ybW" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -71098,21 +71113,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron, /area/station/security/courtroom) -"ykm" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 9 - }, -/obj/machinery/camera/emp_proof{ - c_tag = "Engineering - Atmospherics Incinerator ACcess"; - dir = 9; - network = list("ss13","engineering") - }, -/obj/machinery/atmospherics/components/unary/bluespace_sender{ - dir = 4; - initialize_directions = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/atmos) "yks" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -85480,7 +85480,7 @@ adp adA adB fIV -lIS +dgI adF adK yiI @@ -100611,7 +100611,7 @@ fez fez cMB iTz -lpb +bnh xgh fKv vGd @@ -102454,7 +102454,7 @@ akI cJM ulV bbj -xll +aEt ksW ryJ gzZ @@ -108389,7 +108389,7 @@ qTR mDC tnq hZr -ykm +ted gWu hZr aaa @@ -116551,7 +116551,7 @@ eMT nES oaB qib -aft +vJa uGW fvM tMY @@ -119689,7 +119689,7 @@ xiA bXI jwZ szb -pgL +gbn byw uyZ otC @@ -149995,7 +149995,7 @@ aUh mdY mpw ckM -ejj +bbM puN jPY wFq @@ -150783,7 +150783,7 @@ rAS rfR gsT uJk -kEu +mNV tdx tdx abM @@ -151522,7 +151522,7 @@ wHT twz twz vhv -uba +esm yjN yjN rWB @@ -152286,7 +152286,7 @@ aBV utk aBV wHT -qKo +rxN xSr lRr uVb @@ -155911,7 +155911,7 @@ mXY woJ tdR qOF -aKZ +ulE gsO aLi aLQ @@ -165679,13 +165679,13 @@ ryy aKM jaQ xRx -vGc +vvf vly -mXd +ukL xRx -neE +udM cNs -kIh +rWN apC abM mBq @@ -167435,7 +167435,7 @@ bgL mgZ fqU uGa -nrV +loy oDP eSx fLE @@ -167740,7 +167740,7 @@ dZX lxI xNq jts -bLj +lfF jtr pCV jtr @@ -167951,12 +167951,12 @@ jnY mdp gtN mUL -ibg +vXo lZm mHc uqA aTw -jgn +riO crT crT crT @@ -167990,7 +167990,7 @@ dyI tDP txD jtr -ibp +aTM dkM pIk pIk @@ -168000,7 +168000,7 @@ aMG xdx gBt uVW -sEe +lCe jtr dSZ aOO @@ -168245,7 +168245,7 @@ enB qZa bbD uck -gBz +mVn jtr esA oIU @@ -168736,7 +168736,7 @@ nKz crT wcv mHc -sxW +ybI vyH iNr rOu @@ -168764,9 +168764,9 @@ aKP aLe oIU aLB -whF +xsC ecW -dXo +fcL lTc lrQ xOn @@ -169503,7 +169503,7 @@ crT crT xpC ivn -sct +hES ioz tlY ccT @@ -169532,7 +169532,7 @@ dyI gMT bNX jtr -lTE +cFR rWJ aLy aLy @@ -169542,7 +169542,7 @@ brx uem dqe dlN -iby +hKR jtr dSZ aOO @@ -169790,13 +169790,13 @@ gMT uHB jtr jtr -jKi +pkL njP qDF uwk oXz gNE -rdJ +xnN jtr jtr jtr @@ -170008,7 +170008,7 @@ gIq mkl fxS eSx -ayB +pTQ mHc wLn mHc @@ -170578,7 +170578,7 @@ gVO vXT cyL nen -hrr +vEp adM oGJ qaO @@ -178263,8 +178263,8 @@ aaS abM soq soq -uaJ -cIv +wFh +jOG gyP dZu xgO @@ -183633,7 +183633,7 @@ eVn eCw urf pRM -qPO +uHb aAN aBe vCv @@ -184412,7 +184412,7 @@ wBX cfq pRM qUB -pEe +jLu uCO hPi bMb @@ -184442,7 +184442,7 @@ kvt dpB nZO kvt -oAt +wtw iKY syv hrh @@ -188796,7 +188796,7 @@ qSm eQs qSm orX -nGZ +wTL fmy aac aac diff --git a/code/__DEFINES/_flags.dm b/code/__DEFINES/_flags.dm index 298018a99a80..4495f51d2b69 100644 --- a/code/__DEFINES/_flags.dm +++ b/code/__DEFINES/_flags.dm @@ -61,6 +61,8 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// This atom does not need to generate its own preview icon for GAGS #define NO_NEW_GAGS_PREVIEW_1 (1<<19) +#define HAS_UNIQUE_SCREENTIP_NAME_1 (1<<20) + // Update flags for [/atom/proc/update_appearance] /// Update the atom's name #define UPDATE_NAME (1<<0) diff --git a/code/__DEFINES/atmospherics/atmos_machinery.dm b/code/__DEFINES/atmospherics/atmos_machinery.dm index 3e5c6698a4e4..e85e7feebcea 100644 --- a/code/__DEFINES/atmospherics/atmos_machinery.dm +++ b/code/__DEFINES/atmospherics/atmos_machinery.dm @@ -90,5 +90,7 @@ ///Min allowed pressure for canisters to release air per tick #define CAN_MIN_RELEASE_PRESSURE (ONE_ATMOSPHERE * 0.1) -#define FIRELOCK_FAULT_NAME(tag) "Firelock [tag]" -#define FIREALARM_FAULT_NAME(tag) "Fire Alarm [tag]" +#define FIRELOCK_FAULT_NAME(tag) "Firelock - [tag]" +#define FIREALARM_FAULT_NAME(tag) "Fire Alarm - [tag]" +#define VENT_PUMP_NAME(tag) "Vent Pump - [tag]" +#define SCRUBBER_NAME(tag) "Scrubber - [tag]" diff --git a/code/__DEFINES/traits/declarations.dm b/code/__DEFINES/traits/declarations.dm index 2dd4c8ede0ac..2c00737f096c 100644 --- a/code/__DEFINES/traits/declarations.dm +++ b/code/__DEFINES/traits/declarations.dm @@ -285,8 +285,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_PRESENT_VISION "present-vision" #define TRAIT_DISK_VERIFIER "disk-verifier" #define TRAIT_NOMOBSWAP "no-mob-swap" -/// Can examine IDs to see if they are roundstart. -#define TRAIT_ID_APPRAISER "id_appraiser" /// Gives us turf, mob and object vision through walls #define TRAIT_XRAY_VISION "xray_vision" /// Gives us mob vision through walls and slight night vision @@ -1048,12 +1046,8 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait given if the mob has a cranial fissure. #define TRAIT_HAS_CRANIAL_FISSURE "has_cranial_fissure" -/// Denotes that this id card was given via the job outfit, aka the first ID this player got. -#define TRAIT_JOB_FIRST_ID_CARD "job_first_id_card" /// ID cards with this trait will attempt to forcibly occupy the front-facing ID card slot in wallets. #define TRAIT_MAGNETIC_ID_CARD "magnetic_id_card" -/// ID cards with this trait have special appraisal text. -#define TRAIT_TASTEFULLY_THICK_ID_CARD "impressive_very_nice" /// things with this trait are treated as having no access in /obj/proc/check_access(obj/item) #define TRAIT_ALWAYS_NO_ACCESS "alwaysnoaccess" diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 18d355c07362..3a3f965f63ed 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -145,6 +145,7 @@ DEFINE_BITFIELD(flags_1, list( "PREVENT_CONTENTS_EXPLOSION_1" = PREVENT_CONTENTS_EXPLOSION_1, "SUPERMATTER_IGNORES_1" = SUPERMATTER_IGNORES_1, "UNPAINTABLE_1" = UNPAINTABLE_1, + "HAS_UNIQUE_SCREENTIP_NAME_1" = HAS_UNIQUE_SCREENTIP_NAME_1 )) DEFINE_BITFIELD(flags_ricochet, list( diff --git a/code/_globalvars/traits/_traits.dm b/code/_globalvars/traits/_traits.dm index 707a1905c8fa..16308e57e22f 100644 --- a/code/_globalvars/traits/_traits.dm +++ b/code/_globalvars/traits/_traits.dm @@ -276,7 +276,6 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_HOT_SPRING_CURSED" = TRAIT_HOT_SPRING_CURSED, "TRAIT_HULK" = TRAIT_HULK, "TRAIT_HUSK" = TRAIT_HUSK, - "TRAIT_ID_APPRAISER" = TRAIT_ID_APPRAISER, "TRAIT_IGNORESLOWDOWN" = TRAIT_IGNORESLOWDOWN, "TRAIT_IGNORE_ELEVATION" = TRAIT_IGNORE_ELEVATION, "TRAIT_IGNORE_SURGERY_MODIFIERS" = TRAIT_IGNORE_SURGERY_MODIFIERS, @@ -583,9 +582,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_EASY_ATTACH" = TRAIT_EASY_ATTACH, ), /obj/item/card/id = list( - "TRAIT_JOB_FIRST_ID_CARD" = TRAIT_JOB_FIRST_ID_CARD, "TRAIT_MAGNETIC_ID_CARD" = TRAIT_MAGNETIC_ID_CARD, - "TRAIT_TASTEFULLY_THICK_ID_CARD" = TRAIT_TASTEFULLY_THICK_ID_CARD, ), /obj/item/clothing = list( "TRAIT_RADIATION_PROTECTED_CLOTHING" = TRAIT_RADIATION_PROTECTED_CLOTHING, diff --git a/code/datums/quirks/negative_quirks/prosopagnosia.dm b/code/datums/quirks/negative_quirks/prosopagnosia.dm index dae994d59297..b1c0e1e0117e 100644 --- a/code/datums/quirks/negative_quirks/prosopagnosia.dm +++ b/code/datums/quirks/negative_quirks/prosopagnosia.dm @@ -5,7 +5,6 @@ value = -4 medical_record_text = "Patient suffers from prosopagnosia and cannot recognize faces." hardcore_value = 5 - mail_goodies = list(/obj/item/skillchip/appraiser) // bad at recognizing faces but good at recognizing IDs /datum/quirk/prosopagnosia/add(client/client_source) . = ..() diff --git a/code/game/atom/_atom.dm b/code/game/atom/_atom.dm index b8faa06c2c55..862c51b0bf60 100644 --- a/code/game/atom/_atom.dm +++ b/code/game/atom/_atom.dm @@ -863,7 +863,7 @@ var/shift_lmb_ctrl_shift_lmb_line = "" var/extra_lines = 0 var/extra_context = "" - var/used_name = name + var/used_name = (flags_1 & HAS_UNIQUE_SCREENTIP_NAME_1) ? get_screentip_name() : name if(isliving(user) || isovermind(user) || isaicamera(user) || (ghost_screentips && isobserver(user))) var/obj/item/held_item = user.get_active_held_item() @@ -955,6 +955,11 @@ active_hud.screentip_text.maptext = new_maptext active_hud.screentip_text.maptext_y = 26 - map_height +/atom/proc/get_screentip_name() + stack_trace("Atom with HAS_UNIQUE_SCREENTIP_NAME_1 did not implement get_screentip_name()!") + flags_1 &= ~HAS_UNIQUE_SCREENTIP_NAME_1 + return name + /** * This proc is used for telling whether something can pass by this atom in a given direction, for use by the pathfinding system. * diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 65cc48bebb28..0d17ed397d62 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -73,7 +73,7 @@ #define DOOR_VISION_DISTANCE 11 ///The maximum distance a door will see out to /obj/machinery/door/airlock - name = "\improper Airlock" + name = "airlock" icon = 'icons/obj/doors/airlocks/station/public.dmi' icon_state = "closed" max_integrity = 300 @@ -153,7 +153,9 @@ /// How many seconds remain until the door is no longer electrified. -1/MACHINE_ELECTRIFIED_PERMANENT = permanently electrified until someone fixes it. var/secondsElectrified = MACHINE_NOT_ELECTRIFIED - flags_1 = HTML_USE_INITAL_ICON_1 + var/nameplate = null + + flags_1 = parent_type::flags_1 | HAS_UNIQUE_SCREENTIP_NAME_1 | HTML_USE_INITAL_ICON_1 rad_insulation = RAD_MEDIUM_INSULATION /obj/machinery/door/airlock/get_save_vars() @@ -189,6 +191,14 @@ RegisterSignal(SSdcs, COMSIG_GLOB_GREY_TIDE, PROC_REF(grey_tide)) + if(mapload) + if(name != initial(name)) + if(LOWER_TEXT(name) != LOWER_TEXT(initial(name))) + nameplate = name + name = initial(name) + if(glass) + name = replacetext(name, " glass ", " ") + /obj/machinery/door/airlock/proc/grey_tide(datum/source, list/grey_tide_areas) SIGNAL_HANDLER @@ -624,6 +634,21 @@ if(AIRLOCK_CLOSING_FINISHED) return 0.6 SECONDS +/obj/machinery/door/airlock/get_name_chaser(mob/user, list/name_chaser) + . = ..() + if(nameplate) + . += span_info("It has a nameplate: [nameplate].") + +/obj/machinery/door/airlock/MouseEntered(location, control, params) + . = ..() + if(nameplate) + winset(usr, null, "mapwindow.status_bar.text=\"[get_screentip_name()]\"" ) + +/obj/machinery/door/airlock/get_screentip_name() + if(nameplate) + return "[name] - [nameplate]" + return name + /obj/machinery/door/airlock/examine(mob/user) . = ..() if(closeOtherId) @@ -1868,7 +1893,7 @@ assemblytype = /obj/structure/door_assembly/door_assembly_extmai /obj/machinery/door/airlock/mining - name = "mining airlock" + name = "cargo airlock" icon = 'icons/obj/doors/airlocks/station/mining.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_min @@ -1911,11 +1936,11 @@ req_access = list(ACCESS_SYNDICATE) /obj/machinery/door/airlock/glass/incinerator/syndicatelava_interior - name = "Turbine Interior Airlock" + name = "turbine interior airlock" id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR /obj/machinery/door/airlock/glass/incinerator/syndicatelava_exterior - name = "Turbine Exterior Airlock" + name = "turbine exterior airlock" id_tag = INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR /obj/machinery/door/airlock/command/glass @@ -1943,7 +1968,7 @@ opacity = FALSE glass = TRUE -/obj/machinery/door/airlock/hydroponics/glass //Uses same icon as medical/glass, maybe update it with its own unique icon one day? +/obj/machinery/door/airlock/hydroponics/glass name = "hydroponics glass airlock" opacity = FALSE glass = TRUE @@ -1958,20 +1983,20 @@ heat_proof = TRUE /obj/machinery/door/airlock/research/glass/incinerator/ordmix_interior - name = "Mixing Room Interior Airlock" + name = "mixing room interior airlock" id_tag = INCINERATOR_ORDMIX_AIRLOCK_INTERIOR /obj/machinery/door/airlock/research/glass/incinerator/ordmix_exterior - name = "Mixing Room Exterior Airlock" + name = "mixing room exterior airlock" id_tag = INCINERATOR_ORDMIX_AIRLOCK_EXTERIOR /obj/machinery/door/airlock/mining/glass - name = "mining glass airlock" + name = "cargo glass airlock" opacity = FALSE glass = TRUE /obj/machinery/door/airlock/atmos/glass - name = "atmospheric glass airlock" + name = "atmospherics glass airlock" opacity = FALSE glass = TRUE diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 5925aca6061c..c551b484a9be 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -21,6 +21,7 @@ closingLayer = CLOSED_FIREDOOR_LAYER armor_type = /datum/armor/door_firedoor interaction_flags_machine = INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON | INTERACT_MACHINE_REQUIRES_SILICON | INTERACT_MACHINE_OPEN + flags_1 = parent_type::flags_1 | HAS_UNIQUE_SCREENTIP_NAME_1 COOLDOWN_DECLARE(activation_cooldown) @@ -115,10 +116,22 @@ QDEL_NULL(soundloop) return ..() -/obj/machinery/door/firedoor/examine(mob/user) +/obj/machinery/door/firedoor/get_name_chaser(mob/user, list/name_chaser) + . = ..() + . += span_info("It has an ID serial: [id_tag], and belongs to [get_area_name(my_area)].") + +/obj/machinery/door/firedoor/MouseEntered(location, control, params) . = ..() - . += span_info("It belongs to [get_area_name(my_area)], and is ID [id_tag].") + if(id_tag) + winset(usr, null, "mapwindow.status_bar.text=\"[get_screentip_name()]\"" ) +/obj/machinery/door/firedoor/get_screentip_name() + if(id_tag) + return "[name] - [id_tag]" + return name + +/obj/machinery/door/firedoor/examine(mob/user) + . = ..() if(!density) . += span_notice("It is open, but could be pried closed.") else if(!welded) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 819cf7f1900e..fd9ff311f790 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -13,8 +13,6 @@ var/area/area = null ///Range of the light emitted when powered, but off var/light_on_range = 1 - /// Should this lightswitch automatically rename itself to match the area it's in? - var/autoname = TRUE MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) @@ -32,8 +30,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) area = GLOB.areas_by_type[area] if(!area) area = get_area(src) - if(autoname) - name = "light switch ([area.name])" find_and_hang_on_wall(custom_drop_callback = CALLBACK(src, PROC_REF(deconstruct), TRUE)) register_context() update_appearance() @@ -48,6 +44,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26) return CONTEXTUAL_SCREENTIP_SET return . +/obj/machinery/light_switch/get_name_chaser(mob/user, list/name_chaser) + . = ..() + . += span_info("It belongs to [get_area_name(area)].") + /obj/machinery/light_switch/update_appearance(updates=ALL) . = ..() luminosity = (machine_stat & NOPOWER) ? 0 : 1 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f67f29670adb..d2205d712b55 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -82,38 +82,51 @@ mask_type = /obj/item/clothing/mask/gas/atmos/captain storage_type = /obj/item/tank/jetpack/oxygen/captain mod_type = /obj/item/mod/control/pre_equipped/magnate + req_access = list(ACCESS_CAPTAIN) + locked = TRUE /obj/machinery/suit_storage_unit/centcom mask_type = /obj/item/clothing/mask/gas/atmos/centcom storage_type = /obj/item/tank/jetpack/oxygen/captain mod_type = /obj/item/mod/control/pre_equipped/corporate + req_access = list(ACCESS_CENT_GENERAL) + locked = TRUE /obj/machinery/suit_storage_unit/engine mask_type = /obj/item/clothing/mask/breath mod_type = /obj/item/mod/control/pre_equipped/engineering + req_access = list(ACCESS_ENGINEERING) /obj/machinery/suit_storage_unit/atmos mask_type = /obj/item/clothing/mask/gas/atmos storage_type = /obj/item/watertank/atmos mod_type = /obj/item/mod/control/pre_equipped/atmospheric + req_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/suit_storage_unit/ce mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/clothing/shoes/magboots/advance mod_type = /obj/item/mod/control/pre_equipped/advanced + req_access = list(ACCESS_CE) + locked = TRUE /obj/machinery/suit_storage_unit/security mask_type = /obj/item/clothing/mask/gas/sechailer mod_type = /obj/item/mod/control/pre_equipped/security + req_access = list(ACCESS_SECURITY) + locked = TRUE /obj/machinery/suit_storage_unit/hos mask_type = /obj/item/clothing/mask/gas/sechailer storage_type = /obj/item/tank/internals/oxygen mod_type = /obj/item/mod/control/pre_equipped/safeguard + req_access = list(ACCESS_HOS) + locked = TRUE /obj/machinery/suit_storage_unit/mining suit_type = /obj/item/clothing/suit/hooded/explorer mask_type = /obj/item/clothing/mask/gas/explorer + req_access = list(ACCESS_MINING) /obj/machinery/suit_storage_unit/mining/eva suit_type = null @@ -124,21 +137,26 @@ mask_type = /obj/item/clothing/mask/breath/medical storage_type = /obj/item/tank/internals/oxygen mod_type = /obj/item/mod/control/pre_equipped/medical + req_access = list(ACCESS_MEDICAL) /obj/machinery/suit_storage_unit/cmo mask_type = /obj/item/clothing/mask/breath/medical storage_type = /obj/item/tank/internals/oxygen mod_type = /obj/item/mod/control/pre_equipped/rescue + req_access = list(ACCESS_CMO) /obj/machinery/suit_storage_unit/rd mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/tank/internals/oxygen mod_type = /obj/item/mod/control/pre_equipped/research + req_access = list(ACCESS_RD) /obj/machinery/suit_storage_unit/syndicate mask_type = /obj/item/clothing/mask/gas/syndicate storage_type = /obj/item/tank/jetpack/oxygen/harness mod_type = /obj/item/mod/control/pre_equipped/nuclear + req_access = list(ACCESS_SYNDICATE) + locked = TRUE /obj/machinery/suit_storage_unit/syndicate/lavaland mod_type = /obj/item/mod/control/pre_equipped/nuclear/no_jetpack @@ -147,6 +165,8 @@ mask_type = /obj/item/clothing/mask/gas/syndicate storage_type = /obj/item/tank/internals/oxygen mod_type = /obj/item/mod/control/pre_equipped/interdyne + req_access = list(ACCESS_SYNDICATE) + locked = TRUE /obj/machinery/suit_storage_unit/void_old suit_type = /obj/item/clothing/suit/space/nasavoid/old @@ -165,6 +185,8 @@ /obj/machinery/suit_storage_unit/nuke_med suit_type = /obj/item/clothing/suit/space/syndicate/black/med helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/med + req_access = list(ACCESS_SYNDICATE) + locked = TRUE /obj/machinery/suit_storage_unit/open state_open = TRUE @@ -180,8 +202,7 @@ /obj/machinery/suit_storage_unit/Initialize(mapload) . = ..() - - set_access() + set_access(req_access, req_one_access) set_wires(new /datum/wires/suit_storage_unit(src)) if(suit_type) suit = new suit_type(src) @@ -241,7 +262,7 @@ . += "[base_icon_state]_helm" if(storage) . += "[base_icon_state]_storage" - if(!(machine_stat & BROKEN || machine_stat & NOPOWER)) + if(is_operational) if(state_open) . += "[base_icon_state]_lights_open" else @@ -271,13 +292,18 @@ . += span_notice("A card reader can be installed for further control access after opening its panel.") /// copy over access of electronics -/obj/machinery/suit_storage_unit/proc/set_access(list/accesses) +/obj/machinery/suit_storage_unit/proc/set_access(list/accesses, list/one_accesses) var/obj/item/electronics/airlock/electronics = locate() in component_parts if(QDELETED(electronics)) return if(!isnull(accesses)) electronics.accesses = accesses + electronics.one_access = FALSE + else if(!isnull(one_accesses)) + electronics.accesses = one_accesses + electronics.one_access = TRUE + if(electronics.one_access) req_one_access = electronics.accesses req_access = null @@ -291,7 +317,7 @@ for(var/datum/stock_part/capacitor/capacitor in component_parts) final_charge_rate = base_charge_rate + (capacitor.tier * 0.05 * STANDARD_CELL_RATE) - set_access() + set_access(req_access, req_one_access) /obj/machinery/suit_storage_unit/power_change() . = ..() @@ -320,8 +346,6 @@ name = initial(name) desc = initial(desc) id_card = null - req_access = list() - req_one_access = null set_access(list()) return TRUE if(user.get_idcard() != id) @@ -681,8 +705,6 @@ if("None") //free for all name = initial(name) desc = initial(desc) - req_access = list() - req_one_access = null set_access(list()) if(!isnull(id_card)) diff --git a/code/game/objects/effects/spawners/random/decoration.dm b/code/game/objects/effects/spawners/random/decoration.dm index 6116d2287331..4fdcee1c5d12 100644 --- a/code/game/objects/effects/spawners/random/decoration.dm +++ b/code/game/objects/effects/spawners/random/decoration.dm @@ -98,7 +98,6 @@ icon_state = "showcase" loot = list( /obj/structure/showcase/machinery/microwave, - /obj/structure/showcase/machinery/microwave_engineering, ) /obj/effect/spawner/random/decoration/glowstick diff --git a/code/game/objects/effects/spawners/random/techstorage.dm b/code/game/objects/effects/spawners/random/techstorage.dm index 2376d8e2eb5a..997d24805595 100644 --- a/code/game/objects/effects/spawners/random/techstorage.dm +++ b/code/game/objects/effects/spawners/random/techstorage.dm @@ -34,7 +34,6 @@ /obj/item/circuitboard/machine/ore_redemption, /obj/item/circuitboard/computer/order_console/mining, /obj/item/circuitboard/machine/microwave, - /obj/item/circuitboard/machine/microwave/engineering, /obj/item/circuitboard/machine/deep_fryer, /obj/item/circuitboard/machine/griddle, /obj/item/circuitboard/machine/reagentgrinder, diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 6fdd89888c85..d79db10e3a18 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -566,7 +566,10 @@ else if(main_weapon_examine) // you can intuit a good weapon is a good thrown weapon, only report otherwise if it's significant if(abs(force - throwforce) >= 10 && main_weapon_examine != thrown_weapon_examine) - return_message += ", but is [thrown_weapon_examine] when thrown" + if(throwforce < 20) + return_message += ", but is [thrown_weapon_examine] when thrown" + else + return_message += ", while being [thrown_weapon_examine] when thrown" else return_message = "that can be used as \a [thrown_weapon_examine] thrown weapon" diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index e523fe8350b0..4d965233692b 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -67,6 +67,7 @@ interaction_flags_click = FORBID_TELEKINESIS_REACH armor_type = /datum/armor/card_id resistance_flags = FIRE_PROOF | ACID_PROOF + flags_1 = parent_type::flags_1 | HAS_UNIQUE_SCREENTIP_NAME_1 /// The name registered on the card (for example: Dr Bryan See) var/registered_name = null @@ -109,9 +110,6 @@ /// List of wildcard slot names as keys with lists of wildcard data as values. var/list/wildcard_slots = list() - /// Boolean value. If TRUE, the [Intern] tag gets prepended to this ID card when the label is updated. - var/is_intern = FALSE - /// Will this ID card use the first or last name as the name displayed with the honorific? var/honorific_position = HONORIFIC_POSITION_DISABLED /// What is our selected honorific? @@ -147,8 +145,6 @@ register_context() RegisterSignal(src, COMSIG_ATOM_UPDATED_ICON, PROC_REF(update_in_wallet)) - if(prob(1)) - ADD_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD, ROUNDSTART_TRAIT) /obj/item/card/id/Destroy() if (registered_account) @@ -177,36 +173,6 @@ return honorific_title return registered_name -// /obj/item/card/id/proc/on_loc_equipped(datum/source, mob/equipper, slot) -// SIGNAL_HANDLER - -// if (slot == ITEM_SLOT_ID) -// RegisterSignal(equipper, COMSIG_MOVABLE_POINTED, PROC_REF(on_pointed)) - -// /obj/item/card/id/proc/on_loc_dropped(datum/source, mob/dropper) -// SIGNAL_HANDLER -// UnregisterSignal(dropper, COMSIG_MOVABLE_POINTED) - -// /obj/item/card/id/proc/on_pointed(mob/living/user, atom/pointed, obj/effect/temp_visual/point/point) -// SIGNAL_HANDLER -// if ((!big_pointer && !pointer_color) || HAS_TRAIT(user, TRAIT_UNKNOWN_APPEARANCE)) -// return -// if (point.icon_state != /obj/effect/temp_visual/point::icon_state) //it differs from the original icon_state already. -// return -// if (loc != user) -// if (!isitem(loc)) -// return -// var/obj/item/as_item = loc -// if (as_item.GetID() != src) -// return -// if (big_pointer) -// point.icon_state = "arrow_large" -// if (pointer_color) -// point.icon_state = "[point.icon_state]_white" -// point.color = pointer_color -// var/mutable_appearance/highlight = mutable_appearance(point.icon, "[point.icon_state]_highlights", appearance_flags = RESET_COLOR) -// point.add_overlay(highlight) - /obj/item/card/id/get_id_examine_strings(mob/user) . = ..() . += list("[icon2html(get_cached_flat_icon(), user, extra_classes = "hugeicon")]") @@ -779,75 +745,63 @@ message = span_nicegreen("You pay the last [amount_to_pay] credits of your debt, extinguishing it. Congratulations!") to_chat(user, message) +/obj/item/card/id/MouseEntered(location, control, params) + . = ..() + if(registered_name) + winset(usr, null, "mapwindow.status_bar.text=\"[get_screentip_name()]\"" ) + +/obj/item/card/id/get_screentip_name() + if(registered_name) + return "[name] - [registered_name]" + return name + /obj/item/card/id/examine(mob/user) . = ..() if(!user.can_read(src)) return - if(registered_account && !isnull(registered_account.account_id)) - . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr." + var/list/id_info = list() + id_info += "• Name: [get_displayed_name(honorifics = TRUE)]" + id_info += "• Job: [get_trim_assignment()]" + id_info += "• Age: [registered_age]" + if(registered_account?.account_id) + id_info += "• Account Owner: [registered_account.account_holder]" + var/balance_info = "Balance: [registered_account.account_balance]cr" if(ACCESS_COMMAND in access) var/datum/bank_account/linked_dept = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) - . += "The [linked_dept.account_holder] linked to the ID reports a balance of [linked_dept.account_balance] cr." - else - . += span_notice("Alt-Right-Click the ID to set the linked bank account.") - - if(HAS_TRAIT(user, TRAIT_ID_APPRAISER)) - . += HAS_TRAIT(src, TRAIT_JOB_FIRST_ID_CARD) ? span_boldnotice("Hmm... yes, this ID was issued from Central Command!") : span_boldnotice("This ID was created in this sector, not by Central Command.") - if(HAS_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD) && (user.is_holding(src) || (user.CanReach(src) && user.put_in_hands(src, ignore_animation = FALSE)))) - ADD_TRAIT(src, TRAIT_NODROP, "psycho") - . += span_hypnophrase("Look at that subtle coloring... The tasteful thickness of it. Oh my God, it even has a watermark...") - var/sound/slowbeat = sound('sound/health/slowbeat.ogg', repeat = TRUE) - user.playsound_local(get_turf(src), slowbeat, 40, 0, channel = CHANNEL_HEARTBEAT, use_reverb = FALSE) - if(isliving(user)) - var/mob/living/living_user = user - living_user.adjust_jitter(10 SECONDS) - addtimer(CALLBACK(src, PROC_REF(drop_card), user), 10 SECONDS) - . += span_notice("There's more information below, you can look again to take a closer look...") - -/obj/item/card/id/proc/drop_card(mob/user) - user.stop_sound_channel(CHANNEL_HEARTBEAT) - REMOVE_TRAIT(src, TRAIT_NODROP, "psycho") - if(user.is_holding(src)) - user.dropItemToGround(src) - for(var/mob/living/carbon/human/viewing_mob in viewers(user, 2)) - if(viewing_mob.stat || viewing_mob == user) - continue - viewing_mob.say("Is something wrong? [first_name(user.name)]... you're sweating.", forced = "psycho") - break + balance_info += " / Dept. Budget: [linked_dept.account_balance]cr" + id_info += span_slightly_smaller(" ↳ [balance_info]") + if(registered_account.mining_points || istype(trim, /datum/id_trim/job/shaft_miner) || istype(trim, /datum/id_trim/job/bitrunner)) + id_info += span_slightly_smaller(" ↳ Mining Scrip: [registered_account.mining_points]") + + var/list/control_info = list() + control_info += span_smallnotice("Alt-Click the ID to pull money from the linked account in the form of holochips.") + control_info += span_smallnotice("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") + if(isnull(registered_account) || isnull(registered_account.account_id) || registered_account.replaceable) + control_info += span_smallnotice("Alt-Right-Click the ID to change the linked account.") + + var/id_info_formatted = span_info(boxed_message(jointext(id_info, "
"))) + var/control_info_formatted = jointext(control_info, "
") + + . += "[id_info_formatted][control_info_formatted]" // skipping br between the box and the controls because the box already has a br at the end. + if(registered_account?.account_debt || registered_account?.civilian_bounty) + . += span_smallnoticeital("There's more information below, you can examine again to take a closer look...") /obj/item/card/id/examine_more(mob/user) . = ..() if(!user.can_read(src)) return - . += span_notice("You examine [src] closer, and note the following...") - - if(registered_age) - . += "The card indicates that the holder is [registered_age] years old. [(registered_age < AGE_MINOR) ? "There's a holographic stripe that reads [span_danger("'MINOR: DO NOT SERVE ALCOHOL OR TOBACCO'")] along the bottom of the card." : ""]" if(registered_account) - if(registered_account.mining_points) - . += "There's [registered_account.mining_points] mining point\s loaded onto the card's bank account." - . += "The account linked to the ID belongs to '[registered_account.account_holder]' and reports a balance of [registered_account.account_balance] cr." if(registered_account.account_debt) - . += span_warning("The account is currently indebted for [registered_account.account_debt] cr. [100*DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.") - if(registered_account.account_job) - var/datum/bank_account/D = SSeconomy.get_dep_account(registered_account.account_job.paycheck_department) - if(D) - . += "The [D.account_holder] reports a balance of [D.account_balance] cr." - . += span_info("Alt-Click the ID to pull money from the linked account in the form of holochips.") - . += span_info("You can insert credits into the linked account by pressing holochips, cash, or coins against the ID.") - if(registered_account.replaceable) - . += span_info("Alt-Right-Click the ID to change the linked bank account.") + . += span_warning("The account is currently indebted for [registered_account.account_debt] cr. \ + [100 * DEBT_COLLECTION_COEFF]% of all earnings will go towards extinguishing it.") if(registered_account.civilian_bounty) - . += "There is an active civilian bounty." - . += span_info("[registered_account.bounty_text()]") - . += span_info("Quantity: [registered_account.bounty_num()]") - . += span_info("Reward: [registered_account.bounty_value()]") - if(registered_account.account_holder == user.real_name) - . += span_boldnotice("If you lose this ID card, you can reclaim your account by Alt-Clicking a blank ID card while holding it and entering your account ID number.") - else - . += span_info("There is no registered account linked to this card. Alt-Click to add one.") + var/list/bounty_text = list() + bounty_text += "[registered_account.bounty_text()]" + bounty_text += "Quantity: [registered_account.bounty_num()]" + bounty_text += "Reward: [registered_account.bounty_value()]cr" + . += span_info(fieldset_block("Bounty Information", jointext(bounty_text, "
"), "boxed_message")) return . @@ -872,27 +826,10 @@ /// Updates the name based on the card's vars and state. /obj/item/card/id/proc/update_label() - var/name_string if(registered_name) update_honorific() - if(honorific_title) - name_string = "[honorific_title]'s ID Card" - else - name_string = "[registered_name]'s ID Card" - else - name_string = initial(name) - var/assignment_string - - if(is_intern) - if(assignment) - assignment_string = trim?.intern_alt_name || "Intern [assignment]" - else - assignment_string = "Intern" - else - assignment_string = assignment - - name = "[name_string] ([assignment_string])" + name = "[LOWER_TEXT(assignment)]'s ID card" if(ishuman(loc)) var/mob/living/carbon/human/human = loc @@ -1074,7 +1011,7 @@ icon_state = "card_grey" wildcard_slots = WILDCARD_LIMIT_GREY - flags_1 = UNPAINTABLE_1 + flags_1 = parent_type::flags_1 | UNPAINTABLE_1 /// An overlay icon state for when the card is assigned to a name. Usually manifests itself as a little scribble to the right of the job icon. var/assigned_icon_state = "assigned" @@ -1094,16 +1031,6 @@ /// If this is set, will manually override the trim shown for SecHUDs. Intended for admins to VV edit and chameleon ID cards. var/sechud_icon_state_override = null -/obj/item/card/id/advanced/Initialize(mapload) - . = ..() - RegisterSignal(src, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) - RegisterSignal(src, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) - -/obj/item/card/id/advanced/Destroy() - UnregisterSignal(src, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) - - return ..() - /obj/item/card/id/advanced/item_interaction(mob/living/user, obj/item/tool, list/modifiers) . = ..() if(.) @@ -1140,60 +1067,6 @@ update_icon() return ITEM_INTERACT_SUCCESS -/obj/item/card/id/advanced/proc/update_intern_status(datum/source, mob/user, slot) - SIGNAL_HANDLER - - if(!user?.client) - return - if(!CONFIG_GET(flag/use_exp_tracking)) - return - if(!CONFIG_GET(flag/use_low_living_hour_intern)) - return - if(!SSdbcore.Connect()) - return - - var/intern_threshold = (CONFIG_GET(number/use_low_living_hour_intern_hours) * 60) || (CONFIG_GET(number/use_exp_restrictions_heads_hours) * 60) || INTERN_THRESHOLD_FALLBACK_HOURS * 60 - var/playtime = user.client.get_exp_living(pure_numeric = TRUE) - - if((intern_threshold >= playtime) && (user.mind?.assigned_role.job_flags & JOB_CAN_BE_INTERN)) - is_intern = TRUE - update_label() - return - - if(!is_intern) - return - - is_intern = FALSE - update_label() - -/obj/item/card/id/advanced/proc/remove_intern_status(datum/source, mob/user) - SIGNAL_HANDLER - - if(!is_intern) - return - - is_intern = FALSE - update_label() - -/obj/item/card/id/advanced/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change = TRUE) - . = ..() - - //Old loc - if(istype(old_loc, /obj/item/storage/wallet)) - UnregisterSignal(old_loc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) - - if(istype(old_loc, /obj/item/modular_computer)) - UnregisterSignal(old_loc, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED)) - - //New loc - if(istype(loc, /obj/item/storage/wallet)) - RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) - RegisterSignal(loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) - - if(istype(loc, /obj/item/modular_computer)) - RegisterSignal(loc, COMSIG_ITEM_EQUIPPED, PROC_REF(update_intern_status)) - RegisterSignal(loc, COMSIG_ITEM_DROPPED, PROC_REF(remove_intern_status)) - /obj/item/card/id/advanced/update_overlays() . = ..() @@ -1266,10 +1139,6 @@ assigned_icon_state = "assigned_gold" wildcard_slots = WILDCARD_LIMIT_GOLD -/obj/item/card/id/advanced/gold/Initialize(mapload) - . = ..() - ADD_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD, ROUNDSTART_TRAIT) - /obj/item/card/id/advanced/gold/captains_spare name = "captain's spare ID" article = "the" @@ -1277,13 +1146,17 @@ registered_name = "Captain" trim = /datum/id_trim/job/captain registered_age = null + flags_1 = parent_type::flags_1 & ~HAS_UNIQUE_SCREENTIP_NAME_1 /obj/item/card/id/advanced/gold/captains_spare/update_label() //so it doesn't change to Captain's ID card (Captain) on a sneeze if(registered_name == "Captain") name = "[initial(name)][(!assignment || assignment == "Captain") ? "" : " ([assignment])"]" update_appearance(UPDATE_ICON) + flags_1 &= ~HAS_UNIQUE_SCREENTIP_NAME_1 + else - ..() + . = ..() + flags_1 |= HAS_UNIQUE_SCREENTIP_NAME_1 /obj/item/card/id/advanced/centcom name = "\improper CentCom ID" diff --git a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm index 1d6e75eb6097..e5b3e8a4f59e 100644 --- a/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machines/machine_circuitboards.dm @@ -1295,17 +1295,6 @@ /obj/item/stack/sheet/glass = 2) needs_anchored = FALSE -/obj/item/circuitboard/machine/microwave/engineering - name = "Wireless Microwave Oven" - greyscale_colors = CIRCUIT_COLOR_SERVICE - build_path = /obj/machinery/microwave/engineering - req_components = list( - /datum/stock_part/micro_laser = 1, - /datum/stock_part/matter_bin = 1, - /datum/stock_part/capacitor/tier2 = 1, - /obj/item/stack/cable_coil = 4, - /obj/item/stack/sheet/glass = 2) - /obj/item/circuitboard/machine/processor name = "Food Processor" greyscale_colors = CIRCUIT_COLOR_SERVICE diff --git a/code/game/objects/items/food/snacks.dm b/code/game/objects/items/food/snacks.dm index c8c0cec3df88..4cbede98656e 100644 --- a/code/game/objects/items/food/snacks.dm +++ b/code/game/objects/items/food/snacks.dm @@ -61,6 +61,7 @@ icon_state = "sosjerky" desc = "Beef jerky made from the finest space cows." trash_type = /obj/item/trash/sosjerky + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment/protein = 3, /datum/reagent/consumable/sugar = 2, @@ -87,6 +88,7 @@ icon_state = "chips" trash_type = /obj/item/trash/chips bite_consumption = 1 + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, @@ -120,6 +122,7 @@ name = "\improper 4no raisins" icon_state = "4no_raisins" desc = "Best raisins in the universe. Not sure why." + gender = PLURAL trash_type = /obj/item/trash/raisins food_reagents = list( /datum/reagent/consumable/nutriment = 2, @@ -184,6 +187,7 @@ desc = "Bite sized cheesie snacks that will honk all over your mouth." icon_state = "cheesie_honkers" trash_type = /obj/item/trash/cheesie + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/sugar = 3, @@ -198,6 +202,7 @@ icon_state = "syndi_cakes" desc = "An extremely moist snack cake that tastes just as good after being nuked." trash_type = /obj/item/trash/syndi_cakes + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/doctor_delight = 5, @@ -207,9 +212,9 @@ w_class = WEIGHT_CLASS_SMALL /obj/item/food/energybar - name = "\improper High-power energy bars" + name = "\improper High-power energy bar" icon_state = "energybar" - desc = "An energy bar with a lot of punch, you probably shouldn't eat this if you're not an Ethereal." + desc = "An energy bar with a lot of punch - typically more punch than a non-Ethereal can handle." trash_type = /obj/item/trash/energybar food_reagents = list( /datum/reagent/consumable/nutriment = 3, @@ -225,6 +230,7 @@ desc = "A favourite amongst the terminally angry." icon_state = "peanuts" trash_type = /obj/item/trash/peanuts + gender = PLURAL food_reagents = list(/datum/reagent/consumable/nutriment = 2) tastes = list("peanuts" = 4, "anger" = 1) foodtypes = JUNKFOOD | NUTS @@ -314,6 +320,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "Legally, we cannot say that these won't melt in your hands." icon_state = "cnds" trash_type = /obj/item/trash/cnds + gender = PLURAL food_reagents = list( /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 1, @@ -389,6 +396,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "A pack of Sweetie's brand premium pistacios." icon_state = "pistachio" trash_type = /obj/item/trash/pistachios + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1, @@ -405,6 +413,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "A pack of roasted sunflower seeds. Beloved by space russians and babushka alike." icon_state = "semki" trash_type = /obj/item/trash/semki + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment/fat/oil = 1, /datum/reagent/consumable/salt = 6, @@ -436,6 +445,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) icon_state = "boritos" trash_type = /obj/item/trash/boritos bite_consumption = 2 + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/fat/oil = 2, @@ -531,6 +541,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "The ultimate baseball snack. Once you start, it's hard to stop!" icon_state = "hot_shots" trash_type = /obj/item/trash/hot_shots + gender = PLURAL food_reagents = list( /datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/nutriment/vitamin = 1, @@ -546,6 +557,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "A classic treat for all ages, it's Sticko, the original chocolate-coated biscuit stick! This one's the original (and as some would say, best) flavour: biscuit and milk chocolate." icon_state = "sticko_classic" trash_type = /obj/item/trash/sticko + gender = PLURAL food_reagents = list( /datum/reagent/consumable/sugar = 3, /datum/reagent/consumable/coco = 1, @@ -626,6 +638,7 @@ GLOBAL_LIST_INIT(safe_peanut_types, populate_safe_peanut_types()) desc = "You've heard of Snap-Roks, now get ready for Shok-Roks: the popping candy for Ethereals! Available in 5 exciting flavours, of which this bag contains Stormcloud Candy- like cotton candy, but electric!" icon_state = "shok_roks_candy" trash_type = /obj/item/trash/shok_roks + gender = PLURAL food_reagents = list( /datum/reagent/consumable/liquidelectricity/enriched = 2, /datum/reagent/consumable/sugar = 3 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index f55fc63e01d2..78705ffa3dfe 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -55,6 +55,8 @@ /obj/item/radio, /obj/item/melee/sickly_blade/lock, )) + var/static/list/exception_cache = typecacheof(/obj/item/crowbar/power) + atom_storage.exception_hold = exception_cache /obj/item/storage/belt/utility/chief name = "chief engineer's toolbelt" diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index d6602438dd5d..8d6a83c87743 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -107,9 +107,9 @@ icon_state = "crowbar_powergame" /obj/item/crowbar/power - name = "jaws of life" - article = "a set of" - desc = "A set of jaws of life, compressed through the magic of science." + name = "hydraulic rescue tool" + desc = "Colloquially known as \"the Jaws of Life\" for its use in emergency situations. \ + Has a prying attachment for opening spaces and a cutting attachment for slicing through steel." icon_state = "jaws" inhand_icon_state = "jawsoflife" worn_icon_state = "jawsoflife" @@ -118,7 +118,7 @@ custom_materials = list(/datum/material/iron = SHEET_MATERIAL_AMOUNT*2.25, /datum/material/silver = SHEET_MATERIAL_AMOUNT*1.25, /datum/material/titanium = SHEET_MATERIAL_AMOUNT*1.75) usesound = 'sound/items/jaws_pry.ogg' force = 15 - w_class = WEIGHT_CLASS_NORMAL + w_class = WEIGHT_CLASS_BULKY toolspeed = 0.7 force_opens = TRUE /// Used on Initialize, how much time to cut cable restraints and zipties. @@ -161,16 +161,17 @@ return COMPONENT_NO_DEFAULT_MESSAGE /obj/item/crowbar/power/syndicate - name = "Syndicate jaws of life" - desc = "A pocket sized re-engineered copy of Nanotrasen's standard jaws of life. Can be used to force open airlocks in its crowbar configuration." + name = "\improper Syndicate hydraulic \"rescue\" tool" + desc = "A modestly sized reverse engineering of Nanotrasen's standard issue \"hydraulic rescue tool\". \ + Despite its smaller size, it remains as capable - if not more so - than Nanotrasen's design." icon_state = "jaws_syndie" - w_class = WEIGHT_CLASS_SMALL + w_class = WEIGHT_CLASS_NORMAL toolspeed = 0.5 force_opens = TRUE /obj/item/crowbar/power/examine() . = ..() - . += " It's fitted with a [tool_behaviour == TOOL_CROWBAR ? "prying" : "cutting"] head." + . += "It's fitted with a [tool_behaviour == TOOL_CROWBAR ? "prying" : "cutting"] head." /obj/item/crowbar/power/suicide_act(mob/living/user) if(tool_behaviour == TOOL_CROWBAR) diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm index c93402849761..8860f059e775 100644 --- a/code/game/objects/items/tools/screwdriver.dm +++ b/code/game/objects/items/tools/screwdriver.dm @@ -137,7 +137,7 @@ /obj/item/screwdriver/power/examine() . = ..() - . += " It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] bit." + . += "It's fitted with a [tool_behaviour == TOOL_SCREWDRIVER ? "screw" : "bolt"] bit." /obj/item/screwdriver/power/suicide_act(mob/living/user) if(tool_behaviour == TOOL_SCREWDRIVER) diff --git a/code/game/objects/structures/beds_chairs/pew.dm b/code/game/objects/structures/beds_chairs/pew.dm index 6388247e8c42..1a6fd9cec051 100644 --- a/code/game/objects/structures/beds_chairs/pew.dm +++ b/code/game/objects/structures/beds_chairs/pew.dm @@ -13,6 +13,11 @@ /obj/structure/chair/pew/MakeRotate() AddComponent(/datum/component/simple_rotation, ROTATION_REQUIRE_WRENCH|ROTATION_IGNORE_ANCHORED) +/obj/structure/chair/pew/Initialize(mapload) + . = ..() + if(name == initial(name)) + name = "pew" + /obj/structure/chair/pew/left name = "left wooden pew end" icon_state = "pewend_left" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index 9a4a3b32d9a1..47f354033b2b 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -34,9 +34,13 @@ /obj/structure/falsewall/Initialize(mapload) . = ..() - var/obj/item/stack/initialized_mineral = new mineral // Okay this kinda sucks. - set_custom_materials(initialized_mineral.mats_per_unit, mineral_amount) - qdel(initialized_mineral) + // minerals are only applied to fake mineral walls + // ...yes, real iron walls are not actually made of iron + if(ispath(walltype, /turf/closed/wall/mineral)) + var/obj/item/stack/initialized_mineral = new mineral // Okay this kinda sucks. + set_custom_materials(initialized_mineral.mats_per_unit, mineral_amount) + qdel(initialized_mineral) + air_update_turf(TRUE, TRUE) update_appearance() @@ -144,12 +148,11 @@ for(var/i in 1 to mineral_amount) new mineral(loc) -/obj/structure/falsewall/get_dumping_location() - return null +/obj/structure/falsewall/examine_descriptor(mob/user) + return "wall" /obj/structure/falsewall/examine_status(mob/user) //So you can't detect falsewalls by examine. - to_chat(user, span_notice("The outer plating is welded firmly in place.")) - return null + return span_notice("The outer plating is welded firmly in place.") /* * False R-Walls @@ -166,8 +169,7 @@ smoothing_flags = SMOOTH_BITMASK /obj/structure/falsewall/reinforced/examine_status(mob/user) - to_chat(user, span_notice("The outer grille is fully intact.")) - return null + return span_notice("The outer grille is fully intact.") /obj/structure/falsewall/reinforced/attackby(obj/item/tool, mob/user) ..() diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm index baeb8209447f..9e96bd684677 100644 --- a/code/game/objects/structures/showcase.dm +++ b/code/game/objects/structures/showcase.dm @@ -85,12 +85,6 @@ icon = 'icons/obj/machines/microwave.dmi' icon_state = "mw_complete" -/obj/structure/showcase/machinery/microwave_engineering - name = "\improper Nanotrasen Wave(tm) microwave" - desc = "Just when everyone thought Nanotrasen couldn't improve on their famous microwave, this 2563 model features Wave™! A Nanotrasen exclusive, Wave™ allows your PDA to be charged wirelessly through microwave frequencies. Because nothing says 'future' like charging your PDA while overcooking your leftovers. Nanotrasen Wave™ - Multitasking, redefined." - icon = 'icons/obj/machines/microwave.dmi' - icon_state = "engi_mw_complete" - /obj/structure/showcase/machinery/cloning_pod name = "cloning pod exhibit" desc = "Depicts a prototype from a failed attempt at reliable cloning technology. The technology was scrapped after reports of severe mutations, wiggly ear syndrome and spontaneous tail growth. The date 11.11.2558 is engraved on the base." diff --git a/code/game/objects/structures/tank_holder.dm b/code/game/objects/structures/tank_holder.dm index 5a9eb683c5c2..d581d1a24a58 100644 --- a/code/game/objects/structures/tank_holder.dm +++ b/code/game/objects/structures/tank_holder.dm @@ -35,12 +35,12 @@ /obj/structure/tank_holder/examine(mob/user) . = ..() - . += "It is [anchored ? "wrenched to the floor." : "The bolts on the bottom are unsecured."]
" if(tank) - . += "It is holding one [tank]." + . += "It is holding \a [tank]." else . += "It is empty." - . += span_notice("It is held together by some screws.") + . += span_info("[anchored ? "It is bolted to the floor." : "The bolts on the bottom are loose."]") + . += span_info("It is held together by some screws.") /obj/structure/tank_holder/attackby(obj/item/W, mob/living/user, list/modifiers, list/attack_modifiers) if(user.combat_mode) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 5f0f7807bafa..959fb97a6b31 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -496,7 +496,7 @@ Striking a noncultist, however, will tear their flesh."} user.adjust_temp_blindness(60 SECONDS) /obj/item/reagent_containers/cup/beaker/unholywater - name = "flask of unholy water" + name = "unholy water" desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown." icon = 'icons/obj/drinks/bottles.dmi' icon_state = "unholyflask" @@ -504,6 +504,7 @@ Striking a noncultist, however, will tear their flesh."} lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' list_reagents = list(/datum/reagent/fuel/unholywater = 50) + article = "a flask of" ///how many times can the shuttle be cursed? #define MAX_SHUTTLE_CURSES 3 diff --git a/code/modules/antagonists/heretic/items/eldritch_flask.dm b/code/modules/antagonists/heretic/items/eldritch_flask.dm index 409bcd473ed7..32587069255c 100644 --- a/code/modules/antagonists/heretic/items/eldritch_flask.dm +++ b/code/modules/antagonists/heretic/items/eldritch_flask.dm @@ -1,8 +1,9 @@ // An unholy water flask, but for heretics. // Heals heretics, hearms non-heretics. Pretty much identical. /obj/item/reagent_containers/cup/beaker/eldritch - name = "flask of eldritch essence" + name = "eldritch essence" desc = "Toxic to the closed minded, yet refreshing to those with knowledge of the beyond." icon = 'icons/obj/antags/eldritch.dmi' icon_state = "eldritch_flask" list_reagents = list(/datum/reagent/eldritch = 50) + article = "a flask of" diff --git a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm index 40883eecad6e..14c3f667bb19 100644 --- a/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm +++ b/code/modules/atmospherics/machinery/air_alarm/_air_alarm.dm @@ -296,7 +296,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) for(var/obj/machinery/atmospherics/components/unary/vent_pump/vent as anything in my_area.air_vents) data["vents"] += list(list( "refID" = REF(vent), - "long_name" = sanitize(vent.name), + "long_name" = VENT_PUMP_NAME(vent.id_tag), "power" = vent.on, "overclock" = vent.fan_overclocked, "integrity" = vent.get_integrity_percentage(), @@ -317,7 +317,7 @@ GLOBAL_LIST_EMPTY_TYPED(air_alarms, /obj/machinery/airalarm) filter_types += list(list("gas_id" = gas[META_GAS_ID], "gas_name" = gas[META_GAS_NAME], "enabled" = (path in scrubber.filter_types))) data["scrubbers"] += list(list( "refID" = REF(scrubber), - "long_name" = sanitize(scrubber.name), + "long_name" = SCRUBBER_NAME(scrubber.id_tag), "power" = scrubber.on, "scrubbing" = scrubber.scrubbing, "widenet" = scrubber.widenet, diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index 5fd40999952b..90d09475e17a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -19,6 +19,7 @@ // vents are more complex machinery and so are less resistant to damage max_integrity = 100 interaction_flags_click = NEED_VENTCRAWL + flags_1 = parent_type::flags_1 | HAS_UNIQUE_SCREENTIP_NAME_1 ///Direction of pumping the gas (ATMOS_DIRECTION_RELEASING or ATMOS_DIRECTION_SIPHONING) var/pump_direction = ATMOS_DIRECTION_RELEASING @@ -86,6 +87,9 @@ /obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) . = ..() + if(welded) + . += "It seems welded shut." + . += span_notice("You can link it with an air sensor using a multitool.") if(fan_overclocked) @@ -337,9 +341,22 @@ to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE +/obj/machinery/atmospherics/components/unary/vent_pump/get_name_chaser(mob/user, list/name_chaser) + . = ..() + . += span_info("It has an ID serial: [id_tag], and belongs to [get_area_name(src)].") + +/obj/machinery/atmospherics/components/unary/vent_pump/MouseEntered(location, control, params) + . = ..() + if(id_tag) + winset(usr, null, "mapwindow.status_bar.text=\"[get_screentip_name()]\"" ) + +/obj/machinery/atmospherics/components/unary/vent_pump/get_screentip_name() + if(id_tag) + return "[name] - [id_tag]" + return name + /obj/machinery/atmospherics/components/unary/vent_pump/examine(mob/user) . = ..() - . += span_info("It belongs to [get_area_name(src)], and is ID [id_tag].") if(welded) . += "It seems welded shut." diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 0f7501c5bb22..dd1812d0941b 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -16,6 +16,7 @@ vent_movement = VENTCRAWL_ALLOWED | VENTCRAWL_CAN_SEE | VENTCRAWL_ENTRANCE_ALLOWED processing_flags = NONE interaction_flags_click = NEED_VENTCRAWL + flags_1 = parent_type::flags_1 | HAS_UNIQUE_SCREENTIP_NAME_1 ///The mode of the scrubber (ATMOS_DIRECTION_SCRUBBING or ATMOS_DIRECTION_SIPHONING) var/scrubbing = ATMOS_DIRECTION_SCRUBBING @@ -302,9 +303,22 @@ to_chat(user, span_warning("You cannot unwrench [src], turn it off first!")) return FALSE +/obj/machinery/atmospherics/components/unary/vent_scrubber/get_name_chaser(mob/user, list/name_chaser) + . = ..() + . += span_info("It has an ID serial: [id_tag], and belongs to [get_area_name(src)].") + +/obj/machinery/atmospherics/components/unary/vent_scrubber/MouseEntered(location, control, params) + . = ..() + if(id_tag) + winset(usr, null, "mapwindow.status_bar.text=\"[get_screentip_name()]\"" ) + +/obj/machinery/atmospherics/components/unary/vent_scrubber/get_screentip_name() + if(id_tag) + return "[name] - [id_tag]" + return name + /obj/machinery/atmospherics/components/unary/vent_scrubber/examine(mob/user) . = ..() - . += span_info("It belongs to [get_area_name(src)], and is ID [id_tag].") if(welded) . += "It seems welded shut." diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 7704aa120eab..071f8d8d44ac 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -194,15 +194,16 @@ inhand_icon_state = null blood_overlay_type = "armor" allowed = list( + /obj/item/crowbar/power, /obj/item/fireaxe/metal_h2_axe, /obj/item/flashlight, + /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, /obj/item/radio, /obj/item/storage/bag/construction, + /obj/item/storage/belt/chest_pouch, + /obj/item/t_scanner, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, - /obj/item/t_scanner, - /obj/item/gun/ballistic/rifle/boltaction/pipegun/prime, - /obj/item/storage/belt/chest_pouch, ) resistance_flags = NONE species_exception = list(/datum/species/golem) @@ -446,6 +447,7 @@ /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/extinguisher, + /obj/item/crowbar/power, ) /obj/item/clothing/suit/atmos_overalls/Initialize(mapload) diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index c34ed8f3e5c1..1edfe250cfea 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -67,6 +67,7 @@ /obj/item/clothing/suit/toggle/labcoat/paramedic/Initialize(mapload) . = ..() AddComponent(/datum/component/adjust_fishing_difficulty, -2) //FISH DOCTOR?! + allowed += /obj/item/crowbar/power /obj/item/clothing/suit/toggle/labcoat/mad name = "Mad's labcoat" diff --git a/code/modules/clothing/suits/wintercoats.dm b/code/modules/clothing/suits/wintercoats.dm index eb348e0a8390..71bc58a09843 100644 --- a/code/modules/clothing/suits/wintercoats.dm +++ b/code/modules/clothing/suits/wintercoats.dm @@ -448,6 +448,10 @@ inhand_icon_state = null hoodtype = /obj/item/clothing/head/hooded/winterhood/medical/paramedic +/obj/item/clothing/suit/hooded/wintercoat/medical/paramedic/Initialize(mapload) + . = ..() + allowed += /obj/item/crowbar/power + /obj/item/clothing/head/hooded/winterhood/medical/paramedic desc = "A white winter coat hood with blue markings." icon_state = "hood_paramed" @@ -557,7 +561,8 @@ /obj/item/t_scanner, /obj/item/construction/rld, /obj/item/construction/rtd, - /obj/item/gun/ballistic/rifle/rebarxbow + /obj/item/gun/ballistic/rifle/rebarxbow, + /obj/item/crowbar/power, ) armor_type = /datum/armor/wintercoat_engineering hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering diff --git a/code/modules/food_and_drinks/machinery/microwave.dm b/code/modules/food_and_drinks/machinery/microwave.dm index a2723ca0b509..a909530014bd 100644 --- a/code/modules/food_and_drinks/machinery/microwave.dm +++ b/code/modules/food_and_drinks/machinery/microwave.dm @@ -891,41 +891,6 @@ //The microwave should turn off asynchronously from any other microwaves that initialize at the same time. Keep in mind this will not turn off, since there is nothing to call the proc that ends this microwave's looping addtimer(CALLBACK(src, PROC_REF(wzhzhzh)), rand(0.5 SECONDS, 3 SECONDS)) -/obj/machinery/microwave/engineering - name = "wireless microwave oven" - desc = "For the hard-working tradesperson who's in the middle of nowhere and just wants to warm up their pastry-based savoury item from an overpriced vending machine." - base_icon_state = "engi_" - icon_state = "engi_mw_complete" - circuit = /obj/item/circuitboard/machine/microwave/engineering - light_color = LIGHT_COLOR_BABY_BLUE - // We don't use area power, we always use the cell - use_power = NO_POWER_USE - cell_powered = TRUE - vampire_charging_capable = TRUE - ingredient_shifts_x = list( - 0, - 5, - -5, - 3, - -3, - ) - ingredient_shifts_y = list( - 0, - 2, - -2, - ) - -/obj/machinery/microwave/engineering/Initialize(mapload) - . = ..() - if(mapload) - cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus - update_appearance() - -/obj/machinery/microwave/engineering/cell_included/Initialize(mapload) - . = ..() - cell = new /obj/item/stock_parts/power_store/cell/upgraded/plus - update_appearance() - #undef MICROWAVE_NORMAL #undef MICROWAVE_MUCK #undef MICROWAVE_PRE diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 9a9d8a02a945..205cd4533be7 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -419,7 +419,6 @@ var/obj/item/card/id/card = equipped.wear_id if(istype(card)) - ADD_TRAIT(card, TRAIT_JOB_FIRST_ID_CARD, ROUNDSTART_TRAIT) shuffle_inplace(card.access) // Shuffle access list to make NTNet passkeys less predictable card.registered_name = equipped.real_name diff --git a/code/modules/library/skill_learning/skillchip.dm b/code/modules/library/skill_learning/skillchip.dm index 2e041541495c..32f47721283e 100644 --- a/code/modules/library/skill_learning/skillchip.dm +++ b/code/modules/library/skill_learning/skillchip.dm @@ -438,15 +438,6 @@ activate_message = "You feel that you know a lot about interpreting organs." deactivate_message = "Knowledge of liver damage, heart strain and lung scars fades from your mind." -/obj/item/skillchip/appraiser - name = "GENUINE ID Appraisal Now! skillchip" - auto_traits = list(TRAIT_ID_APPRAISER) - skill_name = "ID Appraisal" - skill_description = "Appraise an ID and see if it's issued from centcom, or just a cruddy station-printed one." - skill_icon = "magnifying-glass" - activate_message = span_notice("You feel that you can recognize special, minute details on ID cards.") - deactivate_message = span_notice("Was there something special about certain IDs?") - /obj/item/skillchip/sabrage name = "Le S48R4G3 skillchip" auto_traits = list(TRAIT_SABRAGE_PRO) diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 0886869fa628..8a44bdd575a4 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -248,6 +248,7 @@ /obj/item/construction/rcd, /obj/item/fireaxe/metal_h2_axe, /obj/item/storage/bag/construction, + /obj/item/crowbar/power, ) variants = list( "engineering" = list( @@ -315,6 +316,7 @@ /obj/item/fireaxe/metal_h2_axe, /obj/item/pipe_dispenser, /obj/item/t_scanner, + /obj/item/crowbar/power, ) variants = list( "atmospheric" = list( @@ -387,6 +389,7 @@ /obj/item/pipe_dispenser, /obj/item/storage/bag/construction, /obj/item/t_scanner, + /obj/item/crowbar/power, ) variants = list( "advanced" = list( @@ -639,6 +642,7 @@ /obj/item/storage/pill_bottle, /obj/item/storage/bag/chemistry, /obj/item/storage/bag/bio, + /obj/item/crowbar/power, ) variants = list( "medical" = list( @@ -751,6 +755,7 @@ /obj/item/storage/bag/chemistry, /obj/item/storage/bag/bio, /obj/item/melee/baton/telescopic, + /obj/item/crowbar/power, ) variants = list( "rescue" = list( diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index d530795b5d63..e716641a1693 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -380,7 +380,6 @@ if(long_ranged) . += "It is upgraded with an experimental long-ranged network capabilities, picking up NTNet frequencies while further away." - . += span_notice("It has [max_capacity] GQ of storage capacity.") if(computer_id_slot) if(Adjacent(user)) @@ -390,7 +389,8 @@ . += span_info("Alt-click [src] to eject the identification card.") if(internal_cell) - . += span_info("Right-click it with a screwdriver to eject the [internal_cell]") + . += span_info("Its [internal_cell.name] is hidden by some [EXAMINE_HINT("screws")]. \ + You could undo them with [EXAMINE_HINT("right-click")].") /obj/item/modular_computer/examine_more(mob/user) . = ..() @@ -765,10 +765,7 @@ return TRUE /obj/item/modular_computer/proc/UpdateDisplay() - if(!saved_identification && !saved_job) - name = initial(name) - return - name = "[saved_identification] ([saved_job])" + return /obj/item/modular_computer/screwdriver_act_secondary(mob/living/user, obj/item/tool) . = ..() diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index cc1c8b2a41fb..46dbabfd57c1 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -32,12 +32,16 @@ drop_sound = 'maplestation_modules/sound/items/drop/bottle.ogg' pickup_sound = 'maplestation_modules/sound/items/pickup/bottle.ogg' + var/preset_article = "a bottle of" + /obj/item/reagent_containers/cup/glass/bottle/Initialize(mapload, vol) . = ..() var/static/list/recipes = list(/datum/crafting_recipe/molotov) AddElement(/datum/element/slapcrafting, recipes) register_context() register_item_context() + if(length(list_reagents)) + article = preset_article /obj/item/reagent_containers/cup/glass/bottle/add_context(atom/source, list/context, obj/item/held_item, mob/living/user) if(message_in_a_bottle) @@ -308,13 +312,13 @@ list_reagents = list(/datum/reagent/consumable/ethanol/beer = 1) /obj/item/reagent_containers/cup/glass/bottle/beer/light - name = "Carp Lite" + name = "\improper Carp Lite" desc = "Brewed with \"Pure Ice Asteroid Spring Water\"." icon_state = "litebeer" list_reagents = list(/datum/reagent/consumable/ethanol/beer/light = 30) /obj/item/reagent_containers/cup/glass/bottle/rootbeer - name = "Two-Time root beer" + name = "\improper Two-Time root beer" desc = "A popular, old-fashioned brand of root beer, known for its extremely sugary formula. Might make you want a nap afterwards." icon_state = "twotime" volume = 30 @@ -324,7 +328,7 @@ custom_premium_price = PAYCHECK_CREW * 2 /obj/item/reagent_containers/cup/glass/bottle/ale - name = "Magm-Ale" + name = "\improper Magm-Ale" desc = "A true dorf's drink of choice." icon_state = "alebottle" volume = 30 @@ -333,19 +337,19 @@ custom_price = PAYCHECK_CREW /obj/item/reagent_containers/cup/glass/bottle/gin - name = "Griffeater gin" + name = "\improper Griffeater gin" desc = "A bottle of high quality gin, produced in the New London Space Station." icon_state = "ginbottle" list_reagents = list(/datum/reagent/consumable/ethanol/gin = 100) /obj/item/reagent_containers/cup/glass/bottle/whiskey - name = "Uncle Git's special reserve" + name = "\improper Uncle Git's special reserve" desc = "A premium single-malt whiskey, gently matured inside the tunnels of a nuclear shelter. TUNNEL WHISKEY RULES." icon_state = "whiskeybottle" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey = 100) /obj/item/reagent_containers/cup/glass/bottle/kong - name = "Kong" + name = "\improper Kong" desc = "Makes You Go Ape!®" list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/kong = 100) @@ -355,25 +359,25 @@ list_reagents = list(/datum/reagent/consumable/ethanol/whiskey/candycorn = 100) /obj/item/reagent_containers/cup/glass/bottle/vodka - name = "Tunguska triple distilled" + name = "\improper Tunguska triple distilled" desc = "Aah, vodka. Prime choice of drink AND fuel by Russians worldwide." icon_state = "vodkabottle" list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) /obj/item/reagent_containers/cup/glass/bottle/vodka/badminka - name = "Badminka vodka" + name = "\improper Badminka vodka" desc = "The label's written in Cyrillic. All you can make out is the name and a word that looks vaguely like 'Vodka'." icon_state = "badminka" list_reagents = list(/datum/reagent/consumable/ethanol/vodka = 100) /obj/item/reagent_containers/cup/glass/bottle/tequila - name = "Caccavo guaranteed quality tequila" + name = "\improper Caccavo guaranteed quality tequila" desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!" icon_state = "tequilabottle" list_reagents = list(/datum/reagent/consumable/ethanol/tequila = 100) /obj/item/reagent_containers/cup/glass/bottle/bottleofnothing - name = "bottle of nothing" + name = "nothing" desc = "A bottle filled with nothing." icon_state = "bottleofnothing" list_reagents = list(/datum/reagent/consumable/nothing = 100) @@ -381,19 +385,19 @@ age_restricted = FALSE /obj/item/reagent_containers/cup/glass/bottle/patron - name = "Wrapp Artiste Patron" + name = "\improper Wrapp Artiste Patron" desc = "Silver laced tequila, served in space night clubs across the galaxy." icon_state = "patronbottle" list_reagents = list(/datum/reagent/consumable/ethanol/patron = 100) /obj/item/reagent_containers/cup/glass/bottle/rum - name = "Captain Pete's Cuban spiced rum" + name = "\improper Captain Pete's Cuban spiced rum" desc = "This isn't just rum, oh no. It's practically GRIFF in a bottle." icon_state = "rumbottle" list_reagents = list(/datum/reagent/consumable/ethanol/rum = 100) /obj/item/reagent_containers/cup/glass/bottle/rum/aged - name = "Captain Pete's Vintage spiced rum" + name = "\improper Captain Pete's Vintage spiced rum" desc = "Shiver me timbers, a vintage edition of Captain Pete's rum. It's pratically GRIFF in a bottle from over 50 years ago." icon_state = "rumbottle_gold" list_reagents = list(/datum/reagent/consumable/ethanol/rum/aged = 100) @@ -406,7 +410,7 @@ custom_price = PAYCHECK_CREW /obj/item/reagent_containers/cup/glass/bottle/holywater - name = "flask of holy water" + name = "holy water" desc = "A flask of the chaplain's holy water." icon = 'icons/obj/drinks/bottles.dmi' icon_state = "holyflask" @@ -414,6 +418,7 @@ broken_inhand_icon_state = "broken_holyflask" list_reagents = list(/datum/reagent/water/holywater = 100) drink_type = NONE + preset_article = "a flask of" /obj/item/reagent_containers/cup/glass/bottle/holywater/add_message_overlay() return //looks too weird... @@ -424,32 +429,32 @@ list_reagents = list(/datum/reagent/hellwater = 100) /obj/item/reagent_containers/cup/glass/bottle/vermouth - name = "Goldeneye vermouth" + name = "\improper Goldeneye vermouth" desc = "Sweet, sweet dryness~" icon_state = "vermouthbottle" list_reagents = list(/datum/reagent/consumable/ethanol/vermouth = 100) /obj/item/reagent_containers/cup/glass/bottle/kahlua - name = "Robert Robust's coffee liqueur" + name = "\improper Robert Robust's coffee liqueur" desc = "A widely known, Mexican coffee-flavoured liqueur. In production since 1936, HONK." icon_state = "kahluabottle" list_reagents = list(/datum/reagent/consumable/ethanol/kahlua = 100) drink_type = VEGETABLES /obj/item/reagent_containers/cup/glass/bottle/goldschlager - name = "College Girl goldschlager" + name = "\improper College Girl goldschlager" desc = "Because they are the only ones who will drink 100 proof cinnamon schnapps." icon_state = "goldschlagerbottle" list_reagents = list(/datum/reagent/consumable/ethanol/goldschlager = 100) /obj/item/reagent_containers/cup/glass/bottle/cognac - name = "Chateau de Baton premium cognac" + name = "\improper Chateau de Baton premium cognac" desc = "A sweet and strongly alchoholic drink, made after numerous distillations and years of maturing. You might as well not scream 'SHITCURITY' this time." icon_state = "cognacbottle" list_reagents = list(/datum/reagent/consumable/ethanol/cognac = 100) /obj/item/reagent_containers/cup/glass/bottle/wine - name = "Doublebeard's bearded special wine" + name = "\improper Doublebeard's bearded special wine" desc = "A faint aura of unease and asspainery surrounds the bottle." icon_state = "winebottle" list_reagents = list(/datum/reagent/consumable/ethanol/wine = 100) @@ -468,6 +473,7 @@ /obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled name = "unlabeled wine bottle" desc = "There's no label on this wine bottle." + preset_article = "" /obj/item/reagent_containers/cup/glass/bottle/wine/unlabeled/generate_vintage() var/year = rand(CURRENT_STATION_YEAR - 50, CURRENT_STATION_YEAR) @@ -490,7 +496,7 @@ return "[year] [origin] [type]" /obj/item/reagent_containers/cup/glass/bottle/absinthe - name = "Extra-strong absinthe" + name = "\improper Extra-strong absinthe" desc = "A strong alcoholic drink brewed and distributed by" icon_state = "absinthebottle" list_reagents = list(/datum/reagent/consumable/ethanol/absinthe = 100) @@ -508,11 +514,11 @@ var/fullname switch(shortname) if("T&T") - fullname = "Teal and Tealer" + fullname = "\improper Teal and Tealer" if("A&A") - fullname = "Ash and Asher" + fullname = "\improper Ash and Asher" if("Generic") - fullname = "Nanotrasen Cheap Imitations" + fullname = "\improper Nanotrasen Cheap Imitations" var/removals = list( "\[REDACTED\]", "\[EXPLETIVE DELETED\]", @@ -540,7 +546,7 @@ /obj/item/reagent_containers/cup/glass/bottle/absinthe/premium - name = "Gwyn's premium absinthe" + name = "\improper Gwyn's premium absinthe" desc = "A potent alcoholic beverage, almost makes you forget the ash in your lungs." icon_state = "absinthepremium" @@ -548,44 +554,44 @@ return /obj/item/reagent_containers/cup/glass/bottle/lizardwine - name = "bottle of lizard wine" + name = "lizard wine" desc = "An alcoholic beverage from Space China, made by infusing lizard tails in ethanol. Inexplicably popular among command staff." icon_state = "lizardwine" list_reagents = list(/datum/reagent/consumable/ethanol/lizardwine = 100) drink_type = FRUIT | ALCOHOL /obj/item/reagent_containers/cup/glass/bottle/hcider - name = "Jian Hard Cider" + name = "\improper Jian Hard Cider" desc = "Apple juice for adults." icon_state = "hcider" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/hcider = 50) /obj/item/reagent_containers/cup/glass/bottle/amaretto - name = "Luini Amaretto" + name = "\improper Luini Amaretto" desc = "A gentle, syrupy drink that tastes of almonds and apricots." icon_state = "disaronno" list_reagents = list(/datum/reagent/consumable/ethanol/amaretto = 100) /obj/item/reagent_containers/cup/glass/bottle/grappa - name = "Phillipes well-aged Grappa" + name = "\improper Phillipes well-aged Grappa" desc = "Bottle of Grappa." icon_state = "grappabottle" list_reagents = list(/datum/reagent/consumable/ethanol/grappa = 100) /obj/item/reagent_containers/cup/glass/bottle/sake - name = "Ryo's traditional sake" + name = "\improper Ryo's traditional sake" desc = "Sweet as can be, and burns like fire going down." icon_state = "sakebottle" list_reagents = list(/datum/reagent/consumable/ethanol/sake = 100) /obj/item/reagent_containers/cup/glass/bottle/sake/Initialize(mapload) if(prob(10)) - name = "Fluffy Tail Sake" + name = "\improper Fluffy Tail Sake" desc += " On the bottle is a picture of a kitsune with nine touchable tails." icon_state = "sakebottle_k" else if(prob(10)) - name = "Inubashiri's Home Brew" + name = "\improper Inubashiri's Home Brew" desc += " Awoo." icon_state = "sakebottle_i" return ..() @@ -596,20 +602,20 @@ return ..() /obj/item/reagent_containers/cup/glass/bottle/fernet - name = "Fernet Bronca" + name = "\improper Fernet Bronca" desc = "A bottle of pure Fernet Bronca, produced in Cordoba Space Station" icon_state = "fernetbottle" list_reagents = list(/datum/reagent/consumable/ethanol/fernet = 100) /obj/item/reagent_containers/cup/glass/bottle/bitters - name = "Andromeda Bitters" + name = "\improper Andromeda Bitters" desc = "An aromatic addition to any drink. Made in New Trinidad, now and forever." icon_state = "bitters_bottle" volume = 30 list_reagents = list(/datum/reagent/consumable/ethanol/bitters = 30) /obj/item/reagent_containers/cup/glass/bottle/curacao - name = "Beekhof Blauw Curaçao" + name = "\improper Beekhof Blauw Curaçao" desc = "Still produced on the island of Curaçao, after all these years." icon_state = "curacao_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/curacao = 100) @@ -618,13 +624,13 @@ return //doesn't fit the sprite /obj/item/reagent_containers/cup/glass/bottle/navy_rum - name = "Pride of the Union Navy-Strength Rum" + name = "\improper Pride of the Union Navy-Strength Rum" desc = "Ironically named, given it's made in Bermuda." icon_state = "navy_rum_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/navy_rum = 100) /obj/item/reagent_containers/cup/glass/bottle/grenadine - name = "Jester Grenadine" + name = "\improper Jester Grenadine" desc = "Contains 0% real cherries!" custom_price = PAYCHECK_CREW icon_state = "grenadine" @@ -633,7 +639,7 @@ age_restricted = FALSE /obj/item/reagent_containers/cup/glass/bottle/applejack - name = "Buckin' Bronco's Applejack" + name = "\improper Buckin' Bronco's Applejack" desc = "Kicks like a horse, tastes like an apple!" custom_price = PAYCHECK_CREW icon_state = "applejack_bottle" @@ -641,7 +647,7 @@ drink_type = FRUIT /obj/item/reagent_containers/cup/glass/bottle/wine_voltaic - name = "Voltaic Yellow Wine" + name = "\improper Voltaic Yellow Wine" desc = "Electrically infused wine! Recharges ethereals, safe for consumption." custom_price = PAYCHECK_CREW icon_state = "wine_voltaic_bottle" @@ -649,7 +655,7 @@ drink_type = FRUIT /obj/item/reagent_containers/cup/glass/bottle/champagne - name = "Eau d' Dandy Brut Champagne" + name = "\improper Eau d' Dandy Brut Champagne" desc = "Finely sourced from only the most pretentious French vineyards." icon_state = "champagne_bottle" base_icon_state = "champagne_bottle" @@ -805,20 +811,20 @@ icon_state = "champagne_cork_sabrage" /obj/item/reagent_containers/cup/glass/bottle/blazaam - name = "Ginbad's Blazaam" + name = "\improper Ginbad's Blazaam" desc = "You feel like you should give the bottle a good rub before opening." icon_state = "blazaambottle" list_reagents = list(/datum/reagent/consumable/ethanol/blazaam = 100) /obj/item/reagent_containers/cup/glass/bottle/trappist - name = "Mont de Requin Trappistes Bleu" + name = "\improper Mont de Requin Trappistes Bleu" desc = "Brewed in space-Belgium. Fancy!" icon_state = "trappistbottle" volume = 50 list_reagents = list(/datum/reagent/consumable/ethanol/trappist = 50) /obj/item/reagent_containers/cup/glass/bottle/hooch - name = "hooch bottle" + name = "hooch" desc = "A bottle of rotgut. Its owner has applied some street wisdom to cleverly disguise it as a brown paper bag." icon_state = "hoochbottle" list_reagents = list(/datum/reagent/consumable/ethanol/hooch = 100) @@ -827,16 +833,17 @@ return //doesn't fit the sprite /obj/item/reagent_containers/cup/glass/bottle/moonshine - name = "moonshine jug" + name = "moonshine" desc = "It is said that the ancient Applalacians used these stoneware jugs to capture lightning in a bottle." icon_state = "moonshinebottle" list_reagents = list(/datum/reagent/consumable/ethanol/moonshine = 100) + preset_article = "a jug of" /obj/item/reagent_containers/cup/glass/bottle/moonshine/add_message_overlay() return //doesn't fit the sprite /obj/item/reagent_containers/cup/glass/bottle/mushi_kombucha - name = "Solzara Brewing Company Mushi Kombucha" + name = "\improper Solzara Brewing Company Mushi Kombucha" desc = "Best drunk over ice to savour the mushroomy flavour." icon_state = "shroomy_bottle" volume = 30 @@ -844,25 +851,25 @@ isGlass = FALSE /obj/item/reagent_containers/cup/glass/bottle/hakka_mate - name = "Hakka-Mate" + name = "\improper Hakka-Mate" desc = "Hakka-Mate: it's an acquired taste." icon_state = "hakka_mate_bottle" list_reagents = list(/datum/reagent/consumable/hakka_mate = 30) /obj/item/reagent_containers/cup/glass/bottle/shochu - name = "Shu-Kouba Straight Shochu" + name = "\improper Shu-Kouba Straight Shochu" desc = "A boozier form of shochu designed for mixing. Comes straight from Mars' Dusty City itself, Shu-Kouba." icon_state = "shochu_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/shochu = 100) /obj/item/reagent_containers/cup/glass/bottle/yuyake - name = "Moonlabor Yūyake" + name = "\improper Moonlabor Yūyake" desc = "The distilled essence of disco and flared pants, captured like lightning in a bottle." icon_state = "yuyake_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/yuyake = 100) /obj/item/reagent_containers/cup/glass/bottle/coconut_rum - name = "Breezy Shoals Coconut Rum" + name = "\improper Breezy Shoals Coconut Rum" desc = "Live the breezy life with Breezy Shoals, made with only the *finest Caribbean rum." icon_state = "coconut_rum_bottle" list_reagents = list(/datum/reagent/consumable/ethanol/coconut_rum = 100) @@ -873,6 +880,7 @@ desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss." icon_state = "vodkabottle" list_reagents = list() + preset_article = "" var/active = FALSE var/list/accelerants = list( /datum/reagent/consumable/ethanol, @@ -950,6 +958,8 @@ icon = 'icons/obj/service/janitor.dmi' icon_state = "trashbag" list_reagents = list(/datum/reagent/consumable/prunomix = 50) + preset_article = "" + gender = PLURAL var/fermentation_time = 30 SECONDS /// time it takes to ferment var/fermentation_time_remaining /// for partial fermentation var/fermentation_timer /// store the timer id of fermentation @@ -994,6 +1004,7 @@ name = "bag of pruno" desc = "Fermented prison wine made from fruit, sugar, and despair. You probably shouldn't drink this around Security." icon_state = "trashbag1" // pruno releases air as it ferments, we don't want to simulate this in atmos, but we can make it look like it did + gender = NEUTER for (var/mob/living/M in view(2, get_turf(src))) // letting people and/or narcs know when the pruno is done if(M.can_smell()) to_chat(M, span_info("A pungent smell emanates from [src], like fruit puking out its guts.")) @@ -1011,6 +1022,7 @@ righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' isGlass = FALSE age_restricted = FALSE + preset_article = "a carton of" /obj/item/reagent_containers/cup/glass/bottle/juice/orangejuice name = "orange juice" diff --git a/code/modules/reagents/reagent_containers/cups/soda.dm b/code/modules/reagents/reagent_containers/cups/soda.dm index 8a134317f845..0f1e2234deec 100644 --- a/code/modules/reagents/reagent_containers/cups/soda.dm +++ b/code/modules/reagents/reagent_containers/cups/soda.dm @@ -28,6 +28,8 @@ . = ..() AddElement(/datum/element/slapcrafting, string_list(list(/datum/crafting_recipe/improv_explosive))) AddElement(/datum/element/atmos_sensitive, mapload) //Enables soda cans to explode in vaccuum. + if(length(list_reagents)) + article = "a can of" /obj/item/reagent_containers/cup/soda_cans/random/Initialize(mapload) ..() @@ -181,14 +183,14 @@ #undef SODA_EXPLOSION_PRESSURE /obj/item/reagent_containers/cup/soda_cans/cola - name = "Space Cola" + name = "\improper Space Cola" desc = "Cola. in space." icon_state = "cola" list_reagents = list(/datum/reagent/consumable/space_cola = 30) drink_type = SUGAR /obj/item/reagent_containers/cup/soda_cans/tonic - name = "T-Borg's tonic water" + name = "\improper T-Borg's tonic water" desc = "Quinine tastes funny, but at least it'll keep that Space Malaria away." icon_state = "tonic" volume = 50 @@ -214,62 +216,62 @@ name = "lemon-lime soda" /obj/item/reagent_containers/cup/soda_cans/sol_dry - name = "Sol Dry" + name = "\improper Sol Dry" desc = "Maybe this will help your tummy feel better. Maybe not." icon_state = "sol_dry" list_reagents = list(/datum/reagent/consumable/sol_dry = 30) drink_type = SUGAR /obj/item/reagent_containers/cup/soda_cans/space_up - name = "Space-Up!" + name = "\improper Space-Up!" desc = "Tastes like a hull breach in your mouth." icon_state = "space-up" list_reagents = list(/datum/reagent/consumable/space_up = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/starkist - name = "Star-kist" + name = "\improper Star-kist" desc = "The taste of a star in liquid form. And, a bit of tuna...?" icon_state = "starkist" list_reagents = list(/datum/reagent/consumable/space_cola = 15, /datum/reagent/consumable/orangejuice = 15) drink_type = SUGAR | FRUIT | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/space_mountain_wind - name = "Space Mountain Wind" + name = "\improper Space Mountain Wind" desc = "Blows right through you like a space wind." icon_state = "space_mountain_wind" list_reagents = list(/datum/reagent/consumable/spacemountainwind = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/thirteenloko - name = "Thirteen Loko" + name = "\improper Thirteen Loko" desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkenness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" list_reagents = list(/datum/reagent/consumable/ethanol/thirteenloko = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/dr_gibb - name = "Dr. Gibb" + name = "\improper Dr. Gibb" desc = "A delicious mixture of 42 different flavors." icon_state = "dr_gibb" list_reagents = list(/datum/reagent/consumable/dr_gibb = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/pwr_game - name = "Pwr Game" + name = "\improper Pwr Game" desc = "The only drink with the PWR that true gamers crave. When a gamer talks about gamerfuel, this is what they're literally referring to." icon_state = "purple_can" list_reagents = list(/datum/reagent/consumable/pwr_game = 30) /obj/item/reagent_containers/cup/soda_cans/shamblers - name = "Shambler's juice" + name = "\improper Shambler's juice" desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers" list_reagents = list(/datum/reagent/consumable/shamblers = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/shamblers/eldritch - name = "Shambler's juice Eldritch Energy!" + name = "\improper Shambler's juice Eldritch Energy!" desc = "~J'I'CE!~" icon_state = "shamblerseldritch" volume = 40 @@ -277,21 +279,21 @@ drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/wellcheers - name = "Wellcheers Juice" + name = "\improper Wellcheers Juice" desc = "A strange purple drink, smelling of saltwater. Somewhere in the distance, you hear seagulls." icon_state = "wellcheers" list_reagents = list(/datum/reagent/consumable/wellcheers = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/grey_bull - name = "Grey Bull" + name = "\improper Grey Bull" desc = "Grey Bull, it gives you gloves!" icon_state = "energy_drink" list_reagents = list(/datum/reagent/consumable/grey_bull = 20) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/monkey_energy - name = "Monkey Energy" + name = "\improper Monkey Energy" desc = "Unleash the ape!" icon_state = "monkey_energy" inhand_icon_state = "monkey_energy" @@ -300,14 +302,14 @@ drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/volt_energy - name = "24-Volt Energy" + name = "\improper 24-Volt Energy" desc = "Recharge, with 24-Volt Energy!" icon_state = "volt_energy" list_reagents = list(/datum/reagent/consumable/volt_energy = 30) drink_type = SUGAR | JUNKFOOD /obj/item/reagent_containers/cup/soda_cans/melon_soda - name = "Kansumi Melon Soda" + name = "\improper Kansumi Melon Soda" desc = "Japan's favourite melon soda, now available in can form!" icon_state = "melon_soda" list_reagents = list(/datum/reagent/consumable/melon_soda = 30) diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 16da1d229eb1..b37dac9ceda4 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -550,16 +550,6 @@ ) departmental_flags = DEPARTMENT_BITFLAG_SERVICE -/datum/design/board/microwave_engineering - name = "Wireless Microwave Board" - desc = "The circuit board for a cell-powered microwave." - id = "microwave_engineering" - build_path = /obj/item/circuitboard/machine/microwave/engineering - category = list( - RND_CATEGORY_MACHINE + RND_SUBCATEGORY_MACHINE_KITCHEN - ) - departmental_flags = DEPARTMENT_BITFLAG_SERVICE | DEPARTMENT_BITFLAG_ENGINEERING - /datum/design/board/gibber name = "Gibber Board" desc = "The circuit board for a gibber." diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 38a01c648f8c..303f7be93570 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -17,7 +17,7 @@ Nothing else in the console has ID requirements. */ /obj/machinery/computer/rdconsole - name = "R&D Console" + name = "\improper R&D Console" desc = "A console used to interface with R&D tools." icon_screen = "rdcomp" icon_keyboard = "rd_key" diff --git a/code/modules/research/techweb/nodes/service_nodes.dm b/code/modules/research/techweb/nodes/service_nodes.dm index 6d5f5a434970..10ee51e2d967 100644 --- a/code/modules/research/techweb/nodes/service_nodes.dm +++ b/code/modules/research/techweb/nodes/service_nodes.dm @@ -153,7 +153,6 @@ "gibber", "monkey_recycler", "reagentgrinder", - "microwave_engineering", "smartfridge", "sheetifier", "fat_sucker", diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm index c7986e8cfae9..bc48b9cb0460 100644 --- a/code/modules/vending/games.dm +++ b/code/modules/vending/games.dm @@ -63,7 +63,6 @@ "name" = "Skillchips", "icon" = "floppy-disk", "products" = list( - /obj/item/skillchip/appraiser = 2, /obj/item/skillchip/basketweaving = 2, /obj/item/skillchip/bonsai = 2, /obj/item/skillchip/intj = 2, diff --git a/maplestation.dme b/maplestation.dme index 65fa8cacbaa4..28f4cb27dad5 100644 --- a/maplestation.dme +++ b/maplestation.dme @@ -6418,6 +6418,7 @@ #include "maplestation_modules\code\game\objects\items\tcg\tdatet.dm" #include "maplestation_modules\code\game\objects\spawners\cycle_helper.dm" #include "maplestation_modules\code\game\objects\spawners\random\contraband.dm" +#include "maplestation_modules\code\game\objects\structures\cabinet.dm" #include "maplestation_modules\code\game\objects\structures\item_dispensers.dm" #include "maplestation_modules\code\game\objects\structures\pass_id_panel.dm" #include "maplestation_modules\code\game\objects\structures\stasis.dm" diff --git a/maplestation_modules/code/game/objects/structures/cabinet.dm b/maplestation_modules/code/game/objects/structures/cabinet.dm new file mode 100644 index 000000000000..db2a085e7e94 --- /dev/null +++ b/maplestation_modules/code/game/objects/structures/cabinet.dm @@ -0,0 +1,61 @@ +/obj/item/wallframe/fireaxecabinet/jaws_of_life + name = "hydraulic rescue tool cabinet" + desc = "Holds the jaws of life, ready to snatch life from the jaws of death." + result_path = /obj/structure/fireaxecabinet/jaws_of_life/empty + icon = 'maplestation_modules/icons/obj/cabinet.dmi' + +/obj/structure/fireaxecabinet/jaws_of_life + name = "hydraulic rescue tool cabinet" + desc = "There is a small label that reads \"For Emergency use only\" along with details for safe use of the tool. As if." + item_path = /obj/item/crowbar/power + item_overlay = "jaws" + icon = 'maplestation_modules/icons/obj/cabinet.dmi' + /// tracks if the lock was forced open intead of opening via security level + var/lock_was_forced = FALSE + +/obj/structure/fireaxecabinet/jaws_of_life/examine(mob/user) + . = ..() + if(SSsecurity_level.get_current_level_as_number() <= SEC_LEVEL_GREEN) + . += span_notice("It has a locking mechanism preventing the handle from opening outside of emergencies. \ + Of course, this won't stop the determined.") + else + . += span_notice("Due to a security situation, its locking mechanism has been disabled.") + +/obj/structure/fireaxecabinet/jaws_of_life/Initialize(mapload) + . = ..() + RegisterSignal(SSsecurity_level, COMSIG_SECURITY_LEVEL_CHANGED, PROC_REF(check_security_level)) + +/obj/structure/fireaxecabinet/jaws_of_life/toggle_lock(mob/user) + . = ..() + lock_was_forced = !locked + +/obj/structure/fireaxecabinet/jaws_of_life/proc/check_security_level(datum/source, new_level) + SIGNAL_HANDLER + + // level is being lowered + if(new_level <= SEC_LEVEL_GREEN) + // only re-lock if the lock was not forced open in the first place + if(!locked && !lock_was_forced) + locked = TRUE + update_appearance() + return + + // level is being raised + if(!locked) + return + + playsound(src, 'sound/machines/locktoggle.ogg', 50, TRUE) + locked = FALSE + update_appearance() + +/obj/structure/fireaxecabinet/jaws_of_life/atom_deconstruct(disassembled = TRUE) + if(held_item && loc) + held_item.forceMove(loc) + new /obj/item/wallframe/fireaxecabinet/jaws_of_life(loc) + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/jaws_of_life, 32) + +/obj/structure/fireaxecabinet/jaws_of_life/empty + populate_contents = FALSE + +MAPPING_DIRECTIONAL_HELPERS(/obj/structure/fireaxecabinet/jaws_of_life/empty, 32) diff --git a/maplestation_modules/icons/obj/cabinet.dmi b/maplestation_modules/icons/obj/cabinet.dmi new file mode 100644 index 000000000000..e2801f3e7efc Binary files /dev/null and b/maplestation_modules/icons/obj/cabinet.dmi differ