From e7bd1c0e0280ec7224e301ea131f06580123b0ec Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Sun, 7 Sep 2025 05:06:29 -0500 Subject: [PATCH] [MDB Ignore] Replaces MOST Emergency NanoMed vendors with new First Aid Stations. (Also reverts advanced medkits in bridge and buffs back nanomeds) (#92677) ## About The Pull Request ### Main changes Across all station maps, emergency shuttles, and arrivals shuttles, the Emergency NanoMeds (wall mounted medical supply vendors) have been replcaed with Deforest First Aid Stations. image Deforest First Aid Station have an internal supply of healing which recharges slowly over time (1/10th of the pool is recharged every 30 seconds). To access this healing, users must insert their arm into the machine with left click. (Or you can mouse drop other people into it.) Once their arm is in place, some of the internal supply will be used up to heal the user. The internal supply can heal brute, burn, tox, and blood loss. This is straight, instant healing - so it doesn't trigger allergies or nothing. However, if you insert a robotic arm, it will refuse to heal you. Users are charged every time healing is dispensed - 2.5 credits per unit of damage healed. Payments go to the medical budget, same as kiosks. You can also right click the machine to dispense gauze for 16 credits. On **red alert** (or for medical staff, or on emergency shuttles), all charges are waived. (It's free) Also you can emag it so it causes damage instead. Funny. ### Other changes: Buffs the contents of emergency nanomeds Reverts bridge advanced medkits to normal medkits ## Why It's Good For The Game Wall vending changes: People want options to heal chip damage beyond visiting the bar but we also don't really want people to load up on boat loads of medical supplies. So here we are: A machine fully capable of healing minor injuries that you can carry along with you. If you're missing like 4-6 brute or toxin damage, you can visit a first aid station and pay 15 credits to top yourself off. This is of course on top of all the other options available to you, such as getting a hearty meal, some variety of drink from the bar, sleeping in dorms, water coolers, etc. The limited pool + cost requirement prevents you from going 0-100, so you still have to go to medbay if you are severely wounded or your ID was stolen. Nanomed changes: Now that they are considerably less common once again, they can have a decent stock. Advanced medkit changes: I don't really see the justification behind handing these out so freely, and given the medical stations will have adequate extra healing for the command staff, they don't need these. ## Changelog :cl: Melber balance: Advanced first aid kits in the bridge are back to being normal first aid kids balance: Emergency Nanomed vendors have larger stocks and better supplies add: Replaces a majority of Emergency Nanomeds on stations and shuttles with Deforest First Aid Stations. Left clicking these stationary machines will heal minor damage and blood loss over time - at a (small) price. Right clicking them will provide gauze, also for a price. All costs are waived on shuttles, during red alert, or for medical staff. You can also click-drag to have other mobs use the machine. However, robotic limbs need not apply. /:cl: --- .../CatwalkStation/CatwalkStation_2023.dmm | 1412 ++++++++--------- .../map_files/Deltastation/DeltaStation2.dmm | 603 +++---- .../map_files/IceBoxStation/IceBoxStation.dmm | 341 ++-- _maps/map_files/MetaStation/MetaStation.dmm | 381 ++--- _maps/map_files/Mining/Lavaland.dmm | 30 +- .../map_files/NebulaStation/NebulaStation.dmm | 516 +++--- _maps/map_files/debug/gateway_test.dmm | 2 +- _maps/map_files/generic/CentCom.dmm | 146 +- _maps/map_files/tramstation/tramstation.dmm | 1237 +++++++-------- _maps/map_files/wawastation/wawastation.dmm | 318 ++-- _maps/minigame/deathmatch/maint_mania.dmm | 2 +- _maps/shuttles/arrival_catwalk.dmm | 2 +- _maps/shuttles/arrival_delta.dmm | 2 +- _maps/shuttles/arrival_kilo.dmm | 2 +- _maps/shuttles/emergency_asteroid.dmm | 4 +- _maps/shuttles/emergency_bar.dmm | 2 +- _maps/shuttles/emergency_bballhooper.dmm | 2 +- _maps/shuttles/emergency_birdboat.dmm | 2 +- _maps/shuttles/emergency_box.dmm | 2 +- _maps/shuttles/emergency_casino.dmm | 8 +- _maps/shuttles/emergency_catwalk.dmm | 4 +- _maps/shuttles/emergency_cere.dmm | 2 +- _maps/shuttles/emergency_clown.dmm | 2 +- _maps/shuttles/emergency_cruise.dmm | 6 +- _maps/shuttles/emergency_delta.dmm | 2 +- _maps/shuttles/emergency_donut.dmm | 4 +- _maps/shuttles/emergency_fish.dmm | 12 +- _maps/shuttles/emergency_goon.dmm | 6 +- _maps/shuttles/emergency_humpback.dmm | 4 +- _maps/shuttles/emergency_kilo.dmm | 4 +- _maps/shuttles/emergency_lance.dmm | 6 +- _maps/shuttles/emergency_luxury.dmm | 8 +- _maps/shuttles/emergency_meta.dmm | 4 +- _maps/shuttles/emergency_mini.dmm | 4 +- _maps/shuttles/emergency_nebula.dmm | 2 +- _maps/shuttles/emergency_northstar.dmm | 4 +- _maps/shuttles/emergency_omega.dmm | 6 +- _maps/shuttles/emergency_pubby.dmm | 2 +- .../emergency_scrapheap/classic_aft3.dmm | 2 +- _maps/shuttles/emergency_shadow.dmm | 4 +- _maps/shuttles/emergency_tram.dmm | 4 +- _maps/shuttles/emergency_tranquility.dmm | 6 +- _maps/shuttles/emergency_venture.dmm | 8 +- _maps/shuttles/emergency_wawa.dmm | 2 +- _maps/virtual_domains/meta_central.dmm | 66 +- code/datums/components/payment.dm | 2 +- code/game/machinery/wall_healer.dm | 566 +++++++ code/modules/vending/medical_wall.dm | 15 +- icons/obj/machines/wall_healer.dmi | Bin 0 -> 1010 bytes tgstation.dme | 1 + 50 files changed, 3180 insertions(+), 2592 deletions(-) create mode 100644 code/game/machinery/wall_healer.dm create mode 100644 icons/obj/machines/wall_healer.dmi diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 9cae1477c0f..df89defdb38 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -761,13 +761,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/warden) -"amk" = ( -/obj/item/radio/intercom/directional/south, -/obj/structure/closet/crate/trashcart/laundry, -/obj/effect/spawner/random/clothing/costume, -/obj/effect/spawner/random/clothing/backpack, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "ams" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/siding/blue/corner{ @@ -2605,6 +2598,13 @@ }, /turf/open/floor/glass, /area/station/service/kitchen) +"aQx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "aQz" = ( /obj/structure/table, /turf/open/floor/iron/dark/textured, @@ -2686,6 +2686,9 @@ }, /turf/open/openspace, /area/station/command/gateway) +"aSW" = ( +/turf/closed/wall, +/area/station/service/hydroponics/garden/abandoned) "aSX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -2756,6 +2759,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"aUe" = ( +/obj/item/tank/internals/plasma/empty, +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "aUl" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -2873,17 +2887,6 @@ }, /turf/open/floor/wood, /area/station/maintenance/starboard/central) -"aVv" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "aVy" = ( /obj/structure/sign/directions/security/directional/north{ dir = 2; @@ -2902,6 +2905,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) +"aVL" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/north, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","medbay"); + c_tag = "Medbay - Lobby" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "aVN" = ( /turf/closed/wall, /area/station/command/teleporter) @@ -4621,6 +4639,10 @@ }, /turf/open/floor/iron, /area/station/science/research) +"bvY" = ( +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/wood, +/area/station/ai_monitored/command/storage/eva) "bvZ" = ( /obj/structure/railing{ dir = 8 @@ -5197,6 +5219,13 @@ /obj/structure/cable, /turf/open/floor/iron/textured_large, /area/station/security/prison/rec) +"bEJ" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "bES" = ( /obj/effect/turf_decal/siding/blue{ dir = 1 @@ -6811,6 +6840,15 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/disposal) +"caQ" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 9 + }, +/obj/machinery/autolathe, +/obj/structure/sign/poster/official/do_not_question/directional/north, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "caS" = ( /obj/structure/railing, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -7412,6 +7450,10 @@ }, /turf/open/floor/wood/large, /area/station/service/kitchen) +"ckE" = ( +/obj/machinery/hydroponics/soil, +/turf/open/misc/sandy_dirt, +/area/station/service/hydroponics/garden/abandoned) "ckG" = ( /obj/structure/table, /obj/item/clothing/glasses/sunglasses/big{ @@ -8393,10 +8435,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_recreation) -"cyY" = ( -/obj/machinery/hydroponics/soil, -/turf/open/misc/sandy_dirt, -/area/station/service/hydroponics/garden/abandoned) "czk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -8508,11 +8546,6 @@ /obj/machinery/light/directional, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) -"cAs" = ( -/obj/structure/disposalpipe/segment, -/obj/item/banner/command/mundane, -/turf/open/floor/plating, -/area/station/maintenance/port) "cAv" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 1 @@ -9224,30 +9257,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port) -"cJi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/item/cultivator, -/obj/item/reagent_containers/cup/bottle/nutrient/rh{ - pixel_x = 10; - pixel_y = 6 - }, -/obj/item/reagent_containers/cup/bottle/nutrient/ez{ - pixel_x = 10; - pixel_y = -4 - }, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 - }, -/obj/item/reagent_containers/spray/pestspray{ - pixel_x = 10; - pixel_y = -14 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "cJk" = ( /obj/effect/turf_decal/trimline/dark_blue/filled/shrink_cw, /obj/effect/turf_decal/trimline/dark_blue/filled/mid_joiner, @@ -10449,6 +10458,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"ddx" = ( +/obj/structure/disposalpipe/segment, +/obj/item/banner/command/mundane, +/turf/open/floor/plating, +/area/station/maintenance/port) "ddz" = ( /obj/effect/turf_decal/siding/white, /obj/item/kirbyplants/organic/plant21{ @@ -12425,13 +12439,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/service/cafeteria) -"dJx" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/washing_machine, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "dJB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/machinery/door/poddoor/shutters/preopen{ @@ -12583,6 +12590,14 @@ }, /turf/open/floor/iron/textured, /area/station/cargo/storage) +"dLb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "dLl" = ( /obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, @@ -12653,14 +12668,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating/airless, /area/station/maintenance/starboard/lesser) -"dMK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/structure/frame/machine/secured, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "dMM" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -12846,13 +12853,6 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"dOC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "dOG" = ( /obj/structure/cable, /turf/closed/wall/r_wall, @@ -12975,13 +12975,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/science/robotics) -"dRo" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/effect/landmark/generic_maintenance_landmark, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "dRU" = ( /obj/structure/table/wood, /obj/effect/spawner/random/maintenance, @@ -13675,6 +13668,14 @@ "eap" = ( /turf/closed/wall, /area/station/hallway/secondary/entry) +"eas" = ( +/obj/machinery/wall_healer/directional/east, +/obj/machinery/camera/autoname/directional/east, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "eaw" = ( /obj/effect/turf_decal/siding/brown, /obj/effect/turf_decal/siding/brown/corner{ @@ -13973,6 +13974,13 @@ /obj/effect/landmark/start/depsec/science, /turf/open/openspace, /area/station/security/checkpoint/science) +"eet" = ( +/obj/structure/chair{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit/departure_lounge) "eeA" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -14712,14 +14720,6 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/ai_monitored/turret_protected/aisat_interior) -"epX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/structure/cable, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/medical) "epY" = ( /obj/structure/plaque/static_plaque/golden/commission/efficiency{ pixel_y = 32 @@ -14782,6 +14782,14 @@ }, /turf/open/floor/engine/hull/air, /area/station/maintenance/port/aft) +"eqU" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "eqV" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/turf_decal/bot, @@ -14874,14 +14882,6 @@ }, /turf/open/openspace, /area/station/service/library) -"erQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "esb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -14982,19 +14982,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/detectives_office/private_investigators_office) -"euA" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/closet/crate/hydroponics, -/obj/effect/spawner/random/food_or_drink/plant_produce, -/obj/effect/spawner/random/food_or_drink/seed_flowers, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "euD" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -15940,12 +15927,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) -"eLk" = ( -/obj/structure/table, -/obj/machinery/firealarm/directional/west, -/obj/effect/spawner/random/clothing/gloves, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "eLl" = ( /obj/machinery/door/airlock/command{ name = "Captain's Office" @@ -16049,10 +16030,6 @@ /obj/item/airlock_painter, /turf/open/floor/iron/smooth, /area/station/engineering/main) -"eNm" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "eNx" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ dir = 4 @@ -17615,6 +17592,10 @@ /obj/effect/spawner/random/structure/crate_loot, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"flo" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "flD" = ( /obj/effect/turf_decal/tile/red/opposingcorners, /turf/open/floor/iron/dark, @@ -17803,14 +17784,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/department/science/central) -"foP" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "foR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -17903,6 +17876,12 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/space_hut) +"fpM" = ( +/obj/structure/table, +/obj/machinery/firealarm/directional/west, +/obj/effect/spawner/random/clothing/gloves, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "fpN" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 1 @@ -18433,9 +18412,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"fxX" = ( -/turf/closed/wall, -/area/station/service/hydroponics/garden/abandoned) "fxY" = ( /obj/machinery/vending/cigarette, /obj/structure/disposalpipe/segment{ @@ -19382,6 +19358,13 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) +"fMC" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/effect/spawner/random/maintenance, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "fMS" = ( /obj/effect/turf_decal/siding/dark/inner_corner{ dir = 8 @@ -20103,6 +20086,14 @@ }, /turf/open/floor/plating, /area/station/service/kitchen/abandoned) +"fWc" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/spawner/random/clothing/backpack, +/turf/open/floor/iron, +/area/station/commons/dorms) "fWt" = ( /obj/effect/turf_decal/trimline/yellow/arrow_ccw{ dir = 4 @@ -20482,12 +20473,6 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/commons/storage/primary) -"gbv" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/structure/sign/poster/official/work_for_a_future/directional/south, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/science/research) "gby" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21029,6 +21014,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/bridge) +"giM" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) "giT" = ( /obj/machinery/camera/autoname/directional/south, /turf/open/floor/glass, @@ -22178,16 +22170,6 @@ /obj/structure/table/wood, /turf/open/floor/wood, /area/station/command/heads_quarters/cmo) -"gBc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "gBf" = ( /obj/structure/lattice/catwalk, /obj/item/stack/rods, @@ -22414,14 +22396,6 @@ }, /turf/open/floor/carpet, /area/station/maintenance/starboard/lesser) -"gEJ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "gEN" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -22431,6 +22405,17 @@ }, /turf/open/floor/engine/hull/reinforced/air, /area/station/ai_monitored/turret_protected/ai) +"gFa" = ( +/obj/structure/table/reinforced, +/obj/item/plant_analyzer, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "gFi" = ( /obj/structure/closet/secure_closet/research_director, /obj/item/clothing/head/soft/purple, @@ -22441,6 +22426,12 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark, /area/station/hallway/secondary/entry) +"gFm" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/closed/wall, +/area/station/service/hydroponics/garden/abandoned) "gFo" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 9 @@ -22905,19 +22896,6 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/space/openspace, /area/space/nearstation) -"gMZ" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 4 - }, -/obj/item/stamp/head/hop{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/structure/cable, -/turf/open/floor/carpet, -/area/station/command/heads_quarters/hop) "gNf" = ( /obj/structure/light_construct/directional/east, /obj/effect/mapping_helpers/broken_floor, @@ -23061,19 +23039,6 @@ /obj/machinery/drone_dispenser, /turf/open/floor/iron/dark/smooth_large, /area/station/science/lab) -"gPh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 6 - }, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/storage/bag/plants, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "gPu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23356,6 +23321,18 @@ /obj/effect/spawner/random/maintenance/no_decals, /turf/open/floor/engine/hull, /area/space/nearstation) +"gSS" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/directions/engineering/directional/south, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "gSX" = ( /obj/machinery/plumbing/sender, /obj/effect/decal/cleanable/dirt, @@ -23387,6 +23364,14 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/medical/medbay/central) +"gTH" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/mug{ + pixel_x = -3; + pixel_y = 4 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "gTL" = ( /obj/machinery/door/airlock/public/glass{ name = "Circle Center" @@ -23449,13 +23434,6 @@ /obj/structure/cable, /turf/open/floor/carpet, /area/station/command/corporate_showroom) -"gUR" = ( -/obj/structure/chair{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit/departure_lounge) "gVi" = ( /obj/structure/window/spawner/directional/west, /turf/open/floor/plating, @@ -24065,6 +24043,15 @@ /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/engine/hull, /area/space/nearstation) +"heb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/banner/blue{ + inspiration_available = 0 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/eighties, +/area/station/maintenance/hallway/abandoned_recreation) "hei" = ( /obj/structure/chair{ dir = 8 @@ -24339,6 +24326,16 @@ }, /turf/open/floor/wood, /area/station/commons/dorms) +"hip" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/aft) "hiu" = ( /obj/effect/spawner/random/trash/mess, /turf/open/floor/engine/hull/air, @@ -25558,15 +25555,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/central) -"hBj" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 9 - }, -/obj/machinery/autolathe, -/obj/structure/sign/poster/official/do_not_question/directional/north, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/cargo/storage) "hBu" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{ @@ -26350,6 +26338,13 @@ dir = 4 }, /area/station/tcommsat/server) +"hLN" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/service/hydroponics/garden/abandoned) "hLT" = ( /obj/docking_port/stationary/escape_pod{ dir = 8 @@ -26964,15 +26959,6 @@ }, /turf/open/floor/plating, /area/station/construction/storage_wing) -"hTF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/obj/item/vending_refill/hydroseeds, -/obj/structure/frame/machine/secured, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "hTI" = ( /obj/machinery/light/directional/south, /obj/effect/landmark/firealarm_sanity, @@ -27136,6 +27122,17 @@ dir = 1 }, /area/station/ai_monitored/turret_protected/aisat/foyer) +"hWU" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "hXc" = ( /obj/effect/turf_decal/plaque{ icon_state = "L3" @@ -27751,14 +27748,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/iron/dark/textured_large, /area/station/medical/virology) -"ihn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction) "ihv" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/siding/wood{ @@ -27836,16 +27825,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/eighties, /area/station/maintenance/hallway/abandoned_recreation) -"iiT" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/machinery/space_heater, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "iiV" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/random/entertainment/cigarette_pack, @@ -27861,14 +27840,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/textured_large, /area/station/medical/virology) -"iji" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/mug{ - pixel_x = -3; - pixel_y = 4 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "ijl" = ( /obj/structure/cable, /obj/item/restraints/legcuffs/beartrap/prearmed{ @@ -28573,12 +28544,6 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"itU" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/closed/wall, -/area/station/service/hydroponics/garden/abandoned) "itV" = ( /obj/item/stack/sheet/mineral/wood{ pixel_x = -5; @@ -29578,6 +29543,19 @@ dir = 4 }, /area/station/hallway/primary/fore) +"iIs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/biogenerator, +/obj/effect/turf_decal/trimline/green/filled/line, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "iIu" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating/airless, @@ -30674,13 +30652,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"iZD" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "iZI" = ( /obj/machinery/computer/bank_machine, /obj/machinery/light_switch/directional/west{ @@ -31571,24 +31542,6 @@ /obj/effect/spawner/random/trash/garbage, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"jmG" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/button/door/directional/north{ - id = "hydropony_shutters"; - name = "hydroponics shutters control"; - pixel_x = 10; - pixel_y = 30; - req_access = list("hydroponics") - }, -/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/north, -/obj/structure/sink/directional/south, -/turf/open/floor/iron/dark/smooth_large, -/area/station/service/hydroponics) "jmQ" = ( /obj/effect/spawner/random/trash/grime, /turf/open/floor/plating, @@ -32403,10 +32356,6 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central) -"jyf" = ( -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/wood, -/area/station/hallway/secondary/service) "jyl" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/railing, @@ -32505,17 +32454,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/commons/dorms) -"jyZ" = ( -/obj/item/tank/internals/plasma/empty, -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "jzi" = ( /obj/effect/landmark/start/hangover, /turf/open/floor/wood, @@ -32872,6 +32810,11 @@ }, /turf/open/openspace, /area/station/maintenance/starboard/lesser) +"jDr" = ( +/obj/item/radio/intercom/directional/north, +/obj/effect/spawner/random/clothing/wardrobe_closet_colored, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "jDx" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -33297,6 +33240,12 @@ }, /turf/open/floor/iron/white/smooth_large, /area/station/ai_monitored/turret_protected/aisat_interior) +"jJZ" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "jKe" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, @@ -33631,11 +33580,6 @@ /obj/structure/window/reinforced/tinted/frosted/spawner/directional/west, /turf/open/floor/wood/large, /area/station/service/library) -"jPB" = ( -/obj/effect/turf_decal/tile/purple/opposingcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/aft) "jPC" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -34333,14 +34277,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/storage) -"kbi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/seed_extractor, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "kbj" = ( /obj/structure/closet/emcloset, /obj/effect/decal/cleanable/dirt, @@ -34580,6 +34516,13 @@ /obj/effect/turf_decal/siding/white/corner, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/primary/central) +"kew" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on, +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "key" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -34897,11 +34840,6 @@ /obj/structure/sign/poster/ripped/directional/north, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"kjl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/construction) "kjF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/junction/yjunction{ @@ -35409,6 +35347,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/security/courtroom) +"kpE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/seed_extractor, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "kpJ" = ( /obj/structure/lattice/catwalk, /obj/machinery/power/tracker, @@ -36427,10 +36373,6 @@ dir = 8 }, /area/station/tcommsat/server) -"kEn" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/turf/open/floor/plating, -/area/station/service/hydroponics/garden/abandoned) "kEw" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -37589,6 +37531,14 @@ /obj/machinery/suit_storage_unit/engine, /turf/open/floor/iron/dark, /area/station/engineering/storage) +"kYT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "kYU" = ( /obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, @@ -38808,16 +38758,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"luD" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/maintenance/starboard/aft) "luI" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -41108,18 +41048,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"mcs" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/sign/directions/engineering/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "mcB" = ( /obj/structure/table/wood, /obj/item/food/grown/poppy{ @@ -41187,13 +41115,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/textured, /area/station/cargo/warehouse) -"mdn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/banner/red{ - inspiration_available = 0 - }, -/turf/open/floor/eighties, -/area/station/maintenance/hallway/abandoned_recreation) "mdp" = ( /obj/structure/closet, /obj/effect/turf_decal/tile/purple/opposingcorners, @@ -41643,6 +41564,14 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"mju" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction) "mjB" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -41656,6 +41585,13 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating/airless, /area/station/maintenance/port/aft) +"mkd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/banner/red{ + inspiration_available = 0 + }, +/turf/open/floor/eighties, +/area/station/maintenance/hallway/abandoned_recreation) "mke" = ( /obj/structure/table, /obj/item/binoculars, @@ -41666,6 +41602,13 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/glass, /area/station/commons/fitness/recreation) +"mkv" = ( +/obj/structure/table, +/obj/structure/bedsheetbin/empty{ + pixel_y = 6 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "mkI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42344,6 +42287,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/textured_large, /area/station/security/prison/rec) +"muC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock{ + name = "Garden" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "muF" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/autoname/directional/north, @@ -44309,10 +44266,6 @@ /obj/structure/railing, /turf/open/openspace, /area/station/engineering/atmos/upper) -"nck" = ( -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/large, -/area/station/hallway/primary/central) "nct" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44633,15 +44586,6 @@ /obj/effect/mapping_helpers/mail_sorting/service/law_office, /turf/open/floor/iron/large, /area/station/hallway/primary/central) -"nhD" = ( -/obj/structure/table/glass, -/obj/machinery/vending/wallmed/directional/west, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "nhE" = ( /obj/structure/sign/poster/contraband/communist_state/directional/north, /obj/effect/decal/cleanable/crayon{ @@ -44854,6 +44798,13 @@ /obj/machinery/light/directional/east, /turf/open/floor/iron/large, /area/station/hallway/primary/central) +"nkZ" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/effect/landmark/generic_maintenance_landmark, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "nld" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -45858,6 +45809,13 @@ /obj/effect/spawner/random/clothing/funny_hats, /turf/open/floor/plating, /area/station/maintenance/port) +"nym" = ( +/obj/structure/table, +/obj/effect/spawner/random/bureaucracy/paper, +/obj/item/pen, +/obj/structure/sign/poster/contraband/missing_gloves/directional/west, +/turf/open/floor/wood, +/area/station/commons/dorms) "nyw" = ( /obj/machinery/light/small/directional/east, /obj/machinery/air_sensor/nitrous_tank, @@ -46199,6 +46157,12 @@ /obj/effect/mapping_helpers/mail_sorting/science/research, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"nCC" = ( +/obj/machinery/light/directional/north, +/obj/machinery/light_switch/directional/north, +/obj/structure/closet/wardrobe/white, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "nCI" = ( /obj/machinery/component_printer, /obj/effect/turf_decal/bot_white, @@ -47815,13 +47779,6 @@ }, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"oai" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "oaj" = ( /turf/closed/wall, /area/station/security/medical) @@ -47989,6 +47946,15 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/brig) +"ocT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/sink/kitchen/directional/east, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "odd" = ( /obj/structure/railing{ dir = 1 @@ -49690,12 +49656,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"oEA" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "oEI" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/mug/britcup{ @@ -49850,10 +49810,8 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/office) -"oHh" = ( -/obj/machinery/light/directional/north, -/obj/machinery/light_switch/directional/north, -/obj/structure/closet/wardrobe/white, +"oHs" = ( +/obj/structure/closet/wardrobe/grey, /turf/open/floor/iron/cafeteria, /area/station/commons/locker) "oHu" = ( @@ -50969,13 +50927,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/openspace, /area/station/maintenance/port/aft) -"oXS" = ( -/obj/effect/spawner/structure/window/reinforced/tinted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/service/hydroponics/garden/abandoned) "oXT" = ( /obj/effect/turf_decal/stripes/asteroid/corner{ dir = 8 @@ -53765,6 +53716,13 @@ }, /turf/open/floor/iron/textured_large, /area/station/medical/virology) +"pOF" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/clothing/suit/hooded/wintercoat, +/obj/item/clothing/shoes/winterboots, +/obj/effect/spawner/random/clothing/backpack, +/turf/open/floor/iron, +/area/station/commons/dorms) "pOM" = ( /obj/structure/railing{ dir = 1 @@ -53987,6 +53945,10 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/ce) +"pQh" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/service/hydroponics/garden/abandoned) "pQq" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/brown/filled/line{ @@ -54217,15 +54179,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/security/brig) -"pST" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/soda_cans/cola{ - pixel_x = -4; - pixel_y = 9 - }, -/obj/effect/spawner/random/entertainment/coin, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "pSY" = ( /obj/structure/railing/corner/end{ dir = 8 @@ -54564,6 +54517,12 @@ /obj/structure/table, /turf/open/floor/plating, /area/station/maintenance/hallway/abandoned_recreation) +"qau" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/structure/sign/poster/official/work_for_a_future/directional/south, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/science/research) "qaI" = ( /obj/structure/table/reinforced, /obj/item/flashlight/lamp, @@ -54738,6 +54697,16 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/eighties, /area/station/maintenance/hallway/abandoned_recreation) +"qeb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/corner, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "qec" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -55654,6 +55623,11 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) +"qrN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/green, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "qrP" = ( /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/textured_large, @@ -55822,17 +55796,6 @@ /obj/effect/spawner/random/structure/shipping_container, /turf/open/floor/iron, /area/station/construction/storage_wing) -"quW" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/paper/guides/jobs/hydroponics, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/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, -/area/station/hallway/secondary/construction) "qvd" = ( /obj/structure/railing{ dir = 9 @@ -56903,22 +56866,14 @@ }, /turf/open/openspace, /area/station/service/library) -"qMa" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table/reinforced, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 4 +"qMe" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" }, -/obj/item/hatchet{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/crowbar, -/obj/item/reagent_containers/spray/plantbgone{ - pixel_x = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "qMi" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -57108,6 +57063,16 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"qPy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "qPB" = ( /obj/structure/mannequin/skeleton, /turf/open/floor/iron/dark/textured_large, @@ -57176,6 +57141,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/command/bridge) +"qQj" = ( +/obj/item/radio/intercom/directional/south, +/obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/clothing/costume, +/obj/effect/spawner/random/clothing/backpack, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "qQx" = ( /obj/structure/reagent_dispensers/wall/peppertank/directional/north, /obj/effect/turf_decal/stripes/end, @@ -57828,13 +57800,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/construction) -"rad" = ( -/obj/structure/table, -/obj/effect/spawner/random/bureaucracy/paper, -/obj/item/pen, -/obj/structure/sign/poster/contraband/missing_gloves/directional/west, -/turf/open/floor/wood, -/area/station/commons/dorms) "rah" = ( /obj/structure/rack, /obj/item/reagent_containers/cup/bottle/iron{ @@ -59334,14 +59299,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) -"rwe" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/machinery/status_display/ai/directional/south, -/obj/effect/spawner/random/clothing/backpack, -/turf/open/floor/iron, -/area/station/commons/dorms) "rwh" = ( /turf/closed/wall/r_wall, /area/station/security/medical) @@ -59925,17 +59882,6 @@ }, /turf/open/floor/wood, /area/station/hallway/secondary/service) -"rFp" = ( -/obj/machinery/vending/wallmed/directional/west{ - pixel_x = 27 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/light/directional/east, -/turf/open/floor/wood, -/area/station/command/gateway) "rFq" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 4 @@ -60171,6 +60117,17 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"rIS" = ( +/obj/machinery/wall_healer/directional/west{ + pixel_x = 27 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/light/directional/east, +/turf/open/floor/wood, +/area/station/command/gateway) "rIU" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60407,6 +60364,11 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron/dark/textured_large, /area/station/security/prison) +"rMe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/construction) "rMj" = ( /turf/open/floor/engine/hull/air, /area/station/maintenance/starboard/lesser) @@ -60792,6 +60754,13 @@ dir = 4 }, /area/station/medical/pharmacy) +"rSu" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/washing_machine, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "rTa" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -61146,13 +61115,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology/hallway) -"rYa" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "rYd" = ( /obj/effect/turf_decal/tile/red/opposingcorners{ dir = 1 @@ -61232,11 +61194,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"sax" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/green, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "saE" = ( /obj/machinery/door/airlock/public/glass{ name = "Community Center" @@ -61805,6 +61762,17 @@ /obj/machinery/light/blacklight/directional/west, /turf/open/floor/eighties, /area/station/maintenance/hallway/abandoned_recreation) +"shX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/paper/guides/jobs/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/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, +/area/station/hallway/secondary/construction) "sij" = ( /obj/structure/reflector/double{ dir = 6 @@ -62177,16 +62145,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/textured_large, /area/station/medical/abandoned) -"spm" = ( -/obj/effect/decal/cleanable/glitter{ - color = "ff8080" - }, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "spr" = ( /obj/structure/table, /obj/item/hand_labeler{ @@ -63562,6 +63520,20 @@ }, /turf/open/floor/iron/dark, /area/station/science/cytology) +"sLB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "sLC" = ( /obj/structure/lattice/catwalk, /turf/open/floor/engine/hull/air, @@ -63730,6 +63702,13 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark/herringbone, /area/station/ai_monitored/turret_protected/aisat_interior) +"sOw" = ( +/obj/structure/extinguisher_cabinet/directional/south, +/obj/structure/closet/crate/trashcart/laundry, +/obj/effect/spawner/random/clothing/backpack, +/obj/effect/spawner/random/clothing/backpack, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "sOz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64064,15 +64043,6 @@ "sTv" = ( /turf/closed/wall, /area/station/security/courtroom) -"sTK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/banner/blue{ - inspiration_available = 0 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/eighties, -/area/station/maintenance/hallway/abandoned_recreation) "sTT" = ( /obj/structure/railing/corner/end/flip{ dir = 4 @@ -64162,26 +64132,17 @@ /obj/machinery/vending/cigarette, /turf/open/floor/iron, /area/station/engineering/lobby) +"sUF" = ( +/obj/effect/turf_decal/tile/purple/opposingcorners, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/maintenance/starboard/aft) "sUM" = ( /obj/effect/turf_decal/box/white{ color = "#EFB341" }, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) -"sUR" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock{ - name = "Garden" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "sUV" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -64640,17 +64601,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"tcv" = ( -/obj/structure/table/reinforced, -/obj/item/plant_analyzer, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "tcw" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 10 @@ -64673,13 +64623,6 @@ /obj/effect/spawner/random/structure/shipping_container, /turf/open/floor/plating, /area/station/maintenance/port/greater) -"tcW" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/clothing/suit/hooded/wintercoat, -/obj/item/clothing/shoes/winterboots, -/obj/effect/spawner/random/clothing/backpack, -/turf/open/floor/iron, -/area/station/commons/dorms) "tda" = ( /obj/item/pen, /obj/item/pen/blue, @@ -65409,21 +65352,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/lockers) -"toE" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/north, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","medbay"); - c_tag = "Medbay - Lobby" - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "toH" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -67610,10 +67538,6 @@ "tYh" = ( /turf/open/floor/plating/airless, /area/station/maintenance/space_hut) -"tYi" = ( -/obj/structure/closet/wardrobe/grey, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "tYl" = ( /obj/structure/closet/crate/silvercrate, /obj/machinery/camera/motion{ @@ -69670,19 +69594,6 @@ "uAE" = ( /turf/open/floor/iron/dark, /area/station/security/range) -"uAF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/biogenerator, -/obj/effect/turf_decal/trimline/green/filled/line, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "uAO" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -70101,10 +70012,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) -"uGp" = ( -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/wood, -/area/station/ai_monitored/command/storage/eva) "uGt" = ( /obj/structure/tank_holder/extinguisher, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -70513,15 +70420,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/science/ordnance/storage) -"uLC" = ( -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","medbay"); - c_tag = "Medbay - Upper Morgue" - }, -/obj/structure/filingcabinet/chestdrawer, -/turf/open/floor/iron/dark/textured_large, -/area/station/medical/morgue) "uLL" = ( /obj/structure/lattice/catwalk, /obj/structure/railing{ @@ -70640,6 +70538,15 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/iron, /area/station/hallway/primary/port) +"uOx" = ( +/obj/structure/table/glass, +/obj/machinery/wall_healer/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "uOC" = ( /obj/machinery/vending/wardrobe/hydro_wardrobe, /turf/open/floor/iron/dark/smooth_large, @@ -71188,13 +71095,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/grimy, /area/station/security/detectives_office/private_investigators_office) -"uXW" = ( -/obj/structure/table, -/obj/structure/bedsheetbin/empty{ - pixel_y = 6 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "uXZ" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/three, @@ -71804,20 +71704,6 @@ /obj/structure/closet/bombcloset/security, /turf/open/floor/iron/dark, /area/station/security/office) -"vhF" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "vhJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/red/opposingcorners{ @@ -72267,6 +72153,15 @@ /obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/wood, /area/station/security/detectives_office) +"voe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 1 + }, +/obj/item/vending_refill/hydroseeds, +/obj/structure/frame/machine/secured, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "vof" = ( /obj/effect/landmark/carpspawn, /turf/open/space/openspace, @@ -72366,11 +72261,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"vpp" = ( -/obj/item/radio/intercom/directional/north, -/obj/effect/spawner/random/clothing/wardrobe_closet_colored, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "vpt" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -72777,6 +72667,22 @@ /obj/structure/light_construct/directional/east, /turf/open/floor/iron, /area/station/maintenance/starboard/central) +"vwa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/item/hatchet{ + pixel_x = -3; + pixel_y = 2 + }, +/obj/item/crowbar, +/obj/item/reagent_containers/spray/plantbgone{ + pixel_x = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "vwb" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -73313,14 +73219,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/service/kitchen/abandoned) -"vEp" = ( -/obj/machinery/vending/wallmed/directional/east, -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "vEF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73660,6 +73558,16 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/external, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) +"vKc" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "vKg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/dark/textured, @@ -73715,6 +73623,24 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/station/commons/locker) +"vKZ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "hydropony_shutters"; + name = "hydroponics shutters control"; + pixel_x = 10; + pixel_y = 30; + req_access = list("hydroponics") + }, +/obj/effect/turf_decal/trimline/blue/filled/mid_joiner{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north, +/obj/structure/sink/directional/south, +/turf/open/floor/iron/dark/smooth_large, +/area/station/service/hydroponics) "vLb" = ( /obj/structure/lattice/catwalk, /obj/structure/railing, @@ -75838,13 +75764,6 @@ /obj/machinery/light/directional/east, /turf/open/floor/wood, /area/station/service/library) -"wqE" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/closet/crate/trashcart/laundry, -/obj/effect/spawner/random/clothing/backpack, -/obj/effect/spawner/random/clothing/backpack, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "wqI" = ( /obj/effect/spawner/random/trash/botanical_waste, /turf/open/floor/plating, @@ -76124,13 +76043,6 @@ /obj/effect/spawner/random/entertainment/dice, /turf/open/floor/wood/large, /area/station/service/library) -"wvm" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "wvw" = ( /obj/machinery/conveyor{ dir = 8; @@ -77442,6 +77354,30 @@ /obj/structure/sign/poster/contraband/random/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"wQw" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/item/cultivator, +/obj/item/reagent_containers/cup/bottle/nutrient/rh{ + pixel_x = 10; + pixel_y = 6 + }, +/obj/item/reagent_containers/cup/bottle/nutrient/ez{ + pixel_x = 10; + pixel_y = -4 + }, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 4 + }, +/obj/item/reagent_containers/spray/pestspray{ + pixel_x = 10; + pixel_y = -14 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "wQD" = ( /obj/machinery/light/small/directional/east, /obj/item/solar_assembly, @@ -78241,6 +78177,15 @@ /obj/machinery/camera/autoname/directional/south, /turf/open/openspace, /area/station/hallway/primary/port) +"xck" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","medbay"); + c_tag = "Medbay - Upper Morgue" + }, +/obj/structure/filingcabinet/chestdrawer, +/turf/open/floor/iron/dark/textured_large, +/area/station/medical/morgue) "xcx" = ( /obj/item/radio/intercom/directional/east, /turf/open/floor/iron/dark/smooth_large, @@ -78441,6 +78386,16 @@ /obj/effect/turf_decal/tile/brown/full, /turf/open/floor/iron/large, /area/station/maintenance/starboard/lesser) +"xfn" = ( +/obj/effect/decal/cleanable/glitter{ + color = "ff8080" + }, +/obj/machinery/space_heater, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "xfq" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -78559,13 +78514,6 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/service/hydroponics) -"xhT" = ( -/obj/structure/table, -/obj/structure/bedsheetbin{ - pixel_y = 6 - }, -/turf/open/floor/iron/cafeteria, -/area/station/commons/locker) "xhX" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/decal/cleanable/dirt, @@ -78910,6 +78858,14 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/smooth_large, /area/station/security/courtroom) +"xot" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/table/glass, +/obj/item/storage/medkit/regular, +/obj/structure/cable, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/medical) "xoF" = ( /obj/structure/railing, /obj/effect/turf_decal/trimline/purple/filled/line, @@ -79189,14 +79145,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/science/cytology) -"xss" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "xsv" = ( /obj/machinery/light/cold/directional/south, /turf/open/floor/engine, @@ -79616,6 +79564,10 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"xAt" = ( +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/wood, +/area/station/hallway/secondary/service) "xAu" = ( /turf/closed/wall, /area/station/medical/chemistry) @@ -79863,6 +79815,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"xDR" = ( +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/large, +/area/station/hallway/primary/central) "xDW" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -80518,6 +80474,19 @@ /obj/effect/spawner/random/entertainment, /turf/open/floor/plating, /area/station/maintenance/port) +"xNN" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/closet/crate/hydroponics, +/obj/effect/spawner/random/food_or_drink/plant_produce, +/obj/effect/spawner/random/food_or_drink/seed_flowers, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "xNV" = ( /obj/structure/railing{ dir = 1 @@ -80684,6 +80653,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/engineering/lobby) +"xRn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/table/reinforced, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 6 + }, +/obj/effect/decal/cleanable/blood/old, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/item/storage/bag/plants, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "xRI" = ( /obj/machinery/conveyor{ dir = 8; @@ -80794,6 +80776,14 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/engineering/storage) +"xSv" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/service/hydroponics/garden/abandoned) "xSz" = ( /obj/machinery/door/firedoor, /turf/open/floor/engine/hull/air, @@ -81258,6 +81248,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/station/command/heads_quarters/ce) +"xYf" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/soda_cans/cola{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/effect/spawner/random/entertainment/coin, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "xYh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -81281,6 +81280,19 @@ /obj/effect/turf_decal/siding/thinplating/corner, /turf/open/floor/wood/large, /area/station/service/library) +"xYn" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/stamp/head/hop{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/structure/cable, +/turf/open/floor/carpet, +/area/station/command/heads_quarters/hop) "xYy" = ( /obj/machinery/nuclearbomb/selfdestruct, /obj/machinery/light/directional/east, @@ -81647,6 +81659,13 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/captain/private) +"yeu" = ( +/obj/structure/table, +/obj/structure/bedsheetbin{ + pixel_y = 6 + }, +/turf/open/floor/iron/cafeteria, +/area/station/commons/locker) "yeA" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -81714,15 +81733,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) -"yfu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 8 - }, -/obj/structure/sink/kitchen/directional/east, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "yfv" = ( /obj/structure/table/wood, /obj/item/binoculars{ @@ -81916,16 +81926,6 @@ /obj/structure/chair, /turf/open/floor/iron/dark/smooth_large, /area/station/security/interrogation) -"yiw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/trimline/green/filled/corner, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/service/hydroponics/garden/abandoned) "yiy" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/effect/spawner/random/maintenance/two, @@ -107382,7 +107382,7 @@ gPW xRU xOn xAj -jyf +xAt own wik uxl @@ -107633,7 +107633,7 @@ jBd lOd nKj jIX -sTK +heb vYH cFL xAj @@ -109222,7 +109222,7 @@ bFe rPE srD jDx -cAs +ddx ovx tRJ dWj @@ -113054,7 +113054,7 @@ kZo hMd ozk pen -rFp +rIS szz oTK tQI @@ -113072,7 +113072,7 @@ fLr iLm fLr pEO -toE +aVL sGy xeM ujD @@ -113303,7 +113303,7 @@ dDX vuO ugN tGb -gMZ +xYn loc ltm kRk @@ -114070,7 +114070,7 @@ bOk bOk wrI fjt -nck +xDR vuO ilg wmy @@ -115842,7 +115842,7 @@ wVd lBg nhR iol -gUR +eet jMr ibK jqv @@ -116115,10 +116115,10 @@ nyA jph dcE dTL -tYi -pST -eLk -iji +oHs +xYf +fpM +gTH dCm jqo eaw @@ -116372,10 +116372,10 @@ iOE jph heR dTL -vpp +jDr oNp sPC -wqE +sOw dCm rpL lHY @@ -116629,10 +116629,10 @@ jph jph dcE dTL -oHh +nCC sjO skC -amk +qQj dCm dCE bLf @@ -116886,10 +116886,10 @@ heR dcE dcE dTL -dJx +rSu uzN oqd -uXW +mkv dCm nZb ayn @@ -117146,7 +117146,7 @@ dTL uNG jQu oqd -xhT +yeu dCm emL bXg @@ -119710,7 +119710,7 @@ pRO mcY tFy qNn -rad +nym clF pRO ntw @@ -120487,7 +120487,7 @@ pRO tqQ ccZ qMN -tcW +pOF dCm tMZ idM @@ -120744,7 +120744,7 @@ pRO gnw qAd vfe -rwe +fWc dCm cNO idM @@ -121001,7 +121001,7 @@ cVN cVN dux ezT -tcW +pOF dCm ade rdl @@ -121258,7 +121258,7 @@ olU olU laK ffR -tcW +pOF dCm cNO dCm @@ -122095,7 +122095,7 @@ hFi hFi hFi hFi -kjl +rMe gnT hFi hFi @@ -122573,7 +122573,7 @@ iYq caE dUe oDH -wvm +bEJ iKT oDH oDH @@ -122629,8 +122629,8 @@ cMb lue vnp hFi -quW -ihn +shX +mju vvc exj qZZ @@ -122882,12 +122882,12 @@ aLd aLd cWU cWU -fxX -fxX -kEn -kEn -sUR -fxX +aSW +aSW +pQh +pQh +muC +aSW uVg uVg dEB @@ -123089,7 +123089,7 @@ qgr xiy lmt qPj -hBj +caQ gNy qgI lMT @@ -123139,12 +123139,12 @@ mTH cWU cWU msr -fxX -euA -xss -yfu -vhF -cyY +aSW +xNN +xSv +ocT +sLB +ckE uVg dEk xLQ @@ -123396,12 +123396,12 @@ jmh qdA wOx vcm -kEn -hTF -sax -gEJ -gBc -cyY +pQh +voe +qrN +dLb +qPy +ckE uVg viT bwI @@ -123653,12 +123653,12 @@ jmh dlt wKl rNT -kEn -dMK -sax -erQ -yiw -cyY +pQh +eqU +qrN +kYT +qeb +ckE uVg wZW xNr @@ -123910,12 +123910,12 @@ jmh qdA wOx tVR -kEn -kbi -eNm -dOC -uAF -fxX +pQh +kpE +flo +aQx +iIs +aSW uVg uVg pWZ @@ -124167,12 +124167,12 @@ jmh rOn iXD kiu -itU -tcv -cJi -qMa -gPh -fxX +gFm +gFa +wQw +vwa +xRn +aSW jjG uVg ucl @@ -124425,10 +124425,10 @@ qdA xZP aKk wKb -kEn -kEn -kEn -oXS +pQh +pQh +pQh +hLN wKb wKb uVg @@ -124689,7 +124689,7 @@ koi boq wKb jCK -aVv +hWU moI lRp wKb @@ -124942,10 +124942,10 @@ eEv eEv eEv wKb -iiT +xfn aWb tCE -mcs +gSS wKb wKb wKb @@ -125201,8 +125201,8 @@ wKb wKb wKb rlR -luD -jyZ +hip +aUe wKb hhN pss @@ -125455,7 +125455,7 @@ hZf wKb eEv eEv -iZD +kew wUu sfL pwQ @@ -125710,13 +125710,13 @@ vlc mgY mgY wKb -dRo +nkZ wep eEv ebQ diA xqo -spm +vKc wKb lmL jyA @@ -125967,8 +125967,8 @@ wKb yfj nuZ wKb -rYa -oEA +fMC +jJZ trK msK ina @@ -126228,7 +126228,7 @@ wKb wKb wKb wKb -foP +qMe ilV bvG wKb @@ -126406,7 +126406,7 @@ xSq irJ grE rTW -oai +giM dPD dPD sNK @@ -127765,7 +127765,7 @@ jmh wKb dGu gdG -jPB +sUF jcQ jcQ jcQ @@ -167555,7 +167555,7 @@ tlL jhO muJ qFA -epX +xot kUq uJi kUq @@ -168067,7 +168067,7 @@ nlO iGy ohb rwh -vEp +eas sFc aCE pIt @@ -170602,7 +170602,7 @@ eIJ eIJ nKj ipm -mdn +mkd lOd gPW wKg @@ -173955,7 +173955,7 @@ tnb hRX hRX hRX -jmG +vKZ xyF pME rjE @@ -176810,7 +176810,7 @@ iPl dfn fbC kza -uLC +xck qPB eHu yly @@ -178849,7 +178849,7 @@ uxq izh iGI xCI -nhD +uOx qVO qVO sLY @@ -180636,7 +180636,7 @@ dUb dUb dUb drX -uGp +bvY vzx xvN iJc @@ -182478,7 +182478,7 @@ cwP xWT dTc vsK -gbv +qau soU soU soU diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 9c882016ed0..6115bb04679 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -7558,6 +7558,22 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"bQy" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/cytology{ + pixel_x = -4; + pixel_y = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 1 + }, +/obj/item/seeds/soya{ + pixel_x = 11; + pixel_y = -2 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/science/xenobiology) "bQz" = ( /obj/item/kirbyplants/random, /obj/machinery/newscaster/directional/south, @@ -9696,15 +9712,6 @@ }, /turf/open/floor/iron/dark/textured_large, /area/station/engineering/atmos/hfr_room) -"cpE" = ( -/obj/structure/table/glass, -/obj/item/reagent_containers/cup/bottle/morphine, -/obj/item/reagent_containers/syringe, -/obj/machinery/status_display/evac/directional/east, -/obj/machinery/vending/wallmed/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "cpG" = ( /obj/structure/sign/poster/contraband/kudzu/directional/west, /obj/machinery/light/small/directional/west, @@ -11466,13 +11473,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/plating, /area/station/commons/toilet/locker) -"cNX" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "cOb" = ( /obj/machinery/duct, /obj/effect/decal/cleanable/dirt, @@ -13945,6 +13945,12 @@ /obj/effect/mapping_helpers/mail_sorting/science/xenobiology, /turf/open/floor/iron, /area/station/science/xenobiology) +"duR" = ( +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "duV" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -14178,12 +14184,6 @@ /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/dark, /area/station/service/theater) -"dxo" = ( -/obj/structure/bed/medical/emergency, -/obj/item/radio/intercom/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/line, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "dxr" = ( /obj/structure/cable, /turf/open/floor/plating, @@ -16031,6 +16031,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/library) +"dWH" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/newscaster/directional/south, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/cargo/storage) "dWO" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -16043,6 +16053,17 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"dWU" = ( +/mob/living/simple_animal/bot/mulebot, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=4"; + location = "QM #4" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/cargo/storage) "dXd" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch" @@ -16838,6 +16859,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/engineering/atmos) +"eib" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "eif" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 9 @@ -17734,6 +17763,23 @@ }, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"euG" = ( +/obj/structure/table/glass, +/obj/item/storage/medkit/regular, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -15; + pixel_y = 2 + }, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/structure/sign/poster/official/cleanliness/directional/east, +/obj/machinery/wall_healer/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/security/medical) "euK" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -19021,6 +19067,15 @@ }, /turf/open/floor/iron, /area/station/commons/toilet/locker) +"eLa" = ( +/obj/structure/table/glass, +/obj/item/reagent_containers/cup/bottle/morphine, +/obj/item/reagent_containers/syringe, +/obj/machinery/status_display/evac/directional/east, +/obj/machinery/wall_healer/directional/north, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "eLb" = ( /obj/machinery/air_sensor/plasma_tank, /turf/open/floor/engine/plasma, @@ -19668,6 +19723,14 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/storage) +"eSZ" = ( +/obj/structure/table, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/wall_healer/directional/west, +/obj/machinery/light/small/broken/directional/west, +/turf/open/floor/plating, +/area/station/medical/abandoned) "eTv" = ( /obj/structure/closet/crate/trashcart, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -21272,14 +21335,6 @@ /obj/structure/chair/office, /turf/open/floor/iron/grimy, /area/station/tcommsat/computer) -"foc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "foh" = ( /obj/machinery/atmospherics/components/binary/volume_pump{ name = "Ports to Distro" @@ -22467,11 +22522,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/main) -"fDV" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "fEd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/warning/vacuum/directional/west, @@ -24273,14 +24323,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"gab" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "gae" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -24999,13 +25041,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"gic" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/entry) "gii" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -26697,23 +26732,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"gBA" = ( -/obj/structure/table/glass, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -15; - pixel_y = 2 - }, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, -/obj/structure/sign/poster/official/cleanliness/directional/east, -/obj/machinery/vending/wallmed/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/medical) "gBB" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27541,16 +27559,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/explab) -"gLz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/newscaster/directional/south, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/station/cargo/storage) "gLH" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, @@ -30577,15 +30585,6 @@ /obj/effect/turf_decal/bot/left, /turf/open/floor/iron/kitchen_coldroom/dark, /area/station/service/kitchen/coldroom) -"hBL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/vending/wallmed/directional/west, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/hallway/secondary/exit) "hBT" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -33521,6 +33520,19 @@ }, /turf/open/floor/iron, /area/station/security/courtroom) +"inY" = ( +/obj/structure/filingcabinet/white, +/obj/item/toy/figure/psychologist{ + pixel_x = -1; + pixel_y = 15 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/turf/open/floor/wood/large, +/area/station/medical/psychology) "ioe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -34111,17 +34123,6 @@ "ivA" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/captain/private) -"ivB" = ( -/mob/living/simple_animal/bot/mulebot, -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=4"; - location = "QM #4" - }, -/obj/effect/turf_decal/delivery, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/cargo/storage) "ivH" = ( /obj/machinery/light/small/directional/south, /obj/structure/sign/warning/radiation/directional/south, @@ -34596,6 +34597,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark/textured, /area/station/science/robotics/lab) +"iCJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 10 + }, +/obj/item/radio/intercom/directional/south, +/obj/machinery/firealarm/directional/west{ + pixel_y = -30 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "iCO" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35977,14 +35988,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/royalblack, /area/station/service/chapel/office) -"iVl" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/vending/wallmed/directional/west, -/obj/machinery/light/small/broken/directional/west, -/turf/open/floor/plating, -/area/station/medical/abandoned) "iVo" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/bot, @@ -39405,22 +39408,6 @@ }, /turf/open/floor/iron, /area/station/commons/storage/tools) -"jJC" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/cytology{ - pixel_x = -4; - pixel_y = 4 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 1 - }, -/obj/item/seeds/soya{ - pixel_x = 11; - pixel_y = -2 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/science/xenobiology) "jJD" = ( /obj/machinery/bookbinder, /obj/effect/turf_decal/bot_white, @@ -42820,6 +42807,19 @@ /obj/machinery/hydroponics/soil/rich, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"kBv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "kBz" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -44957,6 +44957,11 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"lfy" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "lfz" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -45427,14 +45432,6 @@ }, /turf/closed/wall/r_wall, /area/station/maintenance/starboard/aft) -"lky" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/airalarm/directional/north, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "lkF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -46589,11 +46586,6 @@ }, /turf/open/floor/iron, /area/station/science/xenobiology) -"lzh" = ( -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/central/aft) "lzo" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -47550,15 +47542,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/iron/dark, /area/station/hallway/secondary/service) -"lJM" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/cargo/office) "lJN" = ( /obj/machinery/requests_console/directional/west{ department = "Research Director's Desk"; @@ -48751,13 +48734,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port/fore) -"mbA" = ( -/obj/structure/bed/medical/emergency, -/obj/machinery/newscaster/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "mbR" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, @@ -50928,14 +50904,6 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"mDl" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "mDo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -53530,6 +53498,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"nlT" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "nma" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -53922,6 +53898,15 @@ /obj/effect/mapping_helpers/airalarm/tlv_no_checks, /turf/open/floor/iron, /area/station/engineering/supermatter/room) +"nsa" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/cargo/office) "nsd" = ( /obj/structure/table, /obj/item/rcl/pre_loaded, @@ -55239,6 +55224,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) +"nIG" = ( +/obj/machinery/camera/directional/east{ + c_tag = "Departures Lounge - Fore Starboard"; + dir = 6; + name = "departures camera" + }, +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/secondary/exit/departure_lounge) "nIQ" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/structure/mirror/directional/east, @@ -57000,17 +56995,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) -"ohH" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/light/directional/south, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/brown/half/contrasted, -/turf/open/floor/iron, -/area/station/cargo/storage) "ohI" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security{ @@ -57637,17 +57621,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron, /area/station/command/gateway) -"ooL" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/engineering/lobby) "ooQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -64633,19 +64606,6 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"pYr" = ( -/obj/structure/filingcabinet/white, -/obj/item/toy/figure/psychologist{ - pixel_x = -1; - pixel_y = 15 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/turf/open/floor/wood/large, -/area/station/medical/psychology) "pYD" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/north, @@ -64986,6 +64946,14 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"qcq" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "qcu" = ( /obj/machinery/door/airlock/external{ name = "Escape Pod 3"; @@ -67337,16 +67305,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"qHo" = ( -/obj/machinery/camera/directional/east{ - c_tag = "Departures Lounge - Fore Starboard"; - dir = 6; - name = "departures camera" - }, -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/secondary/exit/departure_lounge) "qHs" = ( /obj/structure/statue/sandstone/venus{ dir = 1; @@ -68147,6 +68105,17 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"qRv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/light/directional/south, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/brown/half/contrasted, +/turf/open/floor/iron, +/area/station/cargo/storage) "qRx" = ( /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, @@ -68299,6 +68268,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/processing) +"qTi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "qTs" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68916,6 +68894,13 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark/side, /area/station/engineering/lobby) +"reh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/siding/wood/corner, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/service) "rem" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/sign/poster/random/directional/west, @@ -69854,6 +69839,10 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library) +"roq" = ( +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "rov" = ( /turf/closed/wall/r_wall, /area/station/engineering/lobby) @@ -69905,6 +69894,16 @@ }, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"rpz" = ( +/obj/structure/closet/boxinggloves, +/obj/effect/landmark/start/hangover/closet, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "rpZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70579,13 +70578,6 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/dark/smooth_large, /area/station/service/chapel/funeral) -"ryU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/siding/wood/corner, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/service) "ryY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -71003,6 +70995,11 @@ /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron, /area/station/service/kitchen) +"rES" = ( +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central/aft) "rEU" = ( /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/structure/steam_vent, @@ -71111,6 +71108,15 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/hallway) +"rGI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/wall_healer/directional/west, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/hallway/secondary/exit) "rGU" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -79323,16 +79329,6 @@ dir = 8 }, /area/station/service/kitchen/abandoned) -"tEW" = ( -/obj/structure/closet/boxinggloves, -/obj/effect/landmark/start/hangover/closet, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "tEX" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -79981,10 +79977,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/crew_quarters/bar) -"tNg" = ( -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "tNq" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -81550,6 +81542,17 @@ /obj/effect/spawner/random/engineering/canister, /turf/open/floor/iron, /area/station/maintenance/starboard/aft) +"ufO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/engineering/lobby) "ufR" = ( /turf/closed/wall/r_wall, /area/station/security/warden) @@ -82953,6 +82956,13 @@ /obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/wood, /area/station/command/heads_quarters/captain) +"uxv" = ( +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/directional/south, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "uxA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -83584,6 +83594,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) +"uEG" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/entry) "uEJ" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -85288,24 +85305,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"uZQ" = ( -/obj/structure/rack, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/suture, -/obj/item/stack/medical/mesh, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/syringe/multiver, -/obj/machinery/camera/directional/west{ - c_tag = "Bridge - Gateway Atrium"; - name = "command camera" - }, -/obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/command/gateway) "uZV" = ( /obj/effect/turf_decal/plaque{ icon_state = "L6" @@ -85688,6 +85687,24 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron, /area/station/science/research/abandoned) +"vfu" = ( +/obj/structure/rack, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/suture, +/obj/item/stack/medical/mesh, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/syringe/multiver, +/obj/machinery/camera/directional/west{ + c_tag = "Bridge - Gateway Atrium"; + name = "command camera" + }, +/obj/effect/turf_decal/bot, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/command/gateway) "vfw" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -87120,15 +87137,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) -"vyr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "vys" = ( /obj/structure/flora/bush/jungle/c/style_random, /turf/open/misc/grass, @@ -89355,6 +89363,13 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wdr" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/newscaster/directional/south, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/cargo/office) "wdu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -89569,13 +89584,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"wfK" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/newscaster/directional/south, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted, -/turf/open/floor/iron, -/area/station/cargo/office) "wfP" = ( /obj/machinery/computer/exodrone_control_console, /obj/effect/turf_decal/stripes/line{ @@ -89615,6 +89623,14 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/tcoms, /turf/open/floor/iron, /area/station/hallway/secondary/command) +"wgl" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "wgn" = ( /obj/structure/closet/masks, /obj/effect/turf_decal/bot, @@ -91306,19 +91322,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"wAR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "wAT" = ( /obj/effect/spawner/random/structure/crate, /obj/structure/disposalpipe/segment, @@ -122137,7 +122140,7 @@ uCa aTz ygM fzF -ooL +ufO sys rCE uWj @@ -122687,7 +122690,7 @@ rZw iQF eRr pTC -jJC +bQy fpt uOF sPk @@ -126763,7 +126766,7 @@ laP xfq kEg gxL -vyr +qTi nAb vxZ fix @@ -131598,7 +131601,7 @@ cGM tMN qMS sQn -gic +uEG sjt aaY sAY @@ -131924,7 +131927,7 @@ uyB qSd kqM tXO -lzh +rES khb khb khb @@ -133495,7 +133498,7 @@ fMZ bXG xdN sYK -tNg +roq qmd qbg xfU @@ -134212,7 +134215,7 @@ qYo qYo qYo diL -gab +nlT drj bog kZd @@ -135753,7 +135756,7 @@ xms aaa wyH fIx -mDl +eib cQv drj bog @@ -135979,7 +135982,7 @@ kVP gyW ryg mGF -ryU +reh kVP iIO rrr @@ -137789,7 +137792,7 @@ qAV xSx xGC qAV -lJM +nsa mzb lkm mfK @@ -138367,7 +138370,7 @@ svO cSD mgE sKd -cNX +iCJ uNY iKg lke @@ -138862,14 +138865,14 @@ vIQ vIQ vIQ vIQ -wAR +kBv pBH ksK liC mrK oVI cng -uZQ +vfu bhP bmt ksK @@ -139395,7 +139398,7 @@ gnb dnj eiw fNm -mbA +uxv uNY keH jtz @@ -139652,7 +139655,7 @@ dOc iso rMf rmo -dxo +duR uNY eQC gQl @@ -140106,7 +140109,7 @@ lMK vwg wRf vKl -wfK +wdr hoC yfI wAl @@ -140186,7 +140189,7 @@ biv nPz oDE tUG -pYr +inY dki hIy dki @@ -140365,7 +140368,7 @@ toS hoC hoC hoC -lky +qcq erZ jwt rcI @@ -141118,7 +141121,7 @@ wHa fEo dIx tuZ -ivB +dWU mIA dgU nZK @@ -141460,7 +141463,7 @@ slE rHI dju dju -hBL +rGI vvh dju oXR @@ -141647,7 +141650,7 @@ qUG qUG fEm oSv -gLz +dWH xhW eAu fOz @@ -141904,7 +141907,7 @@ dbx olY gDv cNf -ohH +qRv xhW xhW nPo @@ -141982,7 +141985,7 @@ tIV tIV tIV mhW -fDV +lfy pYp tIV tIV @@ -142257,7 +142260,7 @@ bMh nyb jdg pPN -qHo +nIG hQF hQF hQF @@ -147327,7 +147330,7 @@ mVO nHs lkS nHs -foc +wgl whm sQL huv @@ -148581,7 +148584,7 @@ mSe pMa caH mSe -cpE +eLa xqc eEi vtt @@ -149170,7 +149173,7 @@ okj uKK iuA wHQ -iVl +eSZ rhw eDJ qMf @@ -150903,7 +150906,7 @@ iCo krO guZ lET -gBA +euG fQo aNh pWT @@ -151468,7 +151471,7 @@ cau mJx vNm wgn -tEW +rpz wvL qNK ujd diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 5c0c8563625..9056d1be868 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1782,19 +1782,6 @@ dir = 1 }, /area/station/medical/morgue) -"axm" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/east, -/obj/machinery/light_switch/directional/east{ - pixel_x = 23 - }, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) "axr" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -3662,6 +3649,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) +"aYI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "aYJ" = ( /turf/open/floor/iron/white, /area/station/science/research) @@ -3731,12 +3724,6 @@ dir = 1 }, /area/mine/eva/lower) -"aZG" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "aZH" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 8 @@ -4106,10 +4093,6 @@ /obj/machinery/status_display/evac/directional/west, /turf/open/floor/wood, /area/station/service/library) -"bdW" = ( -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/cargo/storage) "bea" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating/icemoon, @@ -6229,14 +6212,6 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron, /area/station/command/bridge) -"bGm" = ( -/obj/machinery/firealarm/directional/south, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "bGn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -6602,12 +6577,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/dark/smooth_large, /area/station/hallway/secondary/entry) -"bLt" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/white/textured, -/area/station/security/medical) "bLz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -6709,6 +6678,14 @@ /obj/effect/mapping_helpers/airlock/unres, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"bML" = ( +/obj/effect/spawner/random/vending/colavend, +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white/corner, +/area/station/hallway/secondary/exit/departure_lounge) "bMY" = ( /turf/open/floor/glass/reinforced, /area/station/hallway/primary/starboard) @@ -11234,6 +11211,12 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/port/greater) +"daw" = ( +/obj/structure/closet/emcloset, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/command/bridge) "daE" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, @@ -14435,6 +14418,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) +"dVe" = ( +/obj/item/kirbyplants/random, +/obj/machinery/wall_healer/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/machinery/newscaster/directional/south, +/turf/open/floor/iron/dark, +/area/station/command/gateway) "dVj" = ( /obj/effect/spawner/structure/window, /turf/open/floor/iron/dark, @@ -14980,6 +14970,13 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos/storage) +"edI" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "edN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -19062,6 +19059,13 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/command/storage/eva) +"fmn" = ( +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "fmq" = ( /obj/docking_port/stationary{ dir = 4; @@ -19770,10 +19774,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) -"fyq" = ( -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "fyr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command/glass{ @@ -19928,6 +19928,11 @@ }, /turf/open/floor/iron/dark, /area/station/security/mechbay) +"fAO" = ( +/obj/structure/table/reinforced, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron, +/area/station/command/bridge) "fAV" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -20716,14 +20721,6 @@ /obj/effect/spawner/random/entertainment/money_small, /turf/open/floor/wood/large, /area/station/commons/lounge) -"fME" = ( -/obj/structure/extinguisher_cabinet/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "fNa" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -24908,6 +24905,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark/textured_large, /area/station/security/evidence) +"gXi" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "gXk" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -30141,6 +30144,15 @@ /obj/structure/bookcase/random, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"iyf" = ( +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "iyg" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -31755,13 +31767,6 @@ /obj/structure/sign/warning/radiation/rad_area/directional/north, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"iYe" = ( -/obj/item/kirbyplants/random, -/obj/machinery/vending/wallmed/directional/west, -/obj/effect/turf_decal/tile/blue/opposingcorners, -/obj/machinery/newscaster/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/gateway) "iYq" = ( /obj/structure/railing/corner{ dir = 4 @@ -32392,6 +32397,10 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/iron/dark/smooth_half, /area/station/medical/morgue) +"jhb" = ( +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/cargo/storage) "jhf" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners, /turf/open/floor/iron/white, @@ -33099,6 +33108,15 @@ /obj/effect/mapping_helpers/airlock/access/any/science/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"jtu" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/camera/directional/east{ + c_tag = "Engineering Lobby" + }, +/obj/structure/window/spawner/directional/north, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) "jtx" = ( /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/red, @@ -35251,15 +35269,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/commons/storage/mining) -"jYG" = ( -/obj/structure/window/reinforced/spawner/directional/north, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/cargo/sorting) "jYH" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible{ dir = 9 @@ -35490,15 +35499,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/fore) -"kbS" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "kcc" = ( /obj/machinery/camera/directional/west{ c_tag = "Security - Infirmary" @@ -50023,14 +50023,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) -"ohb" = ( -/obj/machinery/medical_kiosk, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/sign/departments/medbay/alt/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "ohp" = ( /turf/open/floor/glass, /area/station/maintenance/department/medical/central) @@ -50120,6 +50112,19 @@ /obj/effect/turf_decal/tile/blue/full, /turf/open/floor/iron/large, /area/station/medical/treatment_center) +"oit" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/obj/machinery/light_switch/directional/east{ + pixel_x = 23 + }, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "oiy" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/aisat/service) @@ -51330,6 +51335,16 @@ /obj/structure/table, /turf/open/floor/wood, /area/station/command/meeting_room) +"oyt" = ( +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/tile/purple, +/obj/machinery/camera/directional/south{ + c_tag = "Starboard Primary Hallway Center" + }, +/obj/structure/extinguisher_cabinet/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "oyv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -52746,13 +52761,6 @@ "oQY" = ( /turf/open/floor/iron/white, /area/station/medical/virology) -"oRb" = ( -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "oRk" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -54423,6 +54431,10 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"poY" = ( +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white, +/area/station/science/research) "ppc" = ( /obj/item/trash/syndi_cakes, /obj/effect/turf_decal/stripes/red/line{ @@ -58287,6 +58299,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/primary/central) +"qsP" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "qsQ" = ( /obj/machinery/stasis, /obj/machinery/defibrillator_mount/directional/north, @@ -59133,11 +59152,6 @@ /obj/effect/mapping_helpers/airlock/access/all/service/janitor, /turf/open/floor/iron, /area/station/service/janitor) -"qGd" = ( -/obj/structure/table/reinforced, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron, -/area/station/command/bridge) "qGg" = ( /obj/structure/rack, /obj/item/pickaxe, @@ -60535,6 +60549,18 @@ }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/auxiliary) +"qYE" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/duct, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/commons/fitness) "qYF" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 1 @@ -61434,6 +61460,10 @@ /obj/effect/spawner/random/vending/snackvend, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"rlA" = ( +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "rlB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -61879,13 +61909,6 @@ /obj/effect/spawner/structure/window/hollow/reinforced/end, /turf/open/floor/plating, /area/mine/eva) -"rsa" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "rsf" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -64067,10 +64090,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/storage) -"rZw" = ( -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/science/research) "rZE" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -68608,12 +68627,6 @@ /obj/structure/rack, /turf/open/floor/plating, /area/mine/eva/lower) -"tnk" = ( -/obj/structure/closet/emcloset, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/command/bridge) "tnp" = ( /obj/structure/table, /obj/item/folder/blue{ @@ -70765,6 +70778,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/science/ordnance) +"tUq" = ( +/obj/structure/window/reinforced/spawner/directional/north, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/turf/open/floor/iron, +/area/station/cargo/sorting) "tUx" = ( /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, @@ -76295,14 +76317,6 @@ /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/recharge_floor, /area/station/science/robotics/mechbay) -"vAd" = ( -/obj/effect/spawner/random/vending/colavend, -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/white/corner, -/area/station/hallway/secondary/exit/departure_lounge) "vAm" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -79316,15 +79330,6 @@ /obj/structure/noticeboard/directional/north, /turf/open/floor/iron/dark, /area/station/service/chapel) -"wyN" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/machinery/camera/directional/east{ - c_tag = "Engineering Lobby" - }, -/obj/structure/window/spawner/directional/north, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "wyO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -82471,18 +82476,6 @@ /obj/machinery/light/blacklight/directional/east, /turf/open/floor/wood, /area/station/service/library) -"xsW" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/duct, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/commons/fitness) "xtc" = ( /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 @@ -83961,6 +83954,17 @@ "xMq" = ( /turf/closed/mineral/random/snow, /area/icemoon/underground/explored) +"xMC" = ( +/obj/machinery/medical_kiosk, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/sign/departments/medbay/alt/directional/north, +/obj/machinery/firealarm/directional/north{ + pixel_x = 26 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "xMQ" = ( /obj/effect/mapping_helpers/ianbirthday, /turf/open/floor/carpet, @@ -84530,15 +84534,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/wood, /area/station/command/meeting_room) -"xVv" = ( -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/tile/purple, -/obj/machinery/camera/directional/south{ - c_tag = "Starboard Primary Hallway Center" - }, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "xVB" = ( /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix{ dir = 8 @@ -85469,6 +85464,14 @@ /obj/structure/sign/departments/cargo/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/central) +"ylr" = ( +/obj/machinery/firealarm/directional/south, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "ylz" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/neutral/warning, @@ -187206,7 +187209,7 @@ ugs ttb bjU bOO -axm +oit wZr kwe gkT @@ -233177,7 +233180,7 @@ nrM oCO kxs lsi -fyq +rlA qnj qnj qnj @@ -237574,7 +237577,7 @@ iaF iaF ajw ajw -bdW +jhb pBE pBE uYc @@ -239084,7 +239087,7 @@ sDl hDU dAQ fVU -iYe +dVe hDU gpp aJA @@ -240387,7 +240390,7 @@ ozH bZg gst hYG -jYG +tUq dOw dOw yhe @@ -245297,7 +245300,7 @@ pvg nQW vsz fdy -oRb +fmn wHX nbi qzu @@ -245761,7 +245764,7 @@ gtB tny dLo ctj -aZG +gXi wYZ aKI peq @@ -246801,11 +246804,11 @@ nfk utR tmQ qnV -qGd +fAO cEv lhv iGH -bGm +ylr ybv ybv ybv @@ -247020,7 +247023,7 @@ xmO deY bUx kdT -bLt +aYI syN cAC mWM @@ -247576,7 +247579,7 @@ qWZ ydk tGF iUT -tnk +daw lpM rCD uEm @@ -248137,7 +248140,7 @@ gJN ckX iub inn -wyN +jtu vfU pdV gyR @@ -248369,7 +248372,7 @@ frN mhQ pzb iuv -rsa +edI cvS ewi cvS @@ -250636,7 +250639,7 @@ ugA hNp tFI eHb -xsW +qYE bdp nmH tiI @@ -253494,7 +253497,7 @@ qbG onP jyp hgh -kbS +iyf xxg ehU uau @@ -254779,7 +254782,7 @@ nOj vwO gnT hgh -ohb +xMC mTS obu mjI @@ -255034,7 +255037,7 @@ cpY lkr lso vwO -fME +qsP nKa dqO icA @@ -258118,7 +258121,7 @@ kKL kdF qGV hUx -xVv +oyt sZF sZF sZF @@ -262512,7 +262515,7 @@ via aYJ lAw aYJ -rZw +poY wib eLr hAm @@ -265572,7 +265575,7 @@ xBU iVU iFX qRr -vAd +bML omh wDr elw diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b21913e628f..5a051782e52 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -209,14 +209,6 @@ /obj/machinery/duct, /turf/open/floor/iron/dark/textured, /area/station/medical/cryo) -"aeA" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/duct, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/commons/fitness/recreation) "afj" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -1092,16 +1084,6 @@ }, /turf/open/floor/plating, /area/station/hallway/secondary/entry) -"auO" = ( -/obj/structure/cable, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "ava" = ( /obj/effect/spawner/random/structure/closet_maintenance, /obj/item/storage/box/lights/mixed, @@ -2215,6 +2197,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/dark, /area/station/command/bridge) +"aNH" = ( +/obj/effect/turf_decal/siding/purple{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/science/research) "aNN" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/disposal/bin, @@ -10059,16 +10048,6 @@ /obj/effect/mapping_helpers/airlock/access/all/security/general, /turf/open/floor/iron/dark, /area/station/security/interrogation) -"dDf" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/port) "dDo" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer4, @@ -10756,6 +10735,15 @@ }, /turf/open/floor/wood/large, /area/station/commons/lounge) +"dOS" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/camera/directional/south{ + c_tag = "Medbay Psychology Office"; + network = list("ss13","medbay") + }, +/obj/effect/turf_decal/siding/wood, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "dOY" = ( /obj/effect/spawner/random/engineering/tank, /turf/open/floor/plating, @@ -12554,6 +12542,13 @@ }, /turf/open/floor/iron, /area/station/engineering/main) +"eri" = ( +/obj/effect/spawner/random/entertainment/arcade, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/delivery, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "erl" = ( /obj/structure/rack, /obj/effect/turf_decal/bot{ @@ -13019,6 +13014,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central) +"exK" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "exN" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -13806,13 +13808,6 @@ /obj/machinery/vending/wardrobe/coroner_wardrobe, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"eNA" = ( -/obj/effect/spawner/random/entertainment/arcade, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/delivery, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "eNR" = ( /turf/closed/wall, /area/station/ai_monitored/aisat/exterior) @@ -23265,13 +23260,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/prison) -"ien" = ( -/obj/effect/turf_decal/siding/purple{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/white, -/area/station/science/research) "iep" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -23546,13 +23534,6 @@ }, /turf/open/floor/carpet, /area/station/command/heads_quarters/hop) -"iiH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "iiL" = ( /obj/machinery/air_sensor/mix_tank, /turf/open/floor/engine/vacuum, @@ -24220,6 +24201,13 @@ /obj/effect/turf_decal/tile/yellow/fourcorners, /turf/open/floor/iron, /area/station/engineering/break_room) +"ita" = ( +/obj/effect/turf_decal/tile/red{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "itg" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/tile/bar, @@ -25384,15 +25372,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating/airless, /area/space/nearstation) -"iNo" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/camera/directional/south{ - c_tag = "Medbay Psychology Office"; - network = list("ss13","medbay") - }, -/obj/effect/turf_decal/siding/wood, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "iNB" = ( /obj/machinery/firealarm/directional/east, /obj/structure/table/glass, @@ -25690,26 +25669,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"iRw" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/engineering_hacking{ - pixel_x = 2; - pixel_y = 3 - }, -/obj/item/book/manual/wiki/engineering_guide{ - pixel_x = -2 - }, -/obj/item/trash/can{ - pixel_x = -8 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/engineering/break_room) "iRy" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, @@ -26285,18 +26244,6 @@ }, /turf/open/floor/engine, /area/station/science/cytology) -"jbf" = ( -/obj/item/folder/white{ - pixel_x = 4; - pixel_y = -3 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/green/half/contrasted{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "jbg" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 @@ -28479,17 +28426,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/hop) -"jLS" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/command) "jMb" = ( /obj/structure/railing{ dir = 10 @@ -39315,14 +39251,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/work) -"nyr" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/green{ - dir = 1 - }, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "nyu" = ( /obj/effect/turf_decal/tile/brown/fourcorners, /obj/machinery/door/airlock/security/glass{ @@ -40470,6 +40398,26 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/yellow/visible, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"nTD" = ( +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = 2; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide{ + pixel_x = -2 + }, +/obj/item/trash/can{ + pixel_x = -8 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/hidden{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/engineering/break_room) "nTH" = ( /obj/structure/cable, /obj/machinery/computer/crew{ @@ -40553,6 +40501,20 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics/garden) +"nWd" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "nWk" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -41855,11 +41817,6 @@ /obj/item/reagent_containers/cup/glass/bottle/goldschlager, /turf/open/space/basic, /area/space/nearstation) -"ouz" = ( -/obj/item/kirbyplants, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "ouM" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -42684,6 +42641,17 @@ "oIg" = ( /turf/closed/wall/r_wall, /area/station/science/genetics) +"oIC" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/command) "oIG" = ( /obj/structure/lattice/catwalk, /turf/open/space/basic, @@ -44935,6 +44903,16 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"pyX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/primary/starboard) "pyY" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -45305,17 +45283,6 @@ dir = 1 }, /area/station/engineering/atmos/storage/gas) -"pGC" = ( -/obj/structure/table, -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/security/medical) "pGH" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -48259,6 +48226,16 @@ /obj/machinery/computer/security/telescreen/ce/directional/south, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"qHp" = ( +/obj/structure/cable, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "qHs" = ( /obj/structure/sign/warning/docking, /turf/closed/wall, @@ -49972,6 +49949,14 @@ /obj/machinery/recharge_station, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rkf" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/commons/fitness/recreation) "rkg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass{ @@ -50214,20 +50199,6 @@ /obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron, /area/station/science/research) -"rnt" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/duct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "rnX" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/machinery/firealarm/directional/east, @@ -52612,6 +52583,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/rd) +"scw" = ( +/obj/item/folder/white{ + pixel_x = 4; + pixel_y = -3 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green/half/contrasted{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "scB" = ( /obj/structure/chair/office/light, /turf/open/floor/iron/white, @@ -52847,6 +52830,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"shR" = ( +/obj/effect/turf_decal/tile/neutral, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/aft) "shV" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable, @@ -56393,6 +56381,17 @@ /obj/structure/table, /turf/open/floor/iron/dark, /area/station/security/office) +"tti" = ( +/obj/structure/table, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white, +/area/station/security/medical) "tts" = ( /obj/machinery/atmospherics/pipe/smart/simple/orange/visible, /turf/closed/wall/r_wall, @@ -56931,6 +56930,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"tDY" = ( +/obj/structure/bed/medical/emergency, +/obj/machinery/camera/directional/west{ + c_tag = "Gateway - Atrium" + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/command/gateway) "tDZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/trash/box, @@ -59076,16 +59086,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /turf/open/floor/iron/dark, /area/station/ai_monitored/security/armory) -"uoE" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/primary/starboard) "uoM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/brig{ @@ -61204,11 +61204,6 @@ "uYi" = ( /turf/open/floor/plating/airless, /area/station/solars/starboard/aft) -"uYj" = ( -/obj/effect/turf_decal/tile/neutral, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/aft) "uYl" = ( /obj/structure/chair/comfy/brown{ dir = 4 @@ -62718,17 +62713,6 @@ }, /turf/open/floor/iron/white/corner, /area/station/hallway/secondary/entry) -"vxB" = ( -/obj/structure/bed/medical/emergency, -/obj/machinery/camera/directional/west{ - c_tag = "Gateway - Atrium" - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/command/gateway) "vxC" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 10 @@ -62932,13 +62916,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden/layer5, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"vAg" = ( -/obj/effect/turf_decal/tile/red{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "vAH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -65067,6 +65044,16 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/wood, /area/station/service/library) +"wkt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/port) "wkv" = ( /obj/structure/railing{ dir = 8 @@ -67943,6 +67930,14 @@ /obj/item/pen/red, /turf/open/floor/wood, /area/station/service/lawoffice) +"xlt" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/green{ + dir = 1 + }, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "xlv" = ( /obj/machinery/airalarm/directional/south, /obj/machinery/computer/mech_bay_power_console{ @@ -68810,6 +68805,12 @@ /obj/structure/window/spawner/directional/south, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"xAF" = ( +/obj/item/kirbyplants, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "xAR" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -87211,7 +87212,7 @@ fcq jPE auh crr -dDf +wkt crr qer crr @@ -90543,7 +90544,7 @@ ksM lQf wsx dsJ -auO +qHp dtw lzD hIW @@ -92409,7 +92410,7 @@ yiJ sfA eQO xjI -iNo +dOS tSw tAH nwT @@ -94625,7 +94626,7 @@ qJi mzL hAL nRZ -pGC +tti jDf gWT vaH @@ -95700,7 +95701,7 @@ jLQ fgS jrk dhX -jLS +oIC gBD twl bcx @@ -95723,7 +95724,7 @@ nBB nbT xxU tFr -ouz +xAF eIO eIO eIO @@ -96524,7 +96525,7 @@ wnW tSw oBD iUm -eNA +eri hPk xMz xMz @@ -96973,8 +96974,8 @@ tKN lMJ dsQ mZL -jbf -nyr +scw +xlt acf hmq dJX @@ -97987,7 +97988,7 @@ lKZ dNX iVA mlK -vAg +ita dNX nyV dNX @@ -98563,7 +98564,7 @@ dXQ gmt qsx gmt -uYj +shR uzk gmt qhx @@ -100074,7 +100075,7 @@ kmZ buL pha sdp -vxB +tDY erl pbS eny @@ -104473,7 +104474,7 @@ aBX iio kjG gwf -ien +aNH mMX rhe rPA @@ -105930,7 +105931,7 @@ peF liO sSs gkM -aeA +rkf uKL uKL mKu @@ -107531,7 +107532,7 @@ tQC gsP phS huG -rnt +nWd ydS kCZ nKI @@ -107768,7 +107769,7 @@ xww xww aEr sDs -uoE +pyX obG gUe yks @@ -112657,7 +112658,7 @@ dFH ygb pEG cAj -iRw +nTD peM wUM cZw @@ -115266,7 +115267,7 @@ hbK hbK rMu xiL -iiH +exK fdZ mMK mMK diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 1351c9d8694..538b38ba037 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -557,6 +557,7 @@ /obj/machinery/mech_bay_recharge_port{ dir = 2 }, +/obj/machinery/airalarm/directional/east, /turf/open/floor/plating, /area/mine/mechbay) "di" = ( @@ -736,6 +737,7 @@ dir = 4 }, /obj/machinery/light/directional/west, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/edge{ dir = 4 }, @@ -912,6 +914,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/brown/fourcorners, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/mine/production) "fD" = ( @@ -1238,6 +1241,7 @@ /obj/structure/cable, /obj/machinery/light/directional/south, /obj/effect/turf_decal/trimline/red/filled/line, +/obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark/smooth_edge{ dir = 1 }, @@ -1346,6 +1350,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/machinery/wall_healer/directional/north, /turf/open/floor/iron/white, /area/mine/medical) "hD" = ( @@ -2016,6 +2021,7 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 1 }, +/obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark/smooth_edge, /area/mine/eva) "lh" = ( @@ -2217,6 +2223,7 @@ dir = 8 }, /obj/machinery/light/directional/east, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/mine/lounge) "lP" = ( @@ -2650,6 +2657,7 @@ /obj/structure/reagent_dispensers/watertank, /obj/effect/turf_decal/tile/brown/fourcorners, /obj/machinery/light/directional/west, +/obj/machinery/wall_healer/directional/west, /turf/open/floor/iron/dark, /area/mine/production) "nl" = ( @@ -2908,6 +2916,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark/smooth_edge{ dir = 4 }, @@ -3630,7 +3639,6 @@ /area/mine/cafeteria) "sX" = ( /obj/machinery/mechpad, -/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 }, @@ -3731,6 +3739,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/white/smooth_corner, /area/mine/medical) "tE" = ( @@ -4206,6 +4215,7 @@ /obj/effect/turf_decal/tile/bar/opposingcorners{ dir = 1 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/checker, /area/mine/cafeteria) "wr" = ( @@ -4328,6 +4338,7 @@ dir = 10 }, /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/mine/hydroponics) "xt" = ( @@ -5900,6 +5911,8 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, /turf/open/floor/iron/dark/smooth_edge{ dir = 8 }, @@ -6414,6 +6427,7 @@ /obj/item/mining_scanner, /obj/item/flashlight, /obj/item/clothing/glasses/meson, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/mine/storage/public) "Kp" = ( @@ -6558,6 +6572,7 @@ /obj/effect/turf_decal/trimline/red/filled/mid_joiner{ dir = 8 }, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark/textured_edge{ dir = 4 }, @@ -6758,6 +6773,7 @@ "Mc" = ( /obj/structure/chair/wood/wings, /obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, /turf/open/floor/carpet/neon/simple/red/nodots, /area/mine/cafeteria) "Me" = ( @@ -7349,6 +7365,7 @@ dir = 4 }, /obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron/textured_edge{ dir = 8 }, @@ -8574,7 +8591,6 @@ /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "WJ" = ( -/obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 5 @@ -8947,6 +8963,13 @@ dir = 1 }, /area/mine/laborcamp/quarters) +"YD" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/mine/production) "YF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -9034,6 +9057,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, +/obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/mine/cafeteria) "Zp" = ( @@ -49223,7 +49247,7 @@ RY RY dQ Cg -lb +YD pK Ob IL diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 0745ce5a6d4..d6250e9941a 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -1437,6 +1437,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark/textured_large, /area/station/maintenance/starboard/central) +"akP" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 5 + }, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/computer/crew{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "akT" = ( /obj/structure/sign/warning/directional/south, /obj/structure/hedge, @@ -2681,6 +2698,20 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"aun" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/structure/table/reinforced/rglass, +/obj/effect/turf_decal/trimline/blue/line, +/obj/machinery/camera/autoname/directional/north, +/obj/machinery/computer/security/telescreen/cmo/directional/north, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "aup" = ( /obj/machinery/door/airlock{ name = "Unisex Restrooms" @@ -7015,6 +7046,14 @@ }, /turf/open/floor/iron/dark/small, /area/station/engineering/atmos) +"bca" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/hedge, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "bcd" = ( /obj/structure/closet/emcloset, /obj/effect/turf_decal/delivery, @@ -13152,14 +13191,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/small, /area/station/engineering/main) -"bXO" = ( -/obj/machinery/vending/medical, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/dark/textured, -/area/station/medical/storage) "bXP" = ( /obj/machinery/door/airlock/medical{ name = "Padded Cell"; @@ -18411,23 +18442,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron, /area/station/cargo/lobby) -"cMW" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/machinery/vending/wallmed/directional/south, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 1 - }, -/obj/effect/spawner/random/maintenance, -/obj/effect/turf_decal/trimline/blue/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/abandoned) "cMY" = ( /obj/effect/turf_decal/siding/thinplating_new/dark, /obj/effect/turf_decal/trimline/green/filled/line, @@ -23712,12 +23726,6 @@ }, /turf/open/floor/iron/white/small, /area/station/science/research) -"dAN" = ( -/obj/effect/turf_decal/siding/white/corner, -/obj/effect/turf_decal/trimline/green/line, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/checker, -/area/station/hallway/primary/port) "dAO" = ( /obj/machinery/door/poddoor/shutters{ id = "teleportershutters"; @@ -26875,13 +26883,6 @@ }, /turf/open/floor/iron/white, /area/station/medical/lower) -"dZC" = ( -/obj/effect/turf_decal/siding/dark_red, -/obj/machinery/vending/wallmed/directional/north, -/obj/item/kirbyplants/random, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/dark/small, -/area/station/security/execution/transfer) "dZF" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -44363,6 +44364,20 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark/small, /area/station/ai_monitored/turret_protected/ai_upload_foyer) +"gCz" = ( +/obj/machinery/wall_healer/directional/west{ + pixel_x = -26 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/railing, +/obj/effect/turf_decal/siding, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "gCB" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -50473,6 +50488,20 @@ /obj/structure/sign/poster/official/random/directional/west, /turf/open/floor/iron/dark, /area/station/command) +"hwT" = ( +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/filled/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white, +/area/station/science/lower) "hwY" = ( /obj/structure/cable, /obj/structure/railing{ @@ -53820,22 +53849,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/chemistry) -"hWH" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/station/cargo/lower) "hWJ" = ( /obj/machinery/holopad/secure, /obj/effect/turf_decal/box/white{ @@ -54964,12 +54977,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"ifb" = ( -/obj/effect/turf_decal/trimline/yellow, -/obj/machinery/light/floor, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/dark, -/area/station/engineering/lobby) "ifj" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -55751,15 +55758,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood/large, /area/station/service/theater) -"ilC" = ( -/obj/structure/table/optable, -/obj/machinery/vending/wallmed/directional/north, -/obj/machinery/light/small/directional/north, -/obj/effect/turf_decal/siding{ - dir = 5 - }, -/turf/open/floor/iron/white/herringbone, -/area/station/command/heads_quarters/cmo) "ilH" = ( /obj/structure/table/glass, /obj/item/storage/box/syringes, @@ -62823,6 +62821,15 @@ }, /turf/open/floor/engine/hull/reinforced, /area/space/nearstation) +"jqs" = ( +/obj/structure/table/optable, +/obj/machinery/wall_healer/directional/north, +/obj/machinery/light/small/directional/north, +/obj/effect/turf_decal/siding{ + dir = 5 + }, +/turf/open/floor/iron/white/herringbone, +/area/station/command/heads_quarters/cmo) "jqy" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/catwalk_floor/iron_dark, @@ -65253,19 +65260,6 @@ /obj/machinery/atmospherics/components/binary/dp_vent_pump/high_volume/incinerator_ordmix, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) -"jGU" = ( -/obj/effect/turf_decal/siding/brown{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 1 - }, -/obj/structure/filingcabinet/white, -/obj/structure/cable, -/obj/item/radio/intercom/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark, -/area/station/cargo/office) "jGW" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67598,23 +67592,6 @@ /obj/item/stock_parts/power_store/cell/high, /turf/open/floor/iron/dark/small, /area/station/command/gateway) -"kal" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/computer/crew{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/corner{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "kam" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /obj/structure/cable, @@ -73937,12 +73914,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos) -"kSZ" = ( -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/bot_white, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark/small, -/area/station/hallway/secondary/command) "kTa" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/broken_flooring/singular/directional/east, @@ -75704,20 +75675,6 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark, /area/station/medical/virology) -"ljq" = ( -/obj/effect/turf_decal/trimline/purple/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/purple/filled/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/science/lower) "ljt" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -78210,6 +78167,17 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/supermatter/room) +"lBD" = ( +/obj/machinery/light_switch/directional/west, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/machinery/wall_healer/directional/north, +/obj/effect/turf_decal/trimline/dark_red/filled/line{ + dir = 9 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white, +/area/station/security/medical) "lBP" = ( /obj/effect/turf_decal/tile/dark_blue, /obj/effect/turf_decal/siding/dark{ @@ -81381,14 +81349,6 @@ /obj/structure/table/glass, /turf/open/floor/iron/dark/textured_edge, /area/station/security/prison) -"mdl" = ( -/obj/structure/window/reinforced/spawner/directional/south, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/structure/hedge, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "mdm" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/bot, @@ -84789,26 +84749,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"mDV" = ( -/obj/machinery/light/directional/west, -/obj/structure/bed/medical/emergency, -/obj/effect/turf_decal/bot_white{ - color = "#52B4E9" - }, -/obj/machinery/vending/wallmed/directional/west{ - pixel_x = -26 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/turf_decal/siding{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "mDW" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -97181,17 +97121,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/fore/lesser) -"ovQ" = ( -/obj/machinery/light_switch/directional/west, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/vending/wallmed/directional/north, -/obj/effect/turf_decal/trimline/dark_red/filled/line{ - dir = 9 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white, -/area/station/security/medical) "ovR" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/window/reinforced/spawner/directional/east, @@ -98596,20 +98525,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"oGT" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/brown/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/hallway/primary/fore) "oGW" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -102311,6 +102226,23 @@ }, /turf/open/floor/iron/dark/small, /area/station/maintenance/central) +"pfS" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/wall_healer/directional/south, +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/trimline/blue/filled/corner{ + dir = 1 + }, +/obj/effect/spawner/random/maintenance, +/obj/effect/turf_decal/trimline/blue/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/medical/abandoned) "pfY" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 10 @@ -107488,20 +107420,6 @@ dir = 1 }, /area/station/engineering/atmos) -"pRT" = ( -/obj/machinery/vending/wallmed/directional/west{ - pixel_x = -26 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/bot_white{ - color = "#52B4E9" - }, -/obj/structure/bed/medical/emergency, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/railing, -/obj/effect/turf_decal/siding, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "pRX" = ( /obj/structure/chair/sofa/bench/right, /turf/open/floor/glass/reinforced, @@ -111323,6 +111241,26 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/openspace, /area/station/maintenance/port/fore) +"qxn" = ( +/obj/machinery/light/directional/west, +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/bot_white{ + color = "#52B4E9" + }, +/obj/machinery/wall_healer/directional/west{ + pixel_x = -26 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "qxo" = ( /obj/structure/chair/sofa/corp/left, /obj/structure/cable, @@ -113908,6 +113846,15 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark/small, /area/station/engineering/atmos) +"qQp" = ( +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/siding/wood/corner, +/obj/structure/sign/poster/official/get_your_legs/directional/north, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "qQq" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -114917,6 +114864,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/command) +"qZF" = ( +/obj/effect/turf_decal/bot, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/dark/textured_large, +/area/station/hallway/secondary/service) "qZM" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 1 @@ -117076,6 +117029,14 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/iron/dark, /area/station/science/lower) +"rpy" = ( +/obj/machinery/vending/medical, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/dark/textured, +/area/station/medical/storage) "rpD" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/stripes/line{ @@ -117652,6 +117613,12 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter) +"rtp" = ( +/obj/effect/turf_decal/trimline/yellow, +/obj/machinery/light/floor, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/lobby) "rty" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /turf/open/floor/plating, @@ -125304,22 +125271,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lower) -"sCX" = ( -/obj/effect/turf_decal/siding/dark, -/obj/effect/turf_decal/trimline/dark_blue/filled/line, -/obj/structure/rack, -/obj/item/stack/medical/gauze, -/obj/item/stack/medical/mesh, -/obj/item/stack/medical/suture, -/obj/item/reagent_containers/syringe/epinephrine{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/reagent_containers/syringe/multiver, -/obj/machinery/vending/wallmed/directional/south, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/command/gateway) "sDa" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 8 @@ -126034,12 +125985,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/execution/education) -"sIQ" = ( -/obj/effect/turf_decal/bot, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/dark/textured_large, -/area/station/hallway/secondary/service) "sIT" = ( /obj/structure/railing/corner{ dir = 1 @@ -130020,20 +129965,6 @@ /obj/effect/turf_decal/trimline/dark/corner, /turf/open/floor/iron/dark/textured_corner, /area/station/science/genetics) -"tog" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/structure/table/reinforced/rglass, -/obj/effect/turf_decal/trimline/blue/line, -/obj/machinery/camera/autoname/directional/north, -/obj/machinery/computer/security/telescreen/cmo/directional/north, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "toh" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -133756,6 +133687,12 @@ }, /turf/open/floor/iron/textured, /area/station/hallway/primary/starboard) +"tNF" = ( +/obj/effect/turf_decal/delivery, +/obj/effect/spawner/random/vending/colavend, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "tNK" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/decal/cleanable/glass, @@ -136394,15 +136331,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/herringbone, /area/station/ai_monitored/aisat/exterior) -"ujm" = ( -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/effect/turf_decal/siding/wood/corner, -/obj/structure/sign/poster/official/get_your_legs/directional/north, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "ujo" = ( /obj/structure/table/optable, /obj/machinery/light/small/directional/north, @@ -136693,6 +136621,19 @@ /obj/structure/table/wood/fancy/black, /turf/open/floor/wood/large, /area/station/service/kitchen/diner) +"umE" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 1 + }, +/obj/structure/filingcabinet/white, +/obj/structure/cable, +/obj/item/radio/intercom/directional/north, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark, +/area/station/cargo/office) "umI" = ( /obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ @@ -137163,6 +137104,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/cargo) +"uqB" = ( +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/bot_white, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/dark/small, +/area/station/hallway/secondary/command) "uqH" = ( /obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/turf_decal/trimline/red/line{ @@ -142302,6 +142249,12 @@ /obj/effect/turf_decal/trimline/blue, /turf/open/floor/iron/white/textured, /area/station/commons/fitness/recreation/pool) +"vee" = ( +/obj/effect/turf_decal/siding/white/corner, +/obj/effect/turf_decal/trimline/green/line, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/port) "veh" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/left/directional/north, @@ -145246,12 +145199,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) -"vyK" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/spawner/random/vending/colavend, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "vyM" = ( /obj/effect/turf_decal/trimline/red/filled/warning{ dir = 4 @@ -146479,6 +146426,13 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) +"vIL" = ( +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/wall_healer/directional/north, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/north, +/turf/open/floor/iron/dark/small, +/area/station/security/execution/transfer) "vIM" = ( /obj/effect/turf_decal/siding/purple{ dir = 8 @@ -148563,6 +148517,22 @@ /obj/structure/railing, /turf/open/floor/iron/dark/textured, /area/station/engineering/engine_smes) +"waz" = ( +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/trimline/dark_blue/filled/line, +/obj/structure/rack, +/obj/item/stack/medical/gauze, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/suture, +/obj/item/reagent_containers/syringe/epinephrine{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/reagent_containers/syringe/multiver, +/obj/machinery/wall_healer/directional/south, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/command/gateway) "waE" = ( /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 @@ -157045,6 +157015,20 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) +"xrm" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/hallway/primary/fore) "xrq" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -160369,6 +160353,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/greater) +"xRb" = ( +/obj/effect/turf_decal/siding/brown{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/brown/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/station/cargo/lower) "xRc" = ( /obj/structure/table/glass, /obj/structure/window/spawner/directional/south, @@ -178213,7 +178213,7 @@ dPz rob euQ rPv -vyK +tNF tKx vdJ qgY @@ -191285,7 +191285,7 @@ fGC fGC fGC eof -ilC +jqs kEs lnD pAa @@ -197994,7 +197994,7 @@ viw gmA uWg awW -mdl +bca vyw aww pcR @@ -198202,7 +198202,7 @@ oZM oZM oZM mqG -hWH +xRb gXY osL xnF @@ -201834,7 +201834,7 @@ oyn mLr jkp seD -ljq +hwT mwq sMC upM @@ -203175,7 +203175,7 @@ sgp lbg nVK nEQ -ovQ +lBD dKQ qnH suG @@ -216253,7 +216253,7 @@ ccC ccC uak uak -tog +aun pHI tsk nUp @@ -216510,7 +216510,7 @@ gym gym gym uak -kal +akP pNr aoh vNa @@ -242989,7 +242989,7 @@ xDF ajW gGl hbN -sIQ +qZF bLu mDH xOa @@ -252241,7 +252241,7 @@ bwC vdN odr hYK -dAN +vee naa naa sax @@ -253995,7 +253995,7 @@ niR ihf kdm nkZ -bXO +rpy axH rXn pPJ @@ -255823,7 +255823,7 @@ xlX uxU iWJ ykO -cMW +pfS bwC bwC kef @@ -258371,11 +258371,11 @@ nox fVk uVd kCn -pRT +gCz jgD tDe rft -mDV +qxn pAH uVd jxl @@ -259377,7 +259377,7 @@ vyr ufN qze nhR -jGU +umE oCd wUK lbm @@ -260161,7 +260161,7 @@ tvq pxg pqa bxI -ujm +qQp mTe hLY afs @@ -262212,7 +262212,7 @@ jdi gYc tnJ aDo -oGT +xrm yhV aYc aYc @@ -262554,7 +262554,7 @@ eHT gFi eeG uWW -ifb +rtp iOj mMr cAe @@ -268202,7 +268202,7 @@ nlQ bAk uyy wYi -dZC +vIL qYy saU iaN @@ -274852,7 +274852,7 @@ xyo xWq eIH exz -kSZ +uqB eNS xjE vcF @@ -283084,7 +283084,7 @@ gJa mQG bqJ eKI -sCX +waz tUn tUn txW diff --git a/_maps/map_files/debug/gateway_test.dmm b/_maps/map_files/debug/gateway_test.dmm index d136530a07b..83c8511828f 100644 --- a/_maps/map_files/debug/gateway_test.dmm +++ b/_maps/map_files/debug/gateway_test.dmm @@ -34,7 +34,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/directional/west, /turf/open/indestructible, /area/misc/testroom/gateway_room) "j" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index cf6f7ce1f10..dfcce8dc3b2 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -425,6 +425,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"bW" = ( +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) "bZ" = ( /obj/effect/turf_decal/tile/green, /obj/effect/light_emitter/thunderdome, @@ -974,13 +979,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor, /area/centcom/central_command_areas/evacuation/ship) -"eq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/bot, -/obj/machinery/status_display/evac/directional/east, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "et" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/engineering{ @@ -1117,12 +1115,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood/tile, /area/centcom/central_command_areas/evacuation/ship) -"eY" = ( -/obj/machinery/airalarm/directional/east, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) "fa" = ( /obj/machinery/status_display/evac/directional/south, /obj/effect/turf_decal/tile/green{ @@ -2113,12 +2105,6 @@ }, /turf/open/floor/iron, /area/centcom/central_command_areas/supply) -"ju" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "jv" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -2500,6 +2486,17 @@ }, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/evacuation/ship) +"lj" = ( +/obj/structure/table/wood, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, +/obj/machinery/wall_healer/directional/north{ + use_power = 0 + }, +/obj/machinery/computer/security/telescreen/entertainment/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/admin) "ln" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -2943,11 +2940,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) -"nB" = ( -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/ferry) "nC" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security" @@ -3567,14 +3559,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) -"qn" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/supply) "qo" = ( /obj/structure/table/reinforced, /obj/item/folder, @@ -5280,6 +5264,13 @@ /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/centcom/tdome/observation) +"xI" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/bot, +/obj/machinery/status_display/evac/directional/east, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "xN" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, @@ -6929,6 +6920,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/courtroom) +"Fm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "Fo" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/sign/directions/engineering{ @@ -9220,6 +9217,14 @@ }, /turf/open/floor/iron/grimy, /area/centcom/central_command_areas/admin) +"Rm" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/supply) "Rn" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -9364,6 +9369,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) +"RT" = ( +/obj/machinery/airalarm/directional/east, +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/ferry) "RV" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs, @@ -9598,6 +9609,11 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin) +"Th" = ( +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) "Tj" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/cup/glass/bottle/whiskey{ @@ -9646,12 +9662,6 @@ }, /turf/open/floor/iron/dark, /area/centcom/tdome/observation) -"Tq" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) "Ts" = ( /obj/structure/table/reinforced, /obj/item/restraints/handcuffs/cable/zipties, @@ -9792,6 +9802,12 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/admin/storage) +"Ud" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/centcom/central_command_areas/supply) "Uf" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, @@ -9923,6 +9939,16 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/centcom/central_command_areas/admin/storage) +"UK" = ( +/obj/structure/closet/secure_closet/ert_med, +/obj/machinery/wall_healer/directional/south{ + use_power = 0 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron, +/area/centcom/central_command_areas/armory) "UM" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -10079,16 +10105,6 @@ }, /turf/open/floor/iron, /area/centcom/tdome/observation) -"Vu" = ( -/obj/structure/closet/secure_closet/ert_med, -/obj/machinery/vending/wallmed/directional/south{ - use_power = 0 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/iron, -/area/centcom/central_command_areas/armory) "Vv" = ( /obj/effect/turf_decal/siding/wideplating_new/dark{ dir = 4 @@ -10522,11 +10538,6 @@ }, /turf/open/floor/wood, /area/centcom/central_command_areas/admin) -"XA" = ( -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/supply) "XC" = ( /obj/machinery/vending/snack, /obj/effect/turf_decal/delivery, @@ -10969,17 +10980,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/centcom/central_command_areas/control) -"ZT" = ( -/obj/structure/table/wood, -/obj/item/paper_bin, -/obj/item/pen/fourcolor, -/obj/machinery/vending/wallmed/directional/north{ - use_power = 0 - }, -/obj/machinery/computer/security/telescreen/entertainment/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/centcom/central_command_areas/admin) "ZX" = ( /obj/machinery/door/airlock/centcom{ name = "CentCom Security" @@ -46625,7 +46625,7 @@ aa aa aa oe -nB +bW su ts pR @@ -46882,7 +46882,7 @@ aa aa aa mD -eY +RT sv tt PH @@ -50217,7 +50217,7 @@ iF iF iF On -ZT +lj To WX Ur @@ -50753,7 +50753,7 @@ bH bH sE sE -Vu +UK Ya aa aa @@ -51249,7 +51249,7 @@ yd GL oT FO -Tq +Ud YU Sh Ps @@ -51506,7 +51506,7 @@ hz mi pj nm -XA +Th Sx Nn yi @@ -52020,7 +52020,7 @@ os iR oJ lo -qn +Rm YU YU YU @@ -53029,8 +53029,8 @@ iS iZ Gl jq -ju -eq +Fm +xI vY jN jQ diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index a61fb71021d..816d2998012 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -6714,6 +6714,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/carpet, /area/station/commons/dorms) +"blR" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 8 + }, +/obj/machinery/door/window/elevator/right/directional/west{ + transport_linked_id = "tram_xeno_lift" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "bmp" = ( /obj/effect/turf_decal/trimline/green/corner{ dir = 1 @@ -9743,6 +9752,26 @@ /obj/machinery/vending/modularpc, /turf/open/floor/iron/white, /area/station/science/lobby) +"coa" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/corner, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/camera/directional/south{ + network = list("ss13","rd"); + c_tag = "Science - Xenobiology South" + }, +/obj/structure/closet{ + anchored = 1; + name = "Cold protection gear" + }, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/shoes/winterboots, +/obj/item/clothing/suit/hooded/wintercoat/science, +/obj/item/clothing/suit/hooded/wintercoat/science, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "coB" = ( /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/yellow/filled/line{ @@ -10506,6 +10535,13 @@ /obj/structure/thermoplastic/light, /turf/open/openspace, /area/station/hallway/primary/tram/center) +"cAb" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) "cAc" = ( /obj/structure/table, /obj/item/storage/box/beakers{ @@ -10550,10 +10586,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"cAK" = ( -/obj/machinery/light/directional/north, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) "cBo" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -10926,16 +10958,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"cHY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/components/binary/pump/off/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/station/science/xenobiology) "cHZ" = ( /obj/structure/railing, /turf/open/floor/glass/reinforced, @@ -13169,13 +13191,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/security/prison/workout) -"dwj" = ( -/obj/effect/turf_decal/trimline/brown/filled/line{ - dir = 6 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/cargo/miningdock) "dwk" = ( /obj/effect/mapping_helpers/airlock/access/all/service/general, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -14823,6 +14838,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) +"dYW" = ( +/obj/machinery/camera/directional/south{ + pixel_x = 21; + pixel_y = 0 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "dZu" = ( /obj/machinery/mecha_part_fabricator, /obj/effect/turf_decal/delivery, @@ -15199,6 +15221,19 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/lower) +"egT" = ( +/obj/item/experi_scanner{ + pixel_x = 5 + }, +/obj/item/experi_scanner, +/obj/item/experi_scanner{ + pixel_x = -5 + }, +/obj/structure/table/glass, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron/white, +/area/station/science/research) "ehd" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor/right/directional/east{ @@ -15522,13 +15557,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"enF" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "eor" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ dir = 8 @@ -15880,6 +15908,15 @@ /obj/effect/turf_decal/stripes/white/full, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"evF" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/machinery/door/window/elevator/left/directional/east{ + transport_linked_id = "tram_xeno_lift" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "evW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17865,6 +17902,24 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/station/commons/dorms) +"fhV" = ( +/obj/structure/table/glass, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/gauze, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 6 + }, +/obj/machinery/camera/directional/east{ + network = list("ss13","medbay"); + c_tag = "Medical - Treatment South-East" + }, +/obj/machinery/wall_healer/directional/east, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "fid" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/lattice/catwalk, @@ -17944,15 +17999,6 @@ }, /turf/open/floor/iron, /area/station/maintenance/tram/left) -"fjA" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 8 - }, -/obj/machinery/door/window/elevator/right/directional/west{ - transport_linked_id = "tram_xeno_lift" - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "fjN" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -18129,6 +18175,16 @@ /obj/machinery/hydroponics/soil/rich, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"fmH" = ( +/obj/structure/table/glass, +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 4 + }, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white, +/area/station/security/medical) "fmJ" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -20321,13 +20377,6 @@ /obj/machinery/air_sensor/nitrous_tank, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) -"gdz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/secondary/entry) "gdC" = ( /obj/machinery/door/airlock{ name = "Private Stall 2"; @@ -20438,19 +20487,6 @@ /obj/structure/fluff/iced_abductor, /turf/open/misc/asteroid/airless, /area/station/asteroid) -"gfY" = ( -/obj/item/experi_scanner{ - pixel_x = 5 - }, -/obj/item/experi_scanner, -/obj/item/experi_scanner{ - pixel_x = -5 - }, -/obj/structure/table/glass, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron/white, -/area/station/science/research) "gga" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Server Room" @@ -20563,6 +20599,35 @@ }, /turf/open/floor/plating, /area/station/maintenance/tram/mid) +"gib" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) +"gie" = ( +/obj/effect/turf_decal/siding/thinplating_new{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/table, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 8; + pixel_y = 9 + }, +/obj/item/mmi{ + pixel_x = -1; + pixel_y = 5 + }, +/obj/item/stock_parts/power_store/cell/high{ + pixel_x = 8; + pixel_y = -2 + }, +/turf/open/floor/iron, +/area/station/science/explab) "gij" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -21162,6 +21227,11 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"gsN" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/status_display/evac/directional/south, +/turf/open/floor/carpet, +/area/station/medical/psychology) "gsO" = ( /obj/structure/railing/corner{ dir = 8 @@ -21343,6 +21413,14 @@ /obj/effect/turf_decal/trimline/tram/corner, /turf/open/floor/iron, /area/station/hallway/primary/tram/left) +"gwe" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 9 + }, +/obj/machinery/computer/crew, +/obj/machinery/newscaster/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "gwy" = ( /obj/structure/sign/warning/no_smoking{ pixel_x = -28 @@ -22212,21 +22290,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/maintenance/central/lesser) -"gNr" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/table/glass, -/obj/item/storage/box/monkeycubes{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/storage/box/monkeycubes{ - pixel_x = 6; - pixel_y = 4 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "gNy" = ( /turf/open/floor/iron/dark/herringbone, /area/station/commons/vacant_room) @@ -23608,6 +23671,11 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"hnu" = ( +/obj/effect/turf_decal/trimline/purple/filled/line, +/obj/machinery/processor/slime, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "hnH" = ( /obj/machinery/newscaster/directional/north, /turf/open/floor/wood/large, @@ -23636,13 +23704,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/surgery/aft) -"hox" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "hoA" = ( /obj/effect/landmark/firealarm_sanity, /turf/open/openspace, @@ -24516,28 +24577,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /turf/open/floor/plating, /area/station/engineering/atmos) -"hIY" = ( -/obj/effect/turf_decal/siding/thinplating_new{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/table, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 8; - pixel_y = 9 - }, -/obj/item/mmi{ - pixel_x = -1; - pixel_y = 5 - }, -/obj/item/stock_parts/power_store/cell/high{ - pixel_x = 8; - pixel_y = -2 - }, -/turf/open/floor/iron, -/area/station/science/explab) "hJa" = ( /obj/structure/table, /obj/item/electronics/apc, @@ -24769,6 +24808,11 @@ /obj/machinery/light/floor, /turf/open/floor/engine/air, /area/station/engineering/atmos) +"hNM" = ( +/obj/machinery/light/small/dim/directional/south, +/obj/machinery/camera/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) "hNR" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /obj/structure/disposalpipe/segment{ @@ -26077,6 +26121,25 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"inC" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/machinery/camera/directional/east{ + network = list("ss13","medbay"); + c_tag = "Medical - Surgery B" + }, +/obj/machinery/wall_healer/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 2 + }, +/obj/machinery/light_switch/directional/east{ + pixel_x = 22; + pixel_y = -9 + }, +/turf/open/floor/iron/white, +/area/station/medical/surgery/aft) "inK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Recreation Area Maintenance Access" @@ -27544,14 +27607,6 @@ }, /turf/open/floor/iron, /area/station/security/prison) -"iPT" = ( -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/cafeteria, -/area/station/commons/dorms/laundry) "iQC" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/sorting/mail/flip{ @@ -27567,22 +27622,6 @@ /obj/machinery/atmospherics/pipe/bridge_pipe/yellow/visible, /turf/open/floor/iron, /area/station/engineering/atmos) -"iQG" = ( -/obj/machinery/button/elevator/directional/north{ - id = "tram_xeno_lift" - }, -/obj/machinery/lift_indicator/directional/north{ - linked_elevator_id = "tram_xeno_lift" - }, -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 5 - }, -/obj/machinery/light/directional/north, -/obj/machinery/door/window/elevator/left/directional/east{ - transport_linked_id = "tram_xeno_lift" - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "iQH" = ( /obj/machinery/computer/security/mining{ dir = 1 @@ -27658,6 +27697,16 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/aisat_interior) +"iSr" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/components/binary/pump/off/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/xenobiology) "iSt" = ( /obj/structure/table/wood, /obj/item/staff/broom, @@ -27992,6 +28041,10 @@ /obj/machinery/light/small/dim/directional/north, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/left) +"iYh" = ( +/obj/machinery/light/directional/north, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) "iYv" = ( /obj/structure/chair/office/light{ dir = 4 @@ -28707,6 +28760,15 @@ }, /turf/open/space/basic, /area/space/nearstation) +"jjJ" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/computer/records/medical, +/obj/machinery/light/cold/directional/north, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "jjM" = ( /obj/structure/railing/corner/end/flip{ dir = 8 @@ -29080,6 +29142,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"jpD" = ( +/obj/structure/closet/secure_closet/exile, +/obj/effect/turf_decal/bot, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/command/gateway) "jpR" = ( /obj/structure/cable/multilayer/multiz, /obj/effect/turf_decal/stripes/line{ @@ -29231,6 +29299,24 @@ }, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"jsn" = ( +/obj/structure/rack, +/obj/structure/table, +/obj/machinery/computer/security/telescreen/test_chamber/directional/north, +/obj/item/grenade/chem_grenade{ + pixel_x = -7; + pixel_y = 7 + }, +/obj/item/grenade/chem_grenade{ + pixel_x = -7; + pixel_y = 1 + }, +/obj/item/storage/box/beakers{ + pixel_x = 5; + pixel_y = 3 + }, +/turf/open/floor/iron/dark, +/area/station/science/explab) "jst" = ( /obj/machinery/airalarm/directional/east, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ @@ -29728,6 +29814,14 @@ /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron, /area/station/security/checkpoint/medical) +"jzR" = ( +/obj/machinery/vending/cigarette, +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 5 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/engineering/break_room) "jzW" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 @@ -29788,22 +29882,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/port/central) -"jAo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/structure/reagent_dispensers/watertank, -/obj/item/extinguisher{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/extinguisher, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "jAt" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, @@ -30096,12 +30174,6 @@ }, /turf/open/space/openspace, /area/station/solars/starboard/fore) -"jGx" = ( -/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "jGD" = ( /obj/structure/chair{ dir = 1 @@ -31072,18 +31144,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/morgue) -"jYd" = ( -/obj/machinery/duct, -/obj/effect/turf_decal/trimline/neutral/filled/line, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "jYe" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -31822,6 +31882,27 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/cargo/miningdock) +"kir" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + name = "Research and Development Shutter"; + dir = 8; + id = "rndlab1" + }, +/obj/machinery/door/firedoor, +/obj/machinery/door/window/left/directional/east{ + name = "Research Lab Desk"; + req_access = list("science") + }, +/obj/effect/turf_decal/tile/purple/fourcorners, +/obj/machinery/door/window/left/directional/west{ + name = "Robotics Desk"; + req_access = list("robotics") + }, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/science/lab) "kis" = ( /obj/machinery/computer/atmos_alert/station_only{ dir = 8 @@ -32278,6 +32359,18 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/checkpoint/science) +"kpx" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/box/red, +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "kpC" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -32864,12 +32957,6 @@ }, /turf/open/space/openspace, /area/space) -"kza" = ( -/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "kzg" = ( /obj/structure/table, /obj/machinery/recharger, @@ -34320,6 +34407,20 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/command/meeting_room) +"kWc" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east{ + areastring = "/area/station/science/ordnance/burnchamber" + }, +/obj/structure/sign/warning/hot_temp/directional/south, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "kWd" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -34489,12 +34590,11 @@ /turf/open/floor/iron/white, /area/station/science/lower) "kZa" = ( -/obj/machinery/camera/directional/south{ - pixel_x = 21; - pixel_y = 0 +/obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ + dir = 8 }, -/turf/open/floor/engine, -/area/station/science/xenobiology) +/turf/open/floor/iron/white, +/area/station/science/ordnance) "kZh" = ( /turf/open/floor/eighties/red, /area/station/commons/fitness/recreation/entertainment) @@ -35661,6 +35761,10 @@ /obj/machinery/light/cold/directional/west, /turf/open/floor/iron, /area/station/medical/virology) +"luo" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply, +/turf/closed/wall, +/area/station/science/ordnance) "luy" = ( /obj/machinery/newscaster/directional/west, /turf/open/floor/iron/dark, @@ -35818,15 +35922,6 @@ }, /turf/open/floor/engine/plasma, /area/station/engineering/atmos) -"lxd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "lxi" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/structure/cable, @@ -35983,11 +36078,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"lyQ" = ( -/obj/effect/turf_decal/trimline/purple/filled/line, -/obj/machinery/processor/slime, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "lyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -36479,6 +36569,22 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"lHt" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/structure/reagent_dispensers/watertank, +/obj/item/extinguisher{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/extinguisher, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "lHu" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 1 @@ -37175,10 +37281,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/safe) -"lTo" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply, -/turf/closed/wall, -/area/station/science/ordnance) "lTs" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/starboard/fore) @@ -37580,14 +37682,6 @@ }, /turf/open/floor/iron, /area/station/commons/dorms) -"mad" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/computer/records/medical, -/obj/machinery/light/cold/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "mai" = ( /obj/machinery/holopad, /obj/effect/landmark/start/scientist, @@ -38273,6 +38367,18 @@ /obj/effect/landmark/atmospheric_sanity/mark_all_station_areas_as_goal, /turf/open/space/basic, /area/space) +"mmt" = ( +/obj/structure/table/reinforced, +/obj/item/reagent_containers/cup/glass/coffee{ + pixel_x = 8; + pixel_y = 4 + }, +/obj/item/radio/intercom/directional/west, +/obj/item/storage/medkit/regular{ + pixel_x = -6 + }, +/turf/open/floor/iron, +/area/station/command/bridge) "mmv" = ( /obj/structure/table/glass, /obj/item/folder/red, @@ -38586,11 +38692,6 @@ /obj/machinery/teleport/hub, /turf/open/floor/circuit, /area/station/command/teleporter) -"msF" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/status_display/evac/directional/south, -/turf/open/floor/carpet, -/area/station/medical/psychology) "msS" = ( /turf/open/openspace, /area/station/maintenance/solars/port) @@ -38718,6 +38819,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/brig) +"mwj" = ( +/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "mwt" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/oxygen_input{ dir = 1 @@ -39911,12 +40018,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/storage) -"mVN" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/on{ - dir = 4 - }, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) "mVS" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/door/window/left/directional/west{ @@ -41330,10 +41431,6 @@ /obj/effect/landmark/navigate_destination/chemfactory, /turf/open/floor/iron/white, /area/station/medical/chemistry) -"nuu" = ( -/obj/machinery/portable_atmospherics/canister/nitrous_oxide, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "nuw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -43406,6 +43503,16 @@ }, /turf/open/floor/iron, /area/station/science/robotics/mechbay) +"ogk" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + pixel_x = 21; + pixel_y = 0 + }, +/turf/open/floor/engine, +/area/station/science/xenobiology) "ogt" = ( /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs{ @@ -43688,17 +43795,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/service/library) -"ols" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/structure/bed/medical/emergency, -/obj/machinery/camera/directional/south{ - network = list("ss13","medbay"); - c_tag = "Medical - Lobby" - }, -/obj/effect/turf_decal/bot, -/obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "olG" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 5 @@ -43949,6 +44045,14 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/plating, /area/station/engineering/atmos) +"orm" = ( +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/cafeteria, +/area/station/commons/dorms/laundry) "orQ" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 @@ -44361,6 +44465,13 @@ }, /turf/open/floor/engine, /area/station/science/ordnance/burnchamber) +"oAp" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd","xeno"); + c_tag = "Science - Xenobiology Lower Containment Chamber" + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) "oAG" = ( /obj/effect/turf_decal/trimline/brown/filled/line, /obj/effect/turf_decal/stripes{ @@ -44655,6 +44766,24 @@ "oGJ" = ( /turf/closed/mineral/random/stationside/asteroid/porus, /area/station/medical/chemistry) +"oGK" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 6 + }, +/obj/structure/ladder, +/obj/machinery/elevator_control_panel/directional/south{ + linked_elevator_id = "tram_xeno_lift"; + pixel_x = 31; + pixel_y = -31 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "oGM" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -45521,6 +45650,21 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/morgue) +"oZt" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 4 + }, +/obj/structure/table/glass, +/obj/item/storage/box/monkeycubes{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/storage/box/monkeycubes{ + pixel_x = 6; + pixel_y = 4 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "oZA" = ( /obj/structure/chair/office{ dir = 8 @@ -47996,26 +48140,6 @@ "pQx" = ( /turf/open/misc/asteroid/dug, /area/station/science/explab) -"pQy" = ( -/obj/structure/table, -/obj/item/multitool/circuit{ - pixel_x = -7; - pixel_y = 0 - }, -/obj/item/multitool/circuit{ - pixel_x = 0; - pixel_y = 0 - }, -/obj/item/multitool/circuit{ - pixel_x = 7; - pixel_y = 0 - }, -/obj/machinery/camera/directional/south{ - network = list("ss13","rd"); - c_tag = "Science - Testing Lab" - }, -/turf/open/floor/iron, -/area/station/science/explab) "pQF" = ( /obj/structure/table, /obj/machinery/reagentgrinder, @@ -48131,15 +48255,6 @@ /obj/structure/sign/departments/evac/directional/east, /turf/open/floor/iron, /area/station/hallway/secondary/exit) -"pUi" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/machinery/door/window/elevator/left/directional/east{ - transport_linked_id = "tram_xeno_lift" - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "pUj" = ( /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 10 @@ -49294,12 +49409,6 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/ce) -"qpb" = ( -/obj/structure/closet/secure_closet/exile, -/obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/command/gateway) "qpj" = ( /obj/structure/chair/stool/bar/directional/east, /obj/effect/landmark/start/prisoner, @@ -49426,13 +49535,6 @@ }, /turf/open/floor/catwalk_floor, /area/station/hallway/secondary/exit) -"qrW" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "qsa" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -50139,6 +50241,26 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/commons/storage/art) +"qEh" = ( +/obj/structure/table, +/obj/item/multitool/circuit{ + pixel_x = -7; + pixel_y = 0 + }, +/obj/item/multitool/circuit{ + pixel_x = 0; + pixel_y = 0 + }, +/obj/item/multitool/circuit{ + pixel_x = 7; + pixel_y = 0 + }, +/obj/machinery/camera/directional/south{ + network = list("ss13","rd"); + c_tag = "Science - Testing Lab" + }, +/turf/open/floor/iron, +/area/station/science/explab) "qEl" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 @@ -50149,6 +50271,13 @@ "qEH" = ( /turf/closed/wall, /area/station/solars/port) +"qEU" = ( +/obj/effect/turf_decal/siding/thinplating/dark, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/dark, +/area/station/hallway/secondary/exit/departure_lounge) "qFf" = ( /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 8 @@ -50206,11 +50335,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/smooth, /area/station/maintenance/disposal) -"qHa" = ( -/obj/machinery/light/directional/east, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "qHe" = ( /obj/machinery/camera/directional/north{ c_tag = "Secure - Gateway" @@ -50308,13 +50432,6 @@ }, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"qIf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 - }, -/obj/machinery/computer/crew, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "qIq" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/machinery/light/directional/west, @@ -51047,18 +51164,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"qWf" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/item/radio/intercom/directional/east, -/obj/effect/turf_decal/box/red, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "qWy" = ( /obj/item/kirbyplants/random, /obj/machinery/newscaster/directional/south, @@ -51525,24 +51630,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rdJ" = ( -/obj/structure/table/glass, -/obj/item/stack/medical/mesh, -/obj/item/stack/medical/gauze, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 - }, -/obj/machinery/camera/directional/east{ - network = list("ss13","medbay"); - c_tag = "Medical - Treatment South-East" - }, -/obj/machinery/vending/wallmed/directional/east, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "rdN" = ( /obj/machinery/mech_bay_recharge_port{ dir = 1 @@ -51623,10 +51710,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal/incinerator) -"rfi" = ( -/obj/machinery/camera/directional/north, -/turf/open/floor/engine, -/area/station/science/xenobiology) "rfQ" = ( /obj/effect/turf_decal/trimline/green/filled/line{ dir = 6 @@ -52039,6 +52122,10 @@ "rmB" = ( /turf/closed/wall/r_wall, /area/station/command/heads_quarters/hos) +"rmG" = ( +/obj/machinery/portable_atmospherics/canister/nitrous_oxide, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) "rmH" = ( /obj/item/radio/intercom/directional/west, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -52235,26 +52322,6 @@ /obj/effect/mapping_helpers/airlock/locked, /turf/open/floor/catwalk_floor, /area/station/hallway/primary/tram/center) -"roQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/corner, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera/directional/south{ - network = list("ss13","rd"); - c_tag = "Science - Xenobiology South" - }, -/obj/structure/closet{ - anchored = 1; - name = "Cold protection gear" - }, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/shoes/winterboots, -/obj/item/clothing/suit/hooded/wintercoat/science, -/obj/item/clothing/suit/hooded/wintercoat/science, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "roR" = ( /turf/closed/wall, /area/station/science/breakroom) @@ -53285,20 +53352,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/commons/vacant_room) -"rLG" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east{ - areastring = "/area/station/science/ordnance/burnchamber" - }, -/obj/structure/sign/warning/hot_temp/directional/south, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "rLP" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -53442,14 +53495,6 @@ }, /turf/open/floor/iron, /area/station/science/lab) -"rNW" = ( -/obj/machinery/vending/cigarette, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 5 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/engineering/break_room) "rOh" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 @@ -53566,11 +53611,6 @@ }, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"rPv" = ( -/obj/machinery/light/small/dim/directional/south, -/obj/machinery/camera/directional/south, -/turf/open/floor/engine, -/area/station/science/xenobiology) "rPH" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -54575,25 +54615,6 @@ dir = 4 }, /area/station/service/theater) -"siE" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/camera/directional/east{ - network = list("ss13","medbay"); - c_tag = "Medical - Surgery B" - }, -/obj/machinery/vending/wallmed/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 2 - }, -/obj/machinery/light_switch/directional/east{ - pixel_x = 22; - pixel_y = -9 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery/aft) "siF" = ( /obj/machinery/bouldertech/refinery, /obj/machinery/conveyor{ @@ -54987,18 +55008,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/starboard/greater) -"sob" = ( -/obj/structure/table/reinforced, -/obj/item/reagent_containers/cup/glass/coffee{ - pixel_x = 8; - pixel_y = 4 - }, -/obj/item/radio/intercom/directional/west, -/obj/item/storage/medkit/advanced{ - pixel_x = -6 - }, -/turf/open/floor/iron, -/area/station/command/bridge) "soe" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -55462,27 +55471,6 @@ }, /turf/open/floor/carpet, /area/station/commons/vacant_room/office) -"sva" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - name = "Research and Development Shutter"; - dir = 8; - id = "rndlab1" - }, -/obj/machinery/door/firedoor, -/obj/machinery/door/window/left/directional/east{ - name = "Research Lab Desk"; - req_access = list("science") - }, -/obj/effect/turf_decal/tile/purple/fourcorners, -/obj/machinery/door/window/left/directional/west{ - name = "Robotics Desk"; - req_access = list("robotics") - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/science/lab) "svc" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -55963,6 +55951,12 @@ /obj/machinery/telecomms/broadcaster/preset_right, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"sFI" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply{ + dir = 9 + }, +/turf/closed/wall/r_wall, +/area/station/science/ordnance) "sGb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -57341,6 +57335,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"tfi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 5 + }, +/obj/item/stack/medical/mesh, +/obj/item/stack/medical/gauze, +/obj/structure/table/glass, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "tfp" = ( /obj/structure/railing, /obj/effect/turf_decal/siding/thinplating{ @@ -58253,12 +58257,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"twv" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/station/science/ordnance) "twz" = ( /turf/open/openspace, /area/station/hallway/secondary/entry) @@ -58334,6 +58332,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/iron, /area/station/hallway/primary/tram/right) +"txu" = ( +/obj/structure/filingcabinet/white, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/effect/turf_decal/tile/brown/fourcorners, +/turf/open/floor/iron, +/area/station/cargo/sorting) "txv" = ( /obj/item/book/bible, /obj/structure/altar/of_gods, @@ -58446,6 +58450,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"tzk" = ( +/obj/machinery/camera/directional/north, +/turf/open/floor/engine, +/area/station/science/xenobiology) "tzq" = ( /obj/structure/disposaloutlet{ dir = 4 @@ -58759,13 +58767,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/chapel/office) -"tEx" = ( -/obj/machinery/camera/directional/north{ - network = list("ss13","rd","xeno"); - c_tag = "Science - Xenobiology Lower Containment Chamber" - }, -/turf/open/floor/engine/xenobio, -/area/station/science/xenobiology) "tED" = ( /obj/effect/turf_decal/tile/neutral/tram, /obj/effect/turf_decal/stripes/white/line, @@ -59754,16 +59755,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"tWO" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 4 - }, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white, -/area/station/security/medical) "tWX" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 1 @@ -59950,6 +59941,22 @@ "uax" = ( /turf/open/floor/iron, /area/station/cargo/storage) +"uaG" = ( +/obj/machinery/button/elevator/directional/north{ + id = "tram_xeno_lift" + }, +/obj/machinery/lift_indicator/directional/north{ + linked_elevator_id = "tram_xeno_lift" + }, +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 5 + }, +/obj/machinery/light/directional/north, +/obj/machinery/door/window/elevator/left/directional/east{ + transport_linked_id = "tram_xeno_lift" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "uaJ" = ( /obj/machinery/computer/mechpad, /turf/open/floor/iron, @@ -60085,15 +60092,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"udg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/chair/office/light{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/science/explab) "udk" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -60250,6 +60248,18 @@ /obj/machinery/chem_master, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"ufH" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/structure/bed/medical/emergency, +/obj/machinery/camera/directional/south{ + network = list("ss13","medbay"); + c_tag = "Medical - Lobby" + }, +/obj/effect/turf_decal/bot, +/obj/effect/landmark/start/hangover, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "ufM" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/shower/directional/west, @@ -60359,6 +60369,15 @@ "uid" = ( /turf/open/floor/eighties, /area/station/commons/fitness/recreation/entertainment) +"uig" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/chair/office/light{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/science/explab) "uip" = ( /obj/structure/closet/secure_closet/brig{ name = "Medical Cell Locker"; @@ -60888,13 +60907,6 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/ai_monitored/turret_protected/aisat/foyer) -"upf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/directional/south, -/turf/open/floor/engine, -/area/station/science/xenobiology) "upj" = ( /obj/effect/turf_decal/trimline/yellow/filled/line, /obj/item/radio/intercom/directional/south, @@ -61482,6 +61494,13 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) +"uyF" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/secondary/entry) "uyJ" = ( /turf/open/floor/iron, /area/station/security/prison/workout) @@ -62203,6 +62222,15 @@ "uIt" = ( /turf/closed/wall, /area/station/security/evidence) +"uIx" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "uIG" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62688,13 +62716,6 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/cargo/miningdock/cafeteria) -"uRW" = ( -/obj/effect/turf_decal/siding/thinplating/dark, -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/dark, -/area/station/hallway/secondary/exit/departure_lounge) "uSe" = ( /obj/structure/cable, /turf/open/floor/iron, @@ -62940,26 +62961,6 @@ /obj/item/pen, /turf/open/floor/iron/grimy, /area/station/service/library/lounge) -"uXn" = ( -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, -/obj/machinery/camera/directional/south{ - network = list("ss13","rd"); - c_tag = "Science - Mixing Lab" - }, -/obj/machinery/airalarm/directional/south, -/obj/effect/mapping_helpers/airalarm/mixingchamber_access, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airalarm/tlv_no_checks, -/obj/effect/mapping_helpers/airalarm/link{ - chamber_id = "ordnanceburn" - }, -/obj/machinery/computer/atmos_control/ordnancemix{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/science/ordnance) "uXr" = ( /obj/structure/table, /obj/item/stack/cable_coil{ @@ -63900,6 +63901,13 @@ }, /turf/open/floor/wood/large, /area/station/service/theater) +"vmi" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/engine, +/area/station/science/xenobiology) "vml" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -64155,12 +64163,6 @@ }, /turf/open/floor/iron/white, /area/station/science/ordnance/office) -"vro" = ( -/obj/structure/filingcabinet/white, -/obj/structure/window/reinforced/spawner/directional/east, -/obj/effect/turf_decal/tile/brown/fourcorners, -/turf/open/floor/iron, -/area/station/cargo/sorting) "vrq" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -64717,15 +64719,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) -"vBl" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 4 - }, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/light/directional/east, -/obj/machinery/smartfridge/extract/preloaded, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "vBn" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65029,6 +65022,18 @@ }, /turf/open/floor/engine/n2o, /area/station/engineering/atmos) +"vFV" = ( +/obj/machinery/duct, +/obj/effect/turf_decal/trimline/neutral/filled/line, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "vGc" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -65506,16 +65511,6 @@ /obj/machinery/telecomms/server/presets/supply, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) -"vOW" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/directional/north{ - pixel_x = 21; - pixel_y = 0 - }, -/turf/open/floor/engine, -/area/station/science/xenobiology) "vPg" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 1 @@ -65850,6 +65845,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/service/lawoffice) +"vVY" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 6 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/cargo/miningdock) "vWk" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/window/left/directional/east{ @@ -65894,22 +65896,13 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"vWT" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/door/firedoor/border_only{ - dir = 4 - }, +"vXJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 6 - }, -/obj/structure/ladder, -/obj/machinery/elevator_control_panel/directional/south{ - linked_elevator_id = "tram_xeno_lift"; - pixel_x = 31; - pixel_y = -31 + dir = 4 }, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/light/directional/east, +/obj/machinery/smartfridge/extract/preloaded, /turf/open/floor/iron/white, /area/station/science/xenobiology) "vXL" = ( @@ -66065,6 +66058,12 @@ /obj/machinery/computer/records/medical, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"waF" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/on{ + dir = 4 + }, +/turf/open/floor/engine/xenobio, +/area/station/science/xenobiology) "waV" = ( /obj/effect/turf_decal/trimline/neutral/filled/line{ dir = 4 @@ -66833,13 +66832,6 @@ /obj/machinery/light/floor, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"wpr" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/storage) "wpH" = ( /obj/effect/turf_decal/trimline/neutral/filled/corner{ dir = 8 @@ -66938,24 +66930,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) -"wrz" = ( -/obj/structure/rack, -/obj/structure/table, -/obj/machinery/computer/security/telescreen/test_chamber/directional/north, -/obj/item/grenade/chem_grenade{ - pixel_x = -7; - pixel_y = 7 - }, -/obj/item/grenade/chem_grenade{ - pixel_x = -7; - pixel_y = 1 - }, -/obj/item/storage/box/beakers{ - pixel_x = 5; - pixel_y = 3 - }, -/turf/open/floor/iron/dark, -/area/station/science/explab) "wrJ" = ( /obj/structure/railing{ dir = 4 @@ -67031,6 +67005,16 @@ /obj/machinery/light/cold/directional/north, /turf/open/floor/iron, /area/station/commons/dorms) +"wtm" = ( +/obj/effect/turf_decal/trimline/purple/filled/line{ + dir = 9 + }, +/obj/machinery/light/directional/north, +/obj/machinery/door/window/elevator/right/directional/west{ + transport_linked_id = "tram_xeno_lift" + }, +/turf/open/floor/iron/white, +/area/station/science/xenobiology) "wts" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 @@ -67748,6 +67732,26 @@ }, /turf/open/floor/iron, /area/station/command/teleporter) +"wFd" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/obj/machinery/camera/directional/south{ + network = list("ss13","rd"); + c_tag = "Science - Mixing Lab" + }, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/mixingchamber_access, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airalarm/tlv_no_checks, +/obj/effect/mapping_helpers/airalarm/link{ + chamber_id = "ordnanceburn" + }, +/obj/machinery/computer/atmos_control/ordnancemix{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/science/ordnance) "wFf" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -67997,6 +68001,11 @@ dir = 1 }, /area/station/command/bridge) +"wJA" = ( +/obj/machinery/light/directional/east, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/storage) "wJF" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70072,12 +70081,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"xAM" = ( -/obj/machinery/atmospherics/pipe/smart/simple/supply{ - dir = 6 - }, -/turf/closed/wall/r_wall, -/area/station/science/ordnance/burnchamber) "xAR" = ( /obj/machinery/door/airlock/security{ name = "Prison Workshop" @@ -70189,16 +70192,6 @@ /obj/effect/turf_decal/trimline/neutral/filled/line, /turf/open/floor/iron, /area/station/hallway/primary/tram/center) -"xCr" = ( -/obj/effect/turf_decal/trimline/purple/filled/line{ - dir = 9 - }, -/obj/machinery/light/directional/north, -/obj/machinery/door/window/elevator/right/directional/west{ - transport_linked_id = "tram_xeno_lift" - }, -/turf/open/floor/iron/white, -/area/station/science/xenobiology) "xCs" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, @@ -70452,16 +70445,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/construction/mining/aux_base) -"xKf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/item/stack/medical/mesh, -/obj/item/stack/medical/gauze, -/obj/structure/table/glass, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "xKt" = ( /turf/closed/wall/r_wall, /area/station/maintenance/solars/port) @@ -71231,6 +71214,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"xYQ" = ( +/obj/machinery/atmospherics/pipe/smart/simple/supply{ + dir = 6 + }, +/turf/closed/wall/r_wall, +/area/station/science/ordnance/burnchamber) "xYZ" = ( /mob/living/basic/bot/cleanbot, /obj/effect/turf_decal/stripes/line{ @@ -103511,7 +103500,7 @@ snQ iRL oXU gRY -jYd +vFV cWZ cWZ lbL @@ -104574,7 +104563,7 @@ fal aks lJv ulV -rNW +jzR rsz sjM unn @@ -115395,7 +115384,7 @@ rwb qVr bfH bfH -upf +vmi qVr aaa aaa @@ -116158,7 +116147,7 @@ oNT dUT gdC qVr -rfi +tzk oxe ahk hdA @@ -116172,7 +116161,7 @@ sml bfH bfH oxe -upf +vmi qVr aaa aaa @@ -116934,8 +116923,8 @@ mBm dHc pYZ aqB -vBl -gNr +vXJ +oZt lym pph aet @@ -117195,11 +117184,11 @@ jiQ asv asv jiQ -iQG +uaG uHF hjM tjP -roQ +coa qVr qVr qVr @@ -117447,7 +117436,7 @@ qVr qCW whn xcM -lyQ +hnu asv mln tjz @@ -117717,7 +117706,7 @@ eGt bql bfH bfH -rPv +hNM qVr aaa aaa @@ -118164,7 +118153,7 @@ uGW uGW njI kjN -dwj +vVY qxm iLu oys @@ -118223,11 +118212,11 @@ jiQ asv asv jiQ -xCr +wtm gJY coM bgH -jAo +lHt qVr qVr qVr @@ -118731,7 +118720,7 @@ qVr qVr kkx cJP -lxd +uIx mLE dGs dGs @@ -119242,7 +119231,7 @@ ebs hFH tYB qVr -vOW +ogk oxe bfH bfH @@ -119256,7 +119245,7 @@ uAF ahk hdA oxe -kZa +dYW qVr aaa aaa @@ -119481,7 +119470,7 @@ cJS nhj cVU oRz -pQy +qEh sQZ nhj prI @@ -119736,7 +119725,7 @@ owO owO cJS rKD -udg +uig cFW cFW nEB @@ -119992,8 +119981,8 @@ sQZ sQZ sQZ sQZ -wrz -hIY +jsn +gie tVK vIF yeZ @@ -120019,7 +120008,7 @@ bOi dUT aaa qVr -vOW +ogk bfH bfH qVr @@ -123090,13 +123079,13 @@ dhM pUC fXK lyC -wpr -hox +gib +cAb dfz vqO edP edP -uXn +wFd hBl hBl gkD @@ -123347,8 +123336,8 @@ wrn ure bKT bqU -qHa -nuu +wJA +rmG dfz uCz wRv @@ -123866,8 +123855,8 @@ lkK aeg gPB qOo -kza -jGx +mwj +kZa aej oAn aej @@ -124123,9 +124112,9 @@ qjp frV xwi vJC -qWf -rLG -xAM +kpx +kWc +xYQ eOZ gkD gkD @@ -124381,8 +124370,8 @@ frV frT ryK jLH -lTo -twv +luo +sFI aaa aaa aaa @@ -148503,7 +148492,7 @@ dFP dFP dFP dFP -gdz +uyF dFP ste mtr @@ -151814,7 +151803,7 @@ dTL mjM kBO tBO -tWO +fmH qZy run ayR @@ -153108,7 +153097,7 @@ yji rbT ndP pwm -qpb +jpD hAv dxC bsP @@ -154921,7 +154910,7 @@ aQO gPA hbV dbJ -sob +mmt eSH wJy xgZ @@ -155456,7 +155445,7 @@ lyx rIg qIs fSr -iPT +orm rVp rVp vgZ @@ -167033,7 +167022,7 @@ lWu tTN net xRx -siE +inC hsh gnM apC @@ -169591,9 +169580,9 @@ sSt jEK eoE xck -ols +ufH wyd -enF +dyI aHP aKq aKP @@ -170621,7 +170610,7 @@ rks rks wyd wyd -qrW +dyI gMT uHB jtr @@ -170632,7 +170621,7 @@ qDF uwk oXz gNE -rdJ +fhV jtr jtr jtr @@ -170877,7 +170866,7 @@ eSz eSz eSz qNI -qIf +gwe lEL qPd iTt @@ -171134,7 +171123,7 @@ eSz eSz eSz qNI -mad +jjJ jVw qPd jVw @@ -171391,7 +171380,7 @@ fWX eSz eSz qNI -xKf +tfi pps sqT sTF @@ -172943,7 +172932,7 @@ rcD nPe nPe nPe -msF +gsN ugt aNa gCI @@ -182187,7 +182176,7 @@ vnu sRZ oxL wwP -sva +kir wwP wwP wwP @@ -182469,7 +182458,7 @@ tBo tBo qVr gYw -cHY +iSr aLR sjT xfL @@ -182720,8 +182709,8 @@ pbH mAL nKU qVr -tEx -mVN +oAp +waF tBo tBo qVr @@ -182731,8 +182720,8 @@ itq qyQ qyQ gun -pUi -vWT +evF +oGK qVr aaa aaa @@ -183234,7 +183223,7 @@ qKE chE pHX qVr -cAK +iYh ttj hLj ttj @@ -183759,7 +183748,7 @@ ecg rUh rUh wAs -fjA +blR aDn qVr aaa @@ -184987,7 +184976,7 @@ lmZ noc aBg jur -vro +txu ipm fur pMd @@ -185279,7 +185268,7 @@ dpB nZO kvt wtw -gfY +egT syv hrh ieV @@ -189375,7 +189364,7 @@ kIo kIo qSm orX -uRW +qEU fmy aac aac diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index fcdeca02178..a0574691242 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -3933,16 +3933,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/command/bridge) -"brQ" = ( -/obj/effect/turf_decal/trimline/blue/arrow_ccw{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay/lobby) "brS" = ( /obj/effect/turf_decal/tile/dark_red/opposingcorners, /obj/structure/cable, @@ -4115,18 +4105,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/herringbone, /area/station/hallway/primary/central) -"bvt" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/tank_dispenser/oxygen{ - pixel_x = -1; - pixel_y = 2 - }, -/obj/machinery/vending/wallmed/directional/south, -/obj/structure/extinguisher_cabinet/directional/east, -/turf/open/floor/iron, -/area/station/command/gateway) "bvD" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -4987,6 +4965,12 @@ "bJX" = ( /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"bKa" = ( +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/white/smooth_half{ + dir = 8 + }, +/area/station/science/xenobiology) "bKK" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/neutral{ @@ -7807,6 +7791,14 @@ dir = 8 }, /area/station/service/chapel) +"cPb" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/effect/turf_decal/siding/blue{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/south, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "cPc" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/window/reinforced/spawner/directional/north, @@ -8101,6 +8093,11 @@ /obj/machinery/light/dim/directional/south, /turf/open/floor/wood, /area/station/service/library) +"cTK" = ( +/obj/structure/cable, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/white, +/area/station/science/research) "cTX" = ( /obj/machinery/computer/crew{ dir = 1 @@ -8991,18 +8988,6 @@ /obj/machinery/meter/layer2, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"djc" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/vending/wallmed/directional/west, -/obj/structure/disposalpipe/segment, -/obj/machinery/shower/directional/east, -/obj/structure/fluff/shower_drain, -/turf/open/floor/iron/white/textured, -/area/station/medical/treatment_center) "dje" = ( /obj/structure/chair/sofa/bench/right{ dir = 8 @@ -10709,6 +10694,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/cargo/sorting) +"dMp" = ( +/obj/effect/turf_decal/trimline/yellow/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/engineering/lobby) "dMC" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -12082,6 +12077,16 @@ /obj/structure/flora/bush/fullgrass/style_random, /turf/open/floor/grass, /area/station/science/research) +"ekf" = ( +/obj/effect/turf_decal/trimline/blue/arrow_ccw{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/lobby) "eki" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -12223,16 +12228,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"emO" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/engineering/lobby) "eng" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -18021,14 +18016,6 @@ /obj/effect/landmark/start/hangover/closet, /turf/open/floor/iron/textured, /area/station/hallway/primary/central) -"gpT" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, -/obj/item/storage/medkit/advanced, -/turf/open/floor/iron/dark, -/area/station/command/bridge) "gpV" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/opposingcorners, @@ -22006,12 +21993,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"hGC" = ( -/obj/structure/filingcabinet/white, -/obj/effect/turf_decal/bot_red, -/obj/machinery/firealarm/directional/east, -/turf/open/floor/iron/textured_large, -/area/station/cargo/sorting) "hGE" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -31195,13 +31176,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/aft/upper) -"kKU" = ( -/obj/structure/ladder, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/tile/dark_green/opposingcorners, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "kLi" = ( /turf/closed/wall/mineral/plastitanium/nodiagonal, /area/station/maintenance/department/medical/central) @@ -32267,6 +32241,13 @@ /obj/machinery/portable_atmospherics/pump, /turf/open/floor/plating, /area/station/maintenance/department/medical/central) +"led" = ( +/obj/structure/ladder, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/tile/dark_green/opposingcorners, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "les" = ( /obj/machinery/door/firedoor/border_only{ dir = 1 @@ -33740,6 +33721,25 @@ "lFG" = ( /turf/open/floor/glass, /area/station/command/meeting_room) +"lFH" = ( +/obj/structure/window/spawner/directional/east, +/obj/structure/table, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -14 + }, +/obj/item/storage/medkit/regular{ + pixel_y = 5 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/structure/disposalpipe/trunk/multiz{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/white, +/area/station/security/medical) "lFK" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -36360,6 +36360,18 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"mAD" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/tank_dispenser/oxygen{ + pixel_x = -1; + pixel_y = 2 + }, +/obj/machinery/wall_healer/directional/south, +/obj/structure/extinguisher_cabinet/directional/east, +/turf/open/floor/iron, +/area/station/command/gateway) "mAF" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/mapping_helpers/airlock/access/all/engineering/general, @@ -37583,6 +37595,13 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron, /area/station/service/bar) +"mXi" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "mXj" = ( /obj/machinery/door/poddoor/shutters{ id = "warehouse"; @@ -38919,6 +38938,15 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/station/cargo/miningoffice) +"nux" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron, +/area/station/hallway/primary/central) "nuC" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -41964,13 +41992,6 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"oDo" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "oDC" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -42222,12 +42243,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/lobby) -"oHh" = ( -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/white/smooth_half{ - dir = 8 - }, -/area/station/science/xenobiology) "oHi" = ( /obj/structure/cable, /turf/open/floor/grass, @@ -42723,6 +42738,15 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/carpet/purple, /area/station/service/library) +"oPE" = ( +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8 + }, +/obj/machinery/wall_healer/directional/west, +/turf/open/floor/iron/edge{ + dir = 8 + }, +/area/station/hallway/secondary/exit/departure_lounge) "oPL" = ( /obj/item/clothing/head/chameleon/broken, /turf/open/misc/asteroid/airless, @@ -44675,6 +44699,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/station/commons/locker) +"pwB" = ( +/obj/structure/filingcabinet/white, +/obj/effect/turf_decal/bot_red, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/textured_large, +/area/station/cargo/sorting) "pwE" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 @@ -56347,13 +56377,6 @@ }, /turf/open/floor/carpet/executive, /area/station/command/heads_quarters/captain/private) -"toN" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "toT" = ( /obj/machinery/telecomms/bus/preset_two, /turf/open/floor/circuit/green/telecomms/mainframe, @@ -57448,15 +57471,6 @@ dir = 8 }, /area/station/command/meeting_room) -"tIk" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron, -/area/station/hallway/primary/central) "tIr" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -59530,6 +59544,13 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/science/robotics/lab) +"usc" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "usq" = ( /obj/effect/turf_decal/tile/red, /obj/structure/disposalpipe/junction{ @@ -63480,6 +63501,18 @@ }, /turf/open/floor/engine, /area/station/medical/chemistry) +"vQt" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/wall_healer/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/shower/directional/east, +/obj/structure/fluff/shower_drain, +/turf/open/floor/iron/white/textured, +/area/station/medical/treatment_center) "vQw" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -63492,15 +63525,6 @@ "vQB" = ( /turf/closed/wall, /area/station/cargo/boutique) -"vQR" = ( -/obj/effect/turf_decal/tile/neutral/half{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/west, -/turf/open/floor/iron/edge{ - dir = 8 - }, -/area/station/hallway/secondary/exit/departure_lounge) "vQT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -64689,14 +64713,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/central/lesser) -"wnT" = ( -/obj/structure/filingcabinet/white, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","medbay") - }, -/turf/open/floor/wood/parquet, -/area/station/medical/psychology) "wnX" = ( /obj/machinery/power/supermatter_crystal/engine, /turf/open/floor/engine, @@ -66667,6 +66683,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/main) +"wWB" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/item/storage/medkit/regular, +/turf/open/floor/iron/dark, +/area/station/command/bridge) "wWD" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -66893,14 +66917,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/disposal/incinerator) -"xas" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/machinery/vending/wallmed/directional/south, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "xay" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -68547,25 +68563,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood/parquet, /area/station/cargo/boutique) -"xCE" = ( -/obj/structure/window/spawner/directional/east, -/obj/structure/table, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -14 - }, -/obj/item/storage/medkit/regular{ - pixel_y = 5 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/disposalpipe/trunk/multiz{ - dir = 8 - }, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/white, -/area/station/security/medical) "xCI" = ( /obj/structure/broken_flooring/side/directional/east, /obj/effect/decal/cleanable/dirt/dust, @@ -68890,11 +68887,6 @@ /obj/structure/window/fulltile, /turf/open/misc/asteroid, /area/station/asteroid) -"xIR" = ( -/obj/structure/cable, -/obj/machinery/vending/wallmed/directional/north, -/turf/open/floor/iron/white, -/area/station/science/research) "xIV" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter) @@ -70320,6 +70312,14 @@ /obj/machinery/light_switch/directional/south, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"yjC" = ( +/obj/structure/filingcabinet/white, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","medbay") + }, +/turf/open/floor/wood/parquet, +/area/station/medical/psychology) "yjH" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, @@ -83248,7 +83248,7 @@ vhW wkg iyb wrU -djc +vQt ryE wrU wrU @@ -85249,7 +85249,7 @@ mmy uYI wMn cpB -xCE +lFH luz hqN eSS @@ -85796,7 +85796,7 @@ fXZ gli gli gli -oDo +usc gli gli hgi @@ -88614,7 +88614,7 @@ sUn kRM wBw rKW -hGC +pwB uWl iDs fad @@ -88903,7 +88903,7 @@ qfB fPs gpF avU -brQ +ekf vFH crg lwI @@ -91449,7 +91449,7 @@ bAw aYQ wEW noF -bvt +mAD bAw kxZ fMZ @@ -94775,7 +94775,7 @@ eEa kmu kmu xJe -toN +mXi wSi kmu rqj @@ -94820,7 +94820,7 @@ oKy rbH dMU kGF -vQR +oPE yiO tiT pCJ @@ -98601,7 +98601,7 @@ cLf cLf bqX cQP -gpT +wWB eon sZK sZK @@ -103524,7 +103524,7 @@ nxG nxG nxG hjJ -tIk +nux glH iAE xAm @@ -107619,7 +107619,7 @@ lNV svL cPt ixU -xIR +cTK dfM pBn cPo @@ -109974,7 +109974,7 @@ dpU jco oss vEZ -emO +dMp vEZ vEZ hmz @@ -149557,7 +149557,7 @@ egv tqV tqV njM -wnT +yjC fnh qxG jOB @@ -154184,7 +154184,7 @@ oRR nAs wYY tSn -xas +cPb xhJ mfP xOF @@ -159815,7 +159815,7 @@ qDQ vkR lRN hCs -kKU +led cmw xtG lIr @@ -188852,7 +188852,7 @@ jEt aMf rdn xSW -oHh +bKa wnA wnA wnA diff --git a/_maps/minigame/deathmatch/maint_mania.dmm b/_maps/minigame/deathmatch/maint_mania.dmm index b742b695c14..2433686e673 100644 --- a/_maps/minigame/deathmatch/maint_mania.dmm +++ b/_maps/minigame/deathmatch/maint_mania.dmm @@ -14,7 +14,7 @@ /turf/open/indestructible, /area/deathmatch) "cx" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/indestructible, /area/deathmatch) "cy" = ( diff --git a/_maps/shuttles/arrival_catwalk.dmm b/_maps/shuttles/arrival_catwalk.dmm index 837bfc84157..e50d54a186a 100644 --- a/_maps/shuttles/arrival_catwalk.dmm +++ b/_maps/shuttles/arrival_catwalk.dmm @@ -226,7 +226,7 @@ /area/shuttle/arrival) "CA" = ( /obj/effect/turf_decal/trimline/yellow/arrow_cw, -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /obj/effect/turf_decal/trimline/dark_blue/corner{ dir = 4 }, diff --git a/_maps/shuttles/arrival_delta.dmm b/_maps/shuttles/arrival_delta.dmm index 527b50f66c3..8fab8347725 100644 --- a/_maps/shuttles/arrival_delta.dmm +++ b/_maps/shuttles/arrival_delta.dmm @@ -326,7 +326,7 @@ /turf/open/floor/iron, /area/shuttle/arrival) "uH" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/neutral/fourcorners, diff --git a/_maps/shuttles/arrival_kilo.dmm b/_maps/shuttles/arrival_kilo.dmm index b59cf8d160d..2776589602e 100644 --- a/_maps/shuttles/arrival_kilo.dmm +++ b/_maps/shuttles/arrival_kilo.dmm @@ -149,7 +149,7 @@ /turf/open/floor/grass, /area/shuttle/arrival) "aA" = ( -/obj/machinery/vending/wallmed/directional/west{ +/obj/machinery/wall_healer/free/directional/west{ use_power = 0 }, /obj/effect/turf_decal/tile/blue/opposingcorners, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 9bfcf599bb2..3a9cd128fa5 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -271,7 +271,7 @@ /area/shuttle/escape) "bz" = ( /obj/machinery/stasis, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /turf/open/floor/mineral/titanium/white, @@ -387,7 +387,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "JM" = ( -/obj/machinery/vending/wallmed{ +/obj/machinery/wall_healer/free{ name = "Emergency NanoMed"; use_power = 0 }, diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index 848f487020f..6df05e530ff 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -468,7 +468,7 @@ /area/shuttle/escape) "ca" = ( /obj/machinery/light/directional/south, -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /obj/effect/turf_decal/tile/bar/opposingcorners, diff --git a/_maps/shuttles/emergency_bballhooper.dmm b/_maps/shuttles/emergency_bballhooper.dmm index 49972dccae1..1d8fa1e0a8e 100644 --- a/_maps/shuttles/emergency_bballhooper.dmm +++ b/_maps/shuttles/emergency_bballhooper.dmm @@ -972,7 +972,7 @@ /obj/machinery/shower/directional/west{ name = "emergency shower" }, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ name = "Hooper's First Medical Kit" }, /obj/machinery/light/small/directional/east, diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index fd82a5b0e2b..609e2a749f3 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -255,7 +255,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "iP" = ( -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 38cdf4e6fec..60815016f83 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -303,7 +303,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "Dk" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_casino.dmm b/_maps/shuttles/emergency_casino.dmm index c1332f0ef1d..c91d4e781d9 100644 --- a/_maps/shuttles/emergency_casino.dmm +++ b/_maps/shuttles/emergency_casino.dmm @@ -404,7 +404,7 @@ pixel_x = 2; pixel_y = 7 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/carpet/green, /area/shuttle/escape) "mn" = ( @@ -448,7 +448,7 @@ /obj/item/canvas, /obj/item/canvas, /obj/item/canvas, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /obj/machinery/light/directional/north, /turf/open/floor/sepia, /area/shuttle/escape) @@ -571,7 +571,7 @@ /area/shuttle/escape) "qn" = ( /obj/machinery/stasis, -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /obj/machinery/light/directional/north, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -1352,7 +1352,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "VT" = ( -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /turf/open/floor/carpet/green, /area/shuttle/escape) "Wp" = ( diff --git a/_maps/shuttles/emergency_catwalk.dmm b/_maps/shuttles/emergency_catwalk.dmm index 4ed285c7964..71f1d21923d 100644 --- a/_maps/shuttles/emergency_catwalk.dmm +++ b/_maps/shuttles/emergency_catwalk.dmm @@ -710,7 +710,7 @@ dir = 1 }, /obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/iron, /area/shuttle/escape) "Mj" = ( @@ -994,7 +994,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "We" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/shuttle/escape) "WL" = ( diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index dccdcc4b139..72de7bc50d4 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -511,7 +511,7 @@ "cu" = ( /obj/machinery/light/directional/east, /obj/machinery/stasis, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index fc943e5287b..656d34288b2 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -307,7 +307,7 @@ /area/shuttle/escape) "RX" = ( /obj/item/toy/snappop/phoenix, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/bluespace, diff --git a/_maps/shuttles/emergency_cruise.dmm b/_maps/shuttles/emergency_cruise.dmm index 33b31e4854f..a5dd675aa0e 100644 --- a/_maps/shuttles/emergency_cruise.dmm +++ b/_maps/shuttles/emergency_cruise.dmm @@ -384,7 +384,7 @@ pixel_x = 4; pixel_y = -1 }, -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /obj/item/radio/intercom/directional/south, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 @@ -932,7 +932,7 @@ /obj/structure/chair/sofa/bench/right{ dir = 8 }, -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron, /area/shuttle/escape) @@ -2054,7 +2054,7 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /turf/open/floor/iron/dark/small, /area/shuttle/escape) "Cu" = ( diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 854f76f7a15..da90701ec5a 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -1067,7 +1067,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /turf/open/floor/iron, diff --git a/_maps/shuttles/emergency_donut.dmm b/_maps/shuttles/emergency_donut.dmm index 27f9cd7f1ac..1ea139604ab 100644 --- a/_maps/shuttles/emergency_donut.dmm +++ b/_maps/shuttles/emergency_donut.dmm @@ -402,14 +402,14 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "JG" = ( -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "KN" = ( /obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/emergency_fish.dmm b/_maps/shuttles/emergency_fish.dmm index 43ec2aa1620..2ed11465b3a 100644 --- a/_maps/shuttles/emergency_fish.dmm +++ b/_maps/shuttles/emergency_fish.dmm @@ -260,7 +260,7 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "pa" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /obj/structure/railing{ dir = 1 }, @@ -300,7 +300,7 @@ /turf/open/floor/mineral/titanium/tiled/white, /area/shuttle/escape) "qG" = ( -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /obj/structure/chair/comfy/shuttle{ dir = 8 }, @@ -662,7 +662,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "Mp" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -704,7 +704,7 @@ /area/shuttle/escape) "OR" = ( /obj/machinery/light/directional/north, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/dark/anticorner/contrasted{ @@ -835,7 +835,7 @@ /turf/template_noop, /area/template_noop) "Vo" = ( -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /obj/item/kirbyplants/random, /obj/effect/turf_decal/tile/dark/half/contrasted{ dir = 8 @@ -895,7 +895,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "Ys" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/dark/half/contrasted{ diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index 63cbc0dfc80..04c732eafbe 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -41,7 +41,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/open/floor/mineral/plastitanium/red, @@ -176,7 +176,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/west{ +/obj/machinery/wall_healer/free/directional/west{ use_power = 0 }, /obj/machinery/light/directional/west, @@ -222,7 +222,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "Z" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_humpback.dmm b/_maps/shuttles/emergency_humpback.dmm index d93055c1e83..23e4c289186 100644 --- a/_maps/shuttles/emergency_humpback.dmm +++ b/_maps/shuttles/emergency_humpback.dmm @@ -126,7 +126,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "he" = ( -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /turf/open/floor/wood/large, /area/shuttle/escape) "hk" = ( @@ -297,7 +297,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "rL" = ( diff --git a/_maps/shuttles/emergency_kilo.dmm b/_maps/shuttles/emergency_kilo.dmm index 1c8148a774a..43f92baecdf 100644 --- a/_maps/shuttles/emergency_kilo.dmm +++ b/_maps/shuttles/emergency_kilo.dmm @@ -906,7 +906,7 @@ /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape/brig) "Br" = ( -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /obj/effect/turf_decal/stripes/line{ @@ -1227,7 +1227,7 @@ /area/shuttle/escape) "TQ" = ( /obj/structure/extinguisher_cabinet/directional/west, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_lance.dmm b/_maps/shuttles/emergency_lance.dmm index d39e66077bb..3b8dbea2cc7 100644 --- a/_maps/shuttles/emergency_lance.dmm +++ b/_maps/shuttles/emergency_lance.dmm @@ -223,7 +223,7 @@ /turf/open/floor/iron/dark/textured, /area/shuttle/escape) "hu" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /obj/effect/turf_decal/tile/dark_blue{ dir = 8 }, @@ -1076,7 +1076,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape) "In" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, @@ -1240,7 +1240,7 @@ }, /area/shuttle/escape) "MA" = ( -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 4 }, diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 840479edd81..572c24b5762 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -61,7 +61,7 @@ /turf/open/floor/plating, /area/shuttle/escape) "ek" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /obj/machinery/iv_drip, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape/luxury) @@ -870,7 +870,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "Jd" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /turf/open/floor/carpet/orange, /area/shuttle/escape/luxury) "JB" = ( @@ -1003,7 +1003,7 @@ /area/shuttle/escape) "Nu" = ( /obj/structure/chair/comfy/shuttle, -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/floor/carpet/red, /area/shuttle/escape/brig) "Om" = ( @@ -1170,7 +1170,7 @@ /turf/open/floor/iron, /area/shuttle/escape) "Wx" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/floor/carpet/blue, /area/shuttle/escape/luxury) "WF" = ( diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index f1064a77fda..b2fdab9a9a9 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -621,7 +621,7 @@ /area/shuttle/escape) "qi" = ( /obj/structure/chair/comfy/shuttle, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/mineral/titanium/blue, @@ -741,7 +741,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 1 }, -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index 89579283e93..e75faab75e5 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -128,7 +128,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "F" = ( -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /obj/machinery/light/small/directional/east, @@ -221,7 +221,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "W" = ( diff --git a/_maps/shuttles/emergency_nebula.dmm b/_maps/shuttles/emergency_nebula.dmm index a0dd9202b56..4a8fb7ecd97 100644 --- a/_maps/shuttles/emergency_nebula.dmm +++ b/_maps/shuttles/emergency_nebula.dmm @@ -807,7 +807,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /obj/machinery/light/directional/east, diff --git a/_maps/shuttles/emergency_northstar.dmm b/_maps/shuttles/emergency_northstar.dmm index 672dd9b58e2..d90758fe7d9 100644 --- a/_maps/shuttles/emergency_northstar.dmm +++ b/_maps/shuttles/emergency_northstar.dmm @@ -3,7 +3,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /turf/open/floor/iron/smooth_edge{ @@ -386,7 +386,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/mineral/plastitanium/red, /area/shuttle/escape) "Jd" = ( diff --git a/_maps/shuttles/emergency_omega.dmm b/_maps/shuttles/emergency_omega.dmm index 7a183d4ac44..dcd1f6e4643 100644 --- a/_maps/shuttles/emergency_omega.dmm +++ b/_maps/shuttles/emergency_omega.dmm @@ -247,7 +247,7 @@ /obj/machinery/stasis{ dir = 4 }, -/obj/machinery/vending/wallmed/directional/west{ +/obj/machinery/wall_healer/free/directional/west{ use_power = 0 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ @@ -500,7 +500,7 @@ dir = 8 }, /obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/east{ +/obj/machinery/wall_healer/free/directional/east{ use_power = 0 }, /obj/machinery/light/small/directional/east, @@ -571,7 +571,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/vending/wallmed/directional/west{ +/obj/machinery/wall_healer/free/directional/west{ use_power = 0 }, /turf/open/floor/iron, diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index 84780e4332b..b0b75da383a 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -590,7 +590,7 @@ /obj/structure/table/glass, /obj/item/storage/medkit/regular, /obj/structure/window/reinforced/spawner/directional/east, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /obj/effect/turf_decal/tile/blue/opposingcorners{ diff --git a/_maps/shuttles/emergency_scrapheap/classic_aft3.dmm b/_maps/shuttles/emergency_scrapheap/classic_aft3.dmm index 4eca7aeb766..3c69660fbed 100644 --- a/_maps/shuttles/emergency_scrapheap/classic_aft3.dmm +++ b/_maps/shuttles/emergency_scrapheap/classic_aft3.dmm @@ -242,7 +242,7 @@ dir = 4 }, /obj/effect/decal/cleanable/blood/drip, -/obj/machinery/vending/wallmed/directional/south{ +/obj/machinery/wall_healer/free/directional/south{ use_power = 0 }, /turf/template_noop, diff --git a/_maps/shuttles/emergency_shadow.dmm b/_maps/shuttles/emergency_shadow.dmm index 731ad7bd2dd..f75edd678b3 100644 --- a/_maps/shuttles/emergency_shadow.dmm +++ b/_maps/shuttles/emergency_shadow.dmm @@ -789,7 +789,7 @@ /turf/open/floor/iron/dark, /area/shuttle/escape/brig) "IR" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/iron/dark/textured_large, /area/shuttle/escape) @@ -1037,7 +1037,7 @@ /turf/open/floor/iron/dark/textured_large, /area/shuttle/escape) "Ux" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /obj/effect/turf_decal/trimline/neutral/line{ dir = 1 }, diff --git a/_maps/shuttles/emergency_tram.dmm b/_maps/shuttles/emergency_tram.dmm index 38b2608865b..7ab45a766ff 100644 --- a/_maps/shuttles/emergency_tram.dmm +++ b/_maps/shuttles/emergency_tram.dmm @@ -119,7 +119,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aF" = ( -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/mineral/titanium, @@ -216,7 +216,7 @@ /area/shuttle/escape) "ba" = ( /obj/machinery/shower/directional/south, -/obj/machinery/vending/wallmed/directional/north{ +/obj/machinery/wall_healer/free/directional/north{ use_power = 0 }, /turf/open/floor/mineral/titanium/white, diff --git a/_maps/shuttles/emergency_tranquility.dmm b/_maps/shuttles/emergency_tranquility.dmm index e44665e39c7..8498e51bbf1 100644 --- a/_maps/shuttles/emergency_tranquility.dmm +++ b/_maps/shuttles/emergency_tranquility.dmm @@ -920,7 +920,7 @@ /turf/open/floor/wood, /area/shuttle/escape) "rK" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /turf/open/floor/iron/chapel, /area/shuttle/escape) "rL" = ( @@ -1072,7 +1072,7 @@ /turf/open/floor/stone, /area/shuttle/escape) "vx" = ( -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/floor/catwalk_floor, /area/shuttle/escape) "vy" = ( @@ -1370,7 +1370,7 @@ dir = 9 }, /mob/living/basic/bot/cleanbot, -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /turf/open/floor/wood, /area/shuttle/escape) "Ac" = ( diff --git a/_maps/shuttles/emergency_venture.dmm b/_maps/shuttles/emergency_venture.dmm index 29ad2a695d1..1bf7fb0c567 100644 --- a/_maps/shuttles/emergency_venture.dmm +++ b/_maps/shuttles/emergency_venture.dmm @@ -249,7 +249,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /turf/open/floor/iron/herringbone, /area/shuttle/escape) "lW" = ( @@ -573,7 +573,7 @@ /obj/structure/chair/comfy/shuttle{ dir = 8 }, -/obj/machinery/vending/wallmed/directional/east, +/obj/machinery/wall_healer/free/directional/east, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, @@ -605,7 +605,7 @@ /area/shuttle/escape) "Gt" = ( /obj/structure/chair/comfy/shuttle, -/obj/machinery/vending/wallmed/directional/north, +/obj/machinery/wall_healer/free/directional/north, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "GM" = ( @@ -752,7 +752,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "Ru" = ( -/obj/machinery/vending/wallmed/directional/west, +/obj/machinery/wall_healer/free/directional/west, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, diff --git a/_maps/shuttles/emergency_wawa.dmm b/_maps/shuttles/emergency_wawa.dmm index 46d2a986938..de864edd745 100644 --- a/_maps/shuttles/emergency_wawa.dmm +++ b/_maps/shuttles/emergency_wawa.dmm @@ -435,7 +435,7 @@ /turf/open/floor/iron/checker, /area/shuttle/escape) "lP" = ( -/obj/machinery/vending/wallmed/directional/south, +/obj/machinery/wall_healer/free/directional/south, /turf/open/floor/catwalk_floor, /area/shuttle/escape) "mT" = ( diff --git a/_maps/virtual_domains/meta_central.dmm b/_maps/virtual_domains/meta_central.dmm index 8c17d14812a..ee1bfe8d10f 100644 --- a/_maps/virtual_domains/meta_central.dmm +++ b/_maps/virtual_domains/meta_central.dmm @@ -262,14 +262,6 @@ /obj/effect/turf_decal/caution/red, /turf/open/floor/iron, /area/virtual_domain) -"ch" = ( -/obj/structure/table/wood, -/obj/machinery/light/directional/south, -/obj/item/papercutter{ - pixel_x = -4 - }, -/turf/open/floor/wood, -/area/virtual_domain) "cj" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/tile/neutral{ @@ -893,15 +885,6 @@ /obj/effect/spawner/random/trash, /turf/open/floor/iron, /area/virtual_domain) -"hv" = ( -/obj/structure/bed/medical/emergency, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/machinery/vending/wallmed/directional/west, -/obj/effect/mob_spawn/corpse/human/assistant, -/turf/open/floor/iron, -/area/virtual_domain) "hw" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/iron, @@ -1838,6 +1821,14 @@ "ps" = ( /turf/closed/wall, /area/virtual_domain) +"pu" = ( +/obj/structure/table/wood, +/obj/machinery/light/directional/south, +/obj/item/papercutter{ + pixel_x = -4 + }, +/turf/open/floor/wood, +/area/virtual_domain) "pv" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/neutral, @@ -3698,19 +3689,6 @@ }, /turf/open/floor/iron, /area/virtual_domain) -"Fa" = ( -/obj/structure/table/reinforced, -/obj/item/clothing/glasses/night{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/clothing/glasses/night, -/obj/item/clothing/glasses/night{ - pixel_x = -5; - pixel_y = -3 - }, -/turf/template_noop, -/area/virtual_domain/safehouse) "Fc" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/neutral{ @@ -5207,6 +5185,15 @@ /obj/structure/frame/machine/secured, /turf/open/misc/dirt/jungle, /area/virtual_domain) +"RG" = ( +/obj/structure/bed/medical/emergency, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/wall_healer/free/directional/west, +/obj/effect/mob_spawn/corpse/human/assistant, +/turf/open/floor/iron, +/area/virtual_domain) "RI" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/spawner/random/decoration/showcase, @@ -5685,6 +5672,19 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/virtual_domain) +"VQ" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/night{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/clothing/glasses/night, +/obj/item/clothing/glasses/night{ + pixel_x = -5; + pixel_y = -3 + }, +/turf/template_noop, +/area/virtual_domain/safehouse) "VT" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -6726,7 +6726,7 @@ uS uS ML DP -ch +pu uS ND AP @@ -7276,7 +7276,7 @@ oD pB hX zQ -Fa +VQ hX hX hX @@ -7696,7 +7696,7 @@ Nh zg Fj NO -hv +RG uA yN Ff diff --git a/code/datums/components/payment.dm b/code/datums/components/payment.dm index edb9762ba7e..97cb86e08fb 100644 --- a/code/datums/components/payment.dm +++ b/code/datums/components/payment.dm @@ -102,7 +102,7 @@ return FALSE if(physical_cash_total < total_cost) - to_chat(user, span_notice("Insufficient funds. Aborting.")) + to_chat(user, span_warning("Insufficient funds. Aborting.")) return FALSE for(var/obj/cash_object in counted_money) qdel(cash_object) diff --git a/code/game/machinery/wall_healer.dm b/code/game/machinery/wall_healer.dm new file mode 100644 index 00000000000..89de765ecbe --- /dev/null +++ b/code/game/machinery/wall_healer.dm @@ -0,0 +1,566 @@ +/// A wall mounted machine that heals chip damage for a price +/obj/machinery/wall_healer + name = "\improper Deforest First Aid Station" + desc = "A wall-mounted first aid station, designed to treat minor injuries - just stick your hand in and try to relax." + icon = 'icons/obj/machines/wall_healer.dmi' + icon_state = "wall_healer" + base_icon_state = "wall_healer" + density = FALSE + interaction_flags_atom = INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND // manually handled + payment_department = ACCOUNT_MED + max_integrity = 150 + armor_type = /datum/armor/obj_machinery/wall_healer + + /// Cost per bandage dispensed. Note, always disregarded on red alert. + var/per_bandage_cost = (/obj/item/stack/medical/gauze::custom_price) / (/obj/item/stack/medical/gauze::amount) + /// Number of bandages to dispense on rmb. Never recharges but can be restocked. + var/num_bandages = 5 + /// Lazylist of bandages that have been restocked into the wall healer. + VAR_PRIVATE/list/stocked_bandages + + /// Cost per unit of healing applied. + /// Note: disregarded on red alert. + var/per_heal_cost = 2.5 + /// Amount of brute healing pooled + VAR_PRIVATE/brute_healing = MAX_LIVING_HEALTH * 0.4 + /// Amount of burn healing pooled + VAR_PRIVATE/burn_healing = MAX_LIVING_HEALTH * 0.4 + /// Amount of toxin healing pooled + VAR_PRIVATE/tox_healing = MAX_LIVING_HEALTH * 0.3 + /// Amount of blood to restore + VAR_PRIVATE/blood_healing = BLOOD_VOLUME_NORMAL * 0.1 + + /// Current mob using the wall healer + VAR_PRIVATE/mob/living/current_user + /// Current hand of the mob using the wall healer, if any (can be unset if in use by a simplemob, for example) + VAR_PRIVATE/obj/item/bodypart/current_hand + /// Ref of the last user to touch the wall healer - only set when there is no active user + VAR_PRIVATE/last_user_ref + /// Bar that props above the healer to show time until next injection + VAR_PRIVATE/datum/progressbar/wall_healer/injection_bar + + /// How long it takes to recharge the wall healer + var/recharge_cd_length = 30 SECONDS + /// How long it takes between injections + var/injection_cd_length = 4 SECONDS + /// Cooldown between chem recharges + COOLDOWN_DECLARE(recharge_cooldown) + /// Cooldown between chem injections + COOLDOWN_DECLARE(injection_cooldown) + /// Only sends messages every X injections to the same user to avoid spam + VAR_PRIVATE/antispam_counter = 0 + +/datum/armor/obj_machinery/wall_healer + melee = 50 + bullet = 30 + laser = 30 + energy = 40 + bomb = 10 + fire = 80 + acid = 80 + +/obj/machinery/wall_healer/Initialize(mapload) + . = ..() + if(!mapload) + brute_healing = 0 + burn_healing = 0 + tox_healing = 0 + blood_healing = 0 + update_appearance() + init_payment() + register_context() + +/obj/machinery/wall_healer/Destroy() + clear_using_mob() + QDEL_LAZYLIST(stocked_bandages) + return ..() + +/obj/machinery/wall_healer/add_context(atom/source, list/context, obj/item/held_item, mob/user) + if(isnull(held_item)) + context[SCREENTIP_CONTEXT_LMB] = "Heal self" + context[SCREENTIP_CONTEXT_RMB] = "Get gauze" + return CONTEXTUAL_SCREENTIP_SET + if(istype(held_item, /obj/item/stack/medical/gauze)) + context[SCREENTIP_CONTEXT_LMB] = "Restock" + return CONTEXTUAL_SCREENTIP_SET + +/obj/machinery/wall_healer/proc/refill_healing_pool(percent = 100) + var/amount_refilled = 0 + + var/pre_brute_healing = brute_healing + brute_healing = min(brute_healing + initial(brute_healing) * (percent / 100), initial(brute_healing)) + amount_refilled += brute_healing - pre_brute_healing + + var/pre_burn_healing = burn_healing + burn_healing = min(burn_healing + initial(burn_healing) * (percent / 100), initial(burn_healing)) + amount_refilled += burn_healing - pre_burn_healing + + var/pre_tox_healing = tox_healing + tox_healing = min(tox_healing + initial(tox_healing) * (percent / 100), initial(tox_healing)) + amount_refilled += tox_healing - pre_tox_healing + + var/pre_blood_healing = blood_healing + blood_healing = min(blood_healing + initial(blood_healing) * (percent / 100), initial(blood_healing)) + amount_refilled += blood_healing - pre_blood_healing + + if(amount_refilled > 0) + update_appearance() + + return amount_refilled + +/obj/machinery/wall_healer/proc/init_payment() + // Cost depends on service (so just use 0 here) + AddComponent(/datum/component/payment, 0, SSeconomy.get_dep_account(ACCOUNT_MED), PAYMENT_FRIENDLY) + desc += " Charges by the second, though all costs are waived on red alert." + +/obj/machinery/wall_healer/examine(mob/user) + . = ..() + var/total_bandages = num_bandages + LAZYLEN(stocked_bandages) + . += span_notice("It has [total_bandages] bandage\s stocked.\ + [total_bandages ? " [is_free(user) ? "Purchase" : "Retrieve"] a bandage with [EXAMINE_HINT("right-click")]." : ""]") + if(current_user) + . += span_notice("[current_user] currently [current_hand ? "has [current_user.p_their()] [current_hand.plaintext_zone] in" : "is using"] it.") + +/obj/machinery/wall_healer/update_overlays() + . = ..() + + var/brute_state = 7 - round(7 * (brute_healing / initial(brute_healing)), 1) + var/mutable_appearance/brute = mutable_appearance(icon, "bar[brute_state]", alpha = src.alpha, appearance_flags = RESET_COLOR) + brute.color = /datum/reagent/medicine/c2/libital::color + // no offset necessary + . += brute + + var/burn_state = 7 - round(7 * (burn_healing / initial(burn_healing)), 1) + var/mutable_appearance/burn = mutable_appearance(icon, "bar[burn_state]", alpha = src.alpha, appearance_flags = RESET_COLOR) + burn.color = /datum/reagent/medicine/c2/aiuri::color + burn.pixel_w += 4 + . += burn + + var/tox_state = 7 - round(7 * (tox_healing / initial(tox_healing)), 1) + var/mutable_appearance/tox = mutable_appearance(icon, "bar[tox_state]", alpha = src.alpha, appearance_flags = RESET_COLOR) + tox.color = /datum/reagent/medicine/c2/syriniver::color + tox.pixel_w += 8 + . += tox + + var/blood_state = 7 - round(7 * (blood_healing / initial(blood_healing)), 1) + var/mutable_appearance/blood = mutable_appearance(icon, "bar[blood_state]", alpha = src.alpha, appearance_flags = RESET_COLOR) + blood.color = /datum/reagent/blood::color + blood.pixel_w += 12 + . += blood + + if(is_operational) + . += emissive_appearance(icon, "bar_emissive", src, alpha = src.alpha) + . += mutable_appearance(icon, "bar_shadow", alpha = src.alpha, appearance_flags = RESET_COLOR) + +/obj/machinery/wall_healer/emag_act(mob/user, obj/item/card/emag/emag_card) + if(obj_flags & EMAGGED) + return FALSE + + playsound(src, SFX_SPARKS, 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE) + visible_message(span_warning("Sparks fly out of [src]!")) + balloon_alert(user, "safeties disabled") + obj_flags |= EMAGGED + return TRUE + +/// We want user to be right up to the wall mount to use it +/// However people may often map the machine over a table +/// In those contexts, they should be allowed to reach over the table +/obj/machinery/wall_healer/proc/loc_check(mob/checking) + var/turf/turf_loc = get_turf(src) + if(turf_loc.is_blocked_turf()) + return checking.Adjacent(turf_loc) + return checking.loc == turf_loc + +/obj/machinery/wall_healer/mouse_drop_receive(atom/dropped, mob/user, params) + . = ..() + if(.) + return . + if(!isliving(user) || !ishuman(dropped)) + balloon_alert(user, "incompatible!") + return FALSE + var/mob/living/who_put_user_in = user + var/mob/living/new_user = dropped + if(!loc_check(new_user)) + balloon_alert(who_put_user_in, "[new_user == who_put_user_in ? "get" : "bring [new_user.p_them()]"] closer!") + return FALSE + + if(do_after(user, 1 SECONDS, src)) + other_put_users_hand_in(new_user, who_put_user_in) + return TRUE + +/obj/machinery/wall_healer/attack_hand(mob/living/user, list/modifiers) + . = ..() + if(.) + return . + if(!ishuman(user)) + balloon_alert(user, "incompatible!") + return FALSE + if(!loc_check(user)) + balloon_alert(user, "get closer!") + return FALSE + if(do_after(user, 0.5 SECONDS, src)) + user_put_in_own_hand(user) + return TRUE + +/obj/machinery/wall_healer/proc/user_put_in_own_hand(mob/living/user) + if(user == current_user) + clear_using_mob() + if(user.get_active_hand() == current_hand) + user.visible_message( + span_notice("[user] removes [user.p_their()] hand from [src]."), + span_notice("You remove your hand from [src]."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + else + add_fingerprint(user) + user.visible_message( + span_notice("[user] removes [user.p_their()] hand from [src] and puts it in [user.p_their()] other hand."), + span_notice("You remove your hand from [src] and put it in your other hand."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + set_using_mob(user) + return + else if(current_user) + user.visible_message( + span_notice("[user] tries to put [user.p_their()] hand in [src], but [current_user] is already using it."), + span_notice("You try to put your hand in [src], but [current_user] is already using it."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + return + + add_fingerprint(user) + if(is_operational) + user.visible_message( + span_notice("[user] puts [user.p_their()] hand in [src], and immediately some kind of sensor scans [user.p_their()] arm."), + span_notice("You put your hand in [src], and immediately some kind of sensor scans your arm."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + else + user.visible_message( + span_notice("[user] puts [user.p_their()] hand in [src], but it doesn't respond. Seems to be out of order."), + span_notice("You put your hand in [src], but it doesn't respond."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + set_using_mob(user) + +/obj/machinery/wall_healer/proc/other_put_users_hand_in(mob/living/user, mob/living/who_put_user_in) + if(who_put_user_in == user) + return user_put_in_own_hand(user) + + if(current_user == user) + clear_using_mob() + if(user.get_active_hand() == current_hand) + to_chat(who_put_user_in, span_notice("You remove [user]'s hand from [src].")) + user.visible_message( + span_notice("[who_put_user_in] removes [user]'s hand from [src]."), + span_notice("[who_put_user_in] remove your hand from [src]."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ignored_mobs = who_put_user_in, + ) + else + to_chat(who_put_user_in, span_notice("You remove [user]'s hand from [src] and put it in [user.p_their()] other hand.")) + user.visible_message( + span_notice("[who_put_user_in] removes [user.p_their()] hand from [src] and puts it in [user.p_their()] other hand."), + span_notice("[who_put_user_in] removes your hand from [src] and puts it in your other hand."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ignored_mobs = who_put_user_in, + ) + add_fingerprint(user) + set_using_mob(who_put_user_in) + return + + if(current_user) + to_chat(who_put_user_in, span_notice("You try to put [user]'s hand in [src], but [current_user] is already using it.")) + user.visible_message( + span_notice("[who_put_user_in] tries to put [user]'s hand in [src], but [current_user] is already using it."), + span_notice("[who_put_user_in] tries to put your hand in [src], but [current_user] is already using it."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ignored_mobs = who_put_user_in, + ) + return + + add_fingerprint(who_put_user_in) + if(is_operational) + to_chat(who_put_user_in, span_notice("You put [user]'s hand in [src], and immediately some kind of sensor scans [user.p_their()] arm.")) + user.visible_message( + span_notice("[who_put_user_in] puts [user.p_their()] hand in [src], and immediately some kind of sensor scans [user.p_their()] arm."), + span_notice("[who_put_user_in] puts your hand in [src], and immediately some kind of sensor scans your arm."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ignored_mobs = who_put_user_in, + ) + else + to_chat(who_put_user_in, span_notice("You put [user]'s hand in [src], but it doesn't respond. Seems to be out of order.")) + user.visible_message( + span_notice("[who_put_user_in] puts [user.p_their()] hand in [src], but it doesn't respond. Seems to be out of order."), + span_notice("[who_put_user_in] puts your hand in [src], but it doesn't respond."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ignored_mobs = who_put_user_in, + ) + set_using_mob(user) + +/obj/machinery/wall_healer/attack_hand_secondary(mob/user, list/modifiers) + . = ..() + if(. != SECONDARY_ATTACK_CALL_NORMAL || !isliving(user)) + return . + var/mob/living/living_user = user + if(!is_operational) + to_chat(user, span_warning("You try to retrieve some gauze, but [src] doesn't respond.")) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(num_bandages + LAZYLEN(stocked_bandages) <= 0) + to_chat(user, span_warning("You try to retrieve some gauze, but [src] seems to be out of stock.")) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if(attempt_charge(src, user, extra_fees = floor(per_bandage_cost)) & COMPONENT_OBJ_CANCEL_CHARGE) + if(!living_user.get_idcard()) + to_chat(user, span_warning("No ID card found. Aborting.")) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + if((obj_flags & EMAGGED) && prob(99)) + to_chat(user, span_warning("You try to retrieve some gauze, but it gets all jammed up in the access port.")) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + + var/obj/item/stack/medical/gauze/bandage = LAZYACCESS(stocked_bandages, 1) + if(isnull(bandage)) + num_bandages-- + bandage = new(user.drop_location(), 1) + user.put_in_hands(bandage) + user.visible_message( + span_notice("[user] retrieves [bandage] from [src]."), + span_notice("You retrieve [bandage] from [src]."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + playsound(src, 'sound/machines/machine_vend.ogg', 50, TRUE, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + return SECONDARY_ATTACK_CANCEL_ATTACK_CHAIN + +/obj/machinery/wall_healer/on_deconstruction(disassembled) + var/atom/drop_loc = drop_location() + for(var/obj/item/stack/medical/gauze/bandage as anything in stocked_bandages) + bandage.forceMove(drop_loc) + new /obj/item/stack/medical/gauze(drop_loc, num_bandages) + +/obj/machinery/wall_healer/item_interaction(mob/living/user, obj/item/tool, list/modifiers) + if(!istype(tool, /obj/item/stack/medical/gauze)) + return NONE + if(!user.temporarilyRemoveItemFromInventory(tool)) + to_chat(user, span_warning("You try to restock [src] with [tool], but it seems stuck to your hand.")) + return ITEM_INTERACT_BLOCKING + user.visible_message( + span_notice("[user] restocks [src] with [tool]."), + span_notice("You restock [src] with [tool]."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + var/obj/item/stack/medical/gauze/bandage = tool + while(bandage.amount > 1) + var/obj/item/stack/medical/gauze/split_bandage = bandage.split_stack(1) + LAZYADD(stocked_bandages, split_bandage) + split_bandage.forceMove(src) + LAZYADD(stocked_bandages, bandage) + bandage.forceMove(src) + return ITEM_INTERACT_SUCCESS + +/obj/machinery/wall_healer/proc/set_using_mob(mob/living/user) + if(last_user_ref != REF(user)) + COOLDOWN_RESET(src, injection_cooldown) + + antispam_counter = 0 + last_user_ref = null + + current_user = user + RegisterSignal(user, COMSIG_MOVABLE_MOVED, PROC_REF(user_moved)) + RegisterSignal(user, COMSIG_QDELETING, PROC_REF(clear_using_mob)) + + current_hand = user.get_active_hand() + if(current_hand) + RegisterSignals(current_hand, list(COMSIG_BODYPART_REMOVED, COMSIG_QDELETING), PROC_REF(clear_using_mob)) + + injection_bar = new(user, injection_cd_length, src, COOLDOWN_TIMELEFT(src, injection_cooldown)) + +/obj/machinery/wall_healer/proc/clear_using_mob(...) + SIGNAL_HANDLER + if(current_hand) + UnregisterSignal(current_hand, COMSIG_BODYPART_REMOVED) + UnregisterSignal(current_hand, COMSIG_QDELETING) + current_hand = null + if(current_user) + last_user_ref = REF(current_user) + UnregisterSignal(current_user, COMSIG_MOVABLE_MOVED) + UnregisterSignal(current_user, COMSIG_QDELETING) + UnregisterSignal(current_user, COMSIG_CARBON_REMOVE_LIMB) + current_user = null + QDEL_NULL(injection_bar) + +/obj/machinery/wall_healer/proc/user_moved(...) + SIGNAL_HANDLER + if(current_user.loc == loc) + return + if(!QDELING(current_user)) + current_user.visible_message( + span_notice("[current_user] removes [current_user.p_their()] hand from [src]."), + span_notice("You remove your hand from [src]."), + span_hear("You hear a click."), + visible_message_flags = ALWAYS_SHOW_SELF_MESSAGE, + vision_distance = 5, + ) + clear_using_mob() + +/obj/machinery/wall_healer/Moved(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change) + . = ..() + if(current_user && current_user.loc != loc) + clear_using_mob() + +/obj/machinery/wall_healer/Exited(atom/movable/gone, direction) + . = ..() + LAZYREMOVE(stocked_bandages, gone) + +/// Checks if the machine is free for the given mob +/obj/machinery/wall_healer/proc/is_free(mob/living/for_who) + if(SSsecurity_level.get_current_level_as_number() >= SEC_LEVEL_RED) + return TRUE // always free on red alert + if(!istype(for_who)) + return FALSE + var/obj/item/card/id/card = for_who.get_idcard(TRUE) + if(card?.registered_account?.account_job?.paycheck_department == payment_department) + return TRUE // free for doctors + return FALSE + +/obj/machinery/wall_healer/attempt_charge(atom/sender, atom/target, extra_fees) + if(is_free(target)) + return NONE + return ..() + +/obj/machinery/wall_healer/process() + if(!is_operational) + // puts off recharging until operational again + COOLDOWN_START(src, recharge_cooldown, recharge_cd_length * 0.5) + return + if(isnull(current_user)) + if(COOLDOWN_FINISHED(src, recharge_cooldown) && refill_healing_pool(10)) + COOLDOWN_START(src, recharge_cooldown, recharge_cd_length) + playsound(src, 'sound/machines/defib/defib_ready.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + return + + if(!COOLDOWN_FINISHED(src, injection_cooldown)) + return + + COOLDOWN_START(src, injection_cooldown, injection_cd_length) + antispam_counter++ + + var/arm_check = isnull(current_hand) ? (current_user.mob_biotypes & MOB_ORGANIC) : IS_ORGANIC_LIMB(current_hand) + if(!arm_check) + playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + if(antispam_counter % 3 == 1) + to_chat(current_user, span_notice("Nothing happens. Seems [src] doesn't recognize non-organic [current_hand ? "limbs" : "beings"].")) + return + + if(!current_user.can_inject(null, current_hand)) + playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + if(antispam_counter % 3 == 1) + to_chat(current_user, span_notice("Nothing happens. Seems [src] can't find any exposed flesh to work on.")) + return + + if(obj_flags & EMAGGED) + current_user.apply_damage(33, BRUTE, current_hand, sharpness = SHARP_POINTY) + playsound(src, 'sound/machines/defib/defib_failed.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + if(antispam_counter % 2 == 1) + to_chat(current_user, span_warning("You feel a sharp pain as the machine malfunctions, stabbing you with several instruments and needles!")) + use_energy(500 JOULES) + add_mob_blood(current_user) + return + + var/brute_healing_now = round(min(initial(brute_healing) * 0.1, brute_healing, current_user.getBruteLoss()), DAMAGE_PRECISION) + var/burn_healing_now = round(min(initial(burn_healing) * 0.1, burn_healing, current_user.getFireLoss()), DAMAGE_PRECISION) + var/tox_healing_now = round(min(initial(tox_healing) * 0.1, tox_healing, current_user.getToxLoss()), DAMAGE_PRECISION) + var/blood_healing_now = HAS_TRAIT(current_user, TRAIT_NOBLOOD) ? 0 : round(min(initial(blood_healing) * 0.1, blood_healing, max(BLOOD_VOLUME_OKAY - current_user.blood_volume, 0)), 0.1) + + var/cost = round(per_heal_cost * (brute_healing_now + burn_healing_now + tox_healing_now + blood_healing_now), 1) + if(attempt_charge(src, current_user, extra_fees = cost) & COMPONENT_OBJ_CANCEL_CHARGE) + playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + // attempt charge sends a chat message on fail, except if the user has no ID card + if((antispam_counter % 3 == 1) && !current_user.get_idcard()) + to_chat(current_user, span_warning("No ID card found. Aborting.")) + return + + var/amount_healed = 0 + if(brute_healing_now) + amount_healed += current_user.adjustBruteLoss(-brute_healing_now, required_bodytype = BODYTYPE_ORGANIC) + brute_healing -= brute_healing_now + add_mob_blood(current_user) + if(burn_healing_now) + amount_healed += current_user.adjustFireLoss(-burn_healing_now, required_bodytype = BODYTYPE_ORGANIC) + burn_healing -= burn_healing_now + if(tox_healing_now) + amount_healed += current_user.adjustToxLoss(-tox_healing_now, required_biotype = MOB_ORGANIC) + tox_healing -= tox_healing_now + if(blood_healing_now) + current_user.blood_volume += blood_healing_now + amount_healed += blood_healing_now + blood_healing -= blood_healing_now + add_mob_blood(current_user) + + if(amount_healed) + playsound(src, 'sound/machines/defib/defib_SaftyOn.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + if(antispam_counter % 2 == 1) + to_chat(current_user, span_notice("Several instruments and syringes work on your [current_hand?.plaintext_zone || "body"]. You feel a bit better.")) + update_appearance() + use_energy(200 JOULES) // just some background power drain. we don't really care about whether this is actually successful + return + + playsound(src, 'sound/machines/defib/defib_saftyOff.ogg', 50, FALSE, SHORT_RANGE_SOUND_EXTRARANGE) + if(antispam_counter % 3 != 1) + return + var/missed_brute_healing = brute_healing_now > 0 && !current_user.getBruteLoss() + var/missed_burn_healing = burn_healing_now > 0 && !current_user.getFireLoss() + var/missed_tox_healing = tox_healing_now > 0 && !current_user.getToxLoss() + var/missed_blood_healing = blood_healing_now > 0 && current_user.blood_volume >= BLOOD_VOLUME_OKAY + if(missed_brute_healing || missed_burn_healing || missed_tox_healing || missed_blood_healing) + to_chat(current_user, span_notice("Nothing happens. Seems like [src] needs to recharge.")) + return + to_chat(current_user, span_notice("Nothing happens. Seems like you're in good enough shape.")) + +/// Subtype of progress bar used by the wall healer to show time until next injection +/// This subtype only exists so we can shove fastprocess processing off of the machine itself +/datum/progressbar/wall_healer + +/datum/progressbar/wall_healer/New(mob/User, goal_number, atom/target, starting_amount) + . = ..() + START_PROCESSING(SSfastprocess, src) + +/datum/progressbar/wall_healer/Destroy() + STOP_PROCESSING(SSfastprocess, src) + return ..() + +/datum/progressbar/wall_healer/process(seconds_per_tick) + var/obj/machinery/wall_healer/healer = bar_loc + if(!istype(healer)) + stack_trace("[type] instantiated on a non-wall-healer target [bar_loc || "null"] ([bar_loc?.type || "null"])") + return PROCESS_KILL + + update(COOLDOWN_FINISHED(healer, injection_cooldown) ? 0 : COOLDOWN_TIMELEFT(healer, injection_cooldown)) + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/wall_healer, 32) + +/obj/machinery/wall_healer/free + name = "\improper Deforest Emergency First Aid Station" + +/obj/machinery/wall_healer/free/init_payment() + return + +MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/wall_healer/free, 32) diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 53027e5b7df..0b7bc91aac2 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -6,19 +6,20 @@ panel_type = "wallmed-panel" density = FALSE products = list( - /obj/item/stack/medical/bandage = 1, - /obj/item/stack/medical/ointment = 1, - /obj/item/stack/medical/gauze = 1, - /obj/item/reagent_containers/hypospray/medipen/ekit = 1, - /obj/item/healthanalyzer/simple = 1, + /obj/item/stack/medical/bandage = 4, + /obj/item/stack/medical/ointment = 2, + /obj/item/reagent_containers/applicator/pill/multiver = 2, + /obj/item/stack/medical/gauze = 4, + /obj/item/reagent_containers/hypospray/medipen/ekit = 2, + /obj/item/healthanalyzer/simple = 2, ) contraband = list( /obj/item/storage/box/bandages = 1, /obj/item/storage/box/gum/happiness = 1, ) premium = list( - /obj/item/reagent_containers/applicator/patch/libital = 1, - /obj/item/reagent_containers/applicator/patch/aiuri = 1, + /obj/item/reagent_containers/applicator/patch/libital = 2, + /obj/item/reagent_containers/applicator/patch/aiuri = 2, ) refill_canister = /obj/item/vending_refill/wallmed default_price = PAYCHECK_CREW * 0.3 // Cheap since crew should be able to affort it in emergency situations diff --git a/icons/obj/machines/wall_healer.dmi b/icons/obj/machines/wall_healer.dmi new file mode 100644 index 0000000000000000000000000000000000000000..f09ad6f7339da268b2716e900b2ce84e548f20b7 GIT binary patch literal 1010 zcmVV=-0C=2@(7g)7AQXn-*>e?#WH0$^JGlfyaY$|j3 z#4DPO&i%7b6W8R7-3x~{9Mp19$3Z;@4IFgkpc@C>S(no0Q}PG>!!=HeLN#mn0!!3~ z4m~dr-~a#v3`s;mRCt{2+&@ecVHn5pA7UsBJthaa*6QGLG2)_55(YJFgvCV@1_K(2 zBnA^=NIH-Z)5!#b@lPBaoE2jn3?vPc$^r`v45m-GQlv-IBg z-rn;h_x9;sdv_85005d!%V8@gAJ2G&*2RCE$sOPIz2LUuk46rSh3Yt7Y{1~{n|b@= z?>Z$(sevuU_Lc_+w(^dB^ZKpd{7`1cN_lf?Z-=J}?0D3^k|x0ZCx8DH^{41pz^N1Y zckY#wyRWytbRH}h8jIR>=mhxqepcP*&*feBur;^u!>7XAL2W8p0VHW^a!Reoe(TTQ zu%5hpst3dOjoTCPi6HXqE#bY%QiCUxNiQ0WYGY$Vy}i8^KbsjJANM*sI+V#|lt?53 zjc+soB+0gIt#54mZr3x%ab#JR!r^dL;*X7u$+9eMZ*MD+NCdiV;|Z|2xhW~^yIrDW zP#f}NWo1SC6`;}L8=nQ(wp~)Yo;i*q+qUI6PQ%5omkLl-Q~*%{nz{lE58cq(+M4?M z&iZQCyGE`6hn`Ygx_sT6h)?Lk#ctmLmKK*aH94hkUqAC_Pz^Gw085L@<<0|DVtf$z zzmdB`IejzFUzL;$D$n>JaN6rpf4WDKGvYbTUq9D(7gpyqud5o31d$@j$#??HMivfse$lbl+9WOb%?TCc>w19cXD^P_ zkJ{z?ATXeR`A}s=e+LLE5WfQe00000000000000~hS5bD<-9+g_|=VXbV*n&7E>e= zQ97LtGPW_|moL821aKTj(P&hbWd)vqiBu{j*L9W2WQZRy;|b8HPslLQ^cA3y?~XOm z>=jV1>w4L2)^lAqu&acLUmNkM0K^9X00000000000000000000Kt1C500y$ztQQJ} zw6n9L_V)IcqqZxZ?@{o4fF@@&0jhm>YPI7xGAclmqXINJDnOIt89@d@p-@R}00000 g00000005}Gf5lnp`=x&8AOHXW07*qoM6N<$g6sdt7ytkO literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 345871915cb..72fb69a151a 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2208,6 +2208,7 @@ #include "code\game\machinery\teambuilder.dm" #include "code\game\machinery\teleporter.dm" #include "code\game\machinery\transformer.dm" +#include "code\game\machinery\wall_healer.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\wishgranter.dm" #include "code\game\machinery\camera\camera.dm"