diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index fd81ba7a66be..ecdfbf06099c 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -874,15 +874,23 @@ /turf/open/floor/iron, /area/station/security/checkpoint/customs/auxiliary) "aiV" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/structure/bed/roller{ - dir = 1 +/obj/structure/rack, +/obj/item/storage/medkit/regular, +/obj/item/clothing/gloves/latex, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/item/storage/box/bodybags, +/obj/item/storage/medkit/regular, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/corner{ + dir = 8 }, -/turf/open/floor/iron/white, /area/station/security/medical) "ajc" = ( /obj/effect/decal/cleanable/dirt, @@ -6510,15 +6518,15 @@ /turf/open/floor/iron, /area/station/science/ordnance) "bop" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 1 - }, /obj/structure/table, /obj/item/poster/random_official{ pixel_y = 10 }, /obj/item/poster/random_official, /obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/security/mechbay) "bos" = ( @@ -9649,6 +9657,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/service/power_station) +"bSH" = ( +/obj/machinery/vending/wallmed/directional/north, +/obj/structure/table/optable, +/turf/open/floor/iron/dark, +/area/station/security/medical) "bSN" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/wood/parquet, @@ -9968,11 +9981,12 @@ /turf/open/floor/wood, /area/station/command/meeting_room/council) "bVB" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 10 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/table/reinforced/rglass, +/obj/machinery/computer/records/medical/laptop{ + dir = 1 }, /turf/open/floor/iron/white, /area/station/security/medical) @@ -11490,7 +11504,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/obj/structure/sign/departments/medbay/alt/directional/west, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 8 }, @@ -12503,12 +12516,13 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) "cue" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance" +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron, -/area/station/maintenance/port/fore) +/obj/machinery/duct, +/turf/open/floor/iron/white/corner, +/area/station/security/medical) "cuf" = ( /turf/closed/wall, /area/station/engineering/atmos/office) @@ -13252,10 +13266,13 @@ /turf/open/floor/carpet/royalblack, /area/station/commons/dorms/room8) "cAi" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 }, -/turf/open/floor/iron/white, +/obj/structure/chair/office, +/obj/effect/landmark/start/brig_physician, +/turf/open/floor/iron/white/side, /area/station/security/medical) "cAj" = ( /obj/effect/turf_decal/stripes{ @@ -18354,6 +18371,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) "dAm" = ( @@ -20277,8 +20295,13 @@ /turf/open/floor/plating, /area/station/maintenance/fore/upper) "dTy" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/dark_blue{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/security/mechbay) "dTz" = ( @@ -22625,8 +22648,9 @@ /area/station/command/heads_quarters/blueshield) "etj" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/closet, -/obj/effect/spawner/random/maintenance/six, +/obj/structure/reagent_dispensers/plumbed{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/port/fore) "etk" = ( @@ -23026,10 +23050,19 @@ /turf/open/floor/iron, /area/station/security/execution/transfer) "ewr" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 6 +/obj/machinery/light_switch/directional/east, +/obj/machinery/firealarm/directional/east{ + pixel_x = 38 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/side{ + dir = 8 }, -/turf/open/floor/iron/white, /area/station/security/medical) "ews" = ( /obj/effect/turf_decal/box, @@ -26415,6 +26448,22 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) +"fbj" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/duct, +/obj/structure/cable, +/obj/machinery/light/cold/directional/west, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "fbk" = ( /obj/machinery/door/airlock/external{ name = "Arrivals Dock" @@ -31484,6 +31533,11 @@ /obj/structure/lattice/catwalk, /turf/open/space/openspace, /area/space/nearstation) +"gci" = ( +/obj/effect/spawner/random/trash/mess, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "gcn" = ( /obj/effect/decal/cleanable/blood/tracks{ dir = 8 @@ -51793,13 +51847,16 @@ /turf/open/floor/wood, /area/station/common/pool/sauna) "kcW" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 9 +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 }, -/obj/machinery/airalarm/directional/north, -/obj/structure/closet, -/obj/effect/spawner/random/medical/medkit, -/turf/open/floor/iron/white, /area/station/security/medical) "kcZ" = ( /obj/effect/turf_decal/bot, @@ -51869,6 +51926,7 @@ /obj/effect/turf_decal/siding/thinplating_new/dark{ dir = 8 }, +/obj/structure/sign/departments/medbay/alt/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -52496,7 +52554,7 @@ /area/station/engineering/supermatter/room) "kif" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/structure/crate, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) "kih" = ( @@ -54071,6 +54129,12 @@ dir = 10 }, /area/station/service/hydroponics) +"kxG" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "kxH" = ( /obj/item/cigbutt, /obj/structure/cable, @@ -58068,6 +58132,11 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/cargo/storage) +"low" = ( +/obj/item/stack/sheet/cardboard, +/obj/effect/spawner/random/structure/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "lox" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood{ @@ -59878,6 +59947,11 @@ /obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted, /obj/machinery/recharge_station, /obj/machinery/light_switch/directional/south, +/obj/machinery/button/door/directional/east{ + name = "Security Mech Garage Door Controls"; + id = "SecMech"; + req_access = list("security") + }, /turf/open/floor/iron/dark, /area/station/security/mechbay) "lHW" = ( @@ -60985,6 +61059,11 @@ /obj/structure/chair/stool/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) +"lSN" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/computer/operating, +/turf/open/floor/iron/dark, +/area/station/security/medical) "lSP" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -77739,15 +77818,8 @@ /turf/open/floor/plating, /area/station/maintenance/port/upper) "piE" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay Waiting Room" - }, -/obj/machinery/light/small/directional/north, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark, /area/station/security/medical) "piH" = ( /obj/machinery/light/directional/east, @@ -77757,9 +77829,10 @@ /turf/closed/wall, /area/station/hallway/secondary/exit) "piO" = ( -/obj/structure/window/reinforced/spawner/directional/east, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/brig) +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/structure/closet_maintenance, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "piQ" = ( /obj/structure/chair/office, /turf/open/floor/iron/dark, @@ -79297,6 +79370,11 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/central) +"pyk" = ( +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "pyp" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt, @@ -81099,6 +81177,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/cable, /obj/effect/spawner/random/structure/steam_vent, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) "pRI" = ( @@ -82869,6 +82948,12 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/science/research) +"qiF" = ( +/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/security/mechbay) "qiR" = ( /obj/effect/turf_decal/stripes/red/line{ dir = 4 @@ -95089,10 +95174,10 @@ /turf/open/floor/iron/dark/small, /area/station/cargo/storage) "sAv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/holopad/secure, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, /area/station/security/medical) "sAy" = ( /obj/structure/flora/grass/jungle, @@ -97111,10 +97196,8 @@ }, /area/station/science/xenobiology) "sTA" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, /turf/open/floor/iron/white, /area/station/security/medical) "sTB" = ( @@ -98732,8 +98815,9 @@ /turf/open/floor/iron, /area/station/engineering/transit_tube) "thg" = ( -/obj/structure/closet/crate, -/obj/effect/spawner/random/maintenance, +/obj/structure/reagent_dispensers/plumbed{ + dir = 1 + }, /turf/open/floor/plating, /area/station/maintenance/port/fore) "thj" = ( @@ -107363,6 +107447,22 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/iron/dark, /area/station/maintenance/thruster_room/central) +"uPT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/roller, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/security/medical) "uPU" = ( /obj/effect/turf_decal/stripes/end{ dir = 8 @@ -108311,6 +108411,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/science/auxlab/firing_range) +"uYO" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/security/medical) "uYQ" = ( /obj/structure/closet/athletic_mixed, /obj/effect/turf_decal/bot, @@ -112990,6 +113099,23 @@ }, /turf/open/floor/iron, /area/station/science/ordnance) +"vSg" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Medbay" + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "vSn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, @@ -117489,22 +117615,10 @@ /turf/open/floor/carpet, /area/station/science/ordnance/office) "wJB" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/light_switch/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/table/glass, -/obj/item/stack/medical/mesh{ - pixel_x = -6 - }, -/obj/item/healthanalyzer/simple{ - pixel_y = 8 - }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/defibrillator_mount/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, /area/station/security/medical) "wJQ" = ( /obj/structure/chair/office{ @@ -119035,17 +119149,14 @@ /turf/open/floor/iron/white/telecomms, /area/station/tcommsat/server) "wZT" = ( -/obj/effect/turf_decal/tile/dark_blue/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/button/door/directional/east{ - name = "Security Mech Garage Door Controls"; - id = "SecMech"; - req_access = list("security") - }, -/obj/machinery/recharge_station, -/turf/open/floor/iron/dark, -/area/station/security/mechbay) +/obj/effect/turf_decal/stripes/end, +/obj/machinery/shower/directional/south, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/item/reagent_containers/blood, +/obj/machinery/iv_drip, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "wZW" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -123267,6 +123378,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/station/maintenance/abandon_office) +"xTd" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/r_wall, +/area/station/security/medical) "xTh" = ( /obj/effect/spawner/random/trash/mess, /obj/structure/cable, @@ -125204,6 +125319,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) +"ykO" = ( +/obj/item/stack/sheet/cardboard, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/maintenance, +/obj/structure/closet/crate, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "ykR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/mapping_helpers/broken_floor, @@ -150582,8 +150704,8 @@ eKF gPp mjE ofH -laf -hXY +pyk +eBw etj rKn xrJ @@ -150838,8 +150960,8 @@ pSi pSi pSi mjE -wVz -rYT +low +kxG rKn rKn rKn @@ -151095,13 +151217,13 @@ mhN mhN mhN mjE -laf +pyk dAg -hXY -mjK -kbf -eKa -eKa +eBw +gci +kif +eBw +eBw tNz bop dTy @@ -151355,13 +151477,13 @@ hGf pRF fAy rKn -rKn -kif -tPT -ufv -tNz -wZT -bAo +bii +bii +bii +uYO +bii +cZT +qiF bAo bAo lHT @@ -151609,14 +151731,14 @@ cYq saz nnK hGf -rYT -mjK -wMc -rKn -tNz -tNz +kxG +gci +thg +bii +wZT +fbj cue -tNz +uPT cZT hAz nDO @@ -151867,10 +151989,10 @@ nwj pAF hGf rYT -wno -kbf -thg -tNz +ykO +piO +bii +vSg kcW cAi bVB @@ -152126,8 +152248,8 @@ hGf rYT kbf cXk -kbf -tNz +xTd +lSN piE sAv sTA @@ -152382,9 +152504,9 @@ nnK hGf uTp hGf -hGf nLa -hGf +bii +bSH wJB aiV ewr @@ -152639,9 +152761,9 @@ nnK hGf mZP hGf -piO cyK -hGf +bii +bii bii bii bii diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 45e7bc7f5dbb..b72b0be9d248 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -4589,7 +4589,15 @@ }, /obj/machinery/camera/autoname/directional/west, /obj/machinery/light_switch/directional/west, -/obj/structure/closet/secure_closet/brig, +/obj/structure/rack, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 7 + }, +/obj/item/storage/medkit/regular{ + pixel_y = 3 + }, +/obj/item/storage/box/bodybags, /turf/open/floor/iron/white, /area/station/security/medical) "bBO" = ( @@ -4616,8 +4624,6 @@ /obj/effect/turf_decal/stripes/end, /obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/shower/directional/south, -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, /turf/open/floor/iron/white/textured, /area/station/security/medical) "bCg" = ( @@ -11206,17 +11212,16 @@ dir = 9 }, /obj/machinery/airalarm/directional/north, -/obj/structure/table/glass, /obj/structure/extinguisher_cabinet/directional/west, -/obj/item/storage/medkit/regular{ - pixel_y = 3 - }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 7 +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/syringe{ + name = "steel point" }, -/obj/item/clothing/gloves/latex, /obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/clothing/neck/stethoscope, +/obj/item/clothing/gloves/latex, /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/white, /area/station/security/medical) @@ -24394,9 +24399,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/engine) "iiQ" = ( -/obj/structure/chair{ - dir = 1 - }, +/obj/structure/chair/office, +/obj/effect/landmark/start/brig_physician, /turf/open/floor/iron/white, /area/station/security/medical) "ija" = ( @@ -33442,7 +33446,7 @@ dir = 1 }, /obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/item/paper_bin{ pixel_y = 6 }, @@ -33454,6 +33458,7 @@ pixel_y = 2 }, /obj/item/pen, +/obj/item/roller, /turf/open/floor/iron/white, /area/station/security/medical) "lfg" = ( @@ -37888,6 +37893,9 @@ /area/station/hallway/primary/aft) "mFi" = ( /obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/defibrillator_mount/directional/south, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, /turf/open/floor/iron/white, /area/station/security/medical) "mFK" = ( @@ -48870,16 +48878,8 @@ dir = 8 }, /obj/machinery/light/directional/west, -/obj/structure/table/glass, -/obj/item/storage/box/bodybags, -/obj/item/reagent_containers/syringe{ - name = "steel point" - }, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/storage/backpack/duffelbag/sec/surgery, -/obj/item/clothing/neck/stethoscope, -/obj/machinery/defibrillator_mount/directional/west, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/white, /area/station/security/medical) "qpi" = ( @@ -69761,7 +69761,7 @@ dir = 1 }, /obj/item/radio/intercom/directional/north, -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/white, /area/station/security/medical) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c03f11d31aa4..3d7fbcb2dd1c 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -417,20 +417,6 @@ }, /turf/open/floor/circuit, /area/station/science/research/abandoned) -"aeY" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Security Maintenance" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/turf/open/floor/iron, -/area/station/security/brig) "aff" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, @@ -1492,15 +1478,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/port) -"aqC" = ( -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/prison) "aqD" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1802,16 +1779,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"atb" = ( -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/prison) "ath" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, @@ -1927,16 +1894,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/hfr_room) -"auu" = ( -/obj/structure/table/glass, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Medbay" - }, -/obj/machinery/computer/records/medical/laptop, -/obj/machinery/status_display/ai/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark, -/area/station/security/medical) "aux" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/start/cyborg, @@ -2352,6 +2309,13 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, /area/station/medical/medbay) +"azu" = ( +/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{ + dir = 1 + }, +/obj/item/training_toolbox, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) "azy" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -2397,6 +2361,20 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"aAg" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 10 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/duct, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "aAh" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -4042,6 +4020,15 @@ /obj/machinery/duct, /turf/open/floor/iron, /area/station/science/research) +"aUM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/chair/office{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/office) "aUN" = ( /obj/structure/lattice/catwalk, /obj/item/toy/plush/space_lizard_plushie{ @@ -4728,6 +4715,13 @@ }, /turf/open/floor/iron, /area/station/cargo/quartermaster) +"bdH" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "bdI" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -5492,33 +5486,6 @@ /obj/structure/window/reinforced/spawner/directional/west, /turf/open/space, /area/space/nearstation) -"bmR" = ( -/obj/effect/turf_decal/trimline/green/filled/line{ - dir = 9 - }, -/obj/structure/rack, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -6 - }, -/obj/item/book/manual/wiki/infections, -/obj/item/reagent_containers/dropper, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/syringe/antiviral, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/reagent_containers/cup/tube, -/obj/item/storage/box/monkeycubes/mousecubes, -/obj/item/storage/box/monkeycubes/mousecubes, -/obj/item/storage/box/monkeycubes/mousecubes, -/turf/open/floor/iron/white, -/area/station/medical/pathology) "bmU" = ( /obj/machinery/door/airlock/external{ name = "External Docking Port" @@ -5794,17 +5761,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/hydroponics) -"bqE" = ( -/obj/structure/rack, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/restraints/handcuffs, -/obj/item/assembly/flash/handheld, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/reagent_dispensers/wall/peppertank/directional/south, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "bqF" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -5871,6 +5827,17 @@ "brb" = ( /turf/closed/wall, /area/station/service/chapel/funeral) +"brc" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison/workout) "brl" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line{ @@ -7504,16 +7471,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"bJC" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/department/security) "bJE" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/effect/spawner/random/structure/steam_vent, @@ -9220,6 +9177,14 @@ "cdt" = ( /turf/closed/wall/r_wall, /area/station/ai_monitored/turret_protected/ai_upload) +"cdv" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "cdB" = ( /obj/structure/chair/sofa/bench/right{ dir = 1 @@ -9411,6 +9376,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/science/robotics/lab) +"cgA" = ( +/obj/effect/turf_decal/trimline/hot_pink/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) "cgH" = ( /obj/structure/table/wood/fancy, /obj/item/reagent_containers/cup/glass/bottle/holywater, @@ -9852,24 +9823,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/maintenance/disposal/incinerator) -"clE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch" - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "clG" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/effect/decal/cleanable/dirt, @@ -12159,25 +12112,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) -"cOE" = ( -/obj/machinery/door/airlock/security{ - name = "Brig" - }, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/poster/official/nanotrasen_logo{ - pixel_x = -32 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/station/security/brig) "cOJ" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -12423,13 +12357,6 @@ }, /turf/open/floor/iron, /area/station/engineering/main) -"cSb" = ( -/obj/effect/turf_decal/tile/hot_pink/anticorner/contrasted{ - dir = 1 - }, -/obj/item/training_toolbox, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/workout) "cSm" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -13119,13 +13046,6 @@ dir = 4 }, /area/station/security/prison/workout) -"dbw" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "dbx" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -13262,26 +13182,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/service/library/abandoned) -"ddp" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/button/door/directional/north{ - id = "brigprison"; - name = "Prison Lockdown"; - req_access = list("brig_entrance") - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "dds" = ( /obj/machinery/camera/directional/east{ c_tag = "Virology - Break Room"; @@ -14106,6 +14006,25 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/project) +"dpB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "dpI" = ( /obj/structure/table, /obj/item/clothing/gloves/latex, @@ -14174,6 +14093,16 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port/aft) +"dqr" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/item/radio/intercom/directional/north, +/obj/machinery/light/small/red/directional/north, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "dqs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -14587,24 +14516,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"dvh" = ( -/obj/structure/rack, -/obj/structure/cable, -/obj/item/storage/box/bodybags, -/obj/item/clothing/under/rank/medical/scrubs/purple, -/obj/item/clothing/under/rank/medical/scrubs/purple{ - pixel_x = 2; - pixel_y = 4 - }, -/obj/item/clothing/gloves/latex, -/obj/item/healthanalyzer, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/security/medical) "dvu" = ( /obj/machinery/door/airlock/engineering{ name = "Starboard Quarter Solar Access" @@ -14952,6 +14863,23 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/dark/side, /area/station/security/prison/workout) +"dAU" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/security/glass{ + name = "Security Office" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/office) "dAX" = ( /obj/machinery/light/small/directional/west, /obj/structure/sign/poster/official/work_for_a_future{ @@ -15065,6 +14993,14 @@ /obj/structure/cable, /turf/open/floor/circuit, /area/station/ai_monitored/turret_protected/ai_upload) +"dBU" = ( +/obj/structure/table/wood, +/obj/item/radio/intercom/prison, +/obj/item/storage/box/lights/mixed{ + pixel_x = 7 + }, +/turf/open/floor/carpet/black, +/area/station/security/prison/mess) "dCd" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -17561,6 +17497,20 @@ /obj/item/toy/figure/curator, /turf/open/floor/iron/dark, /area/station/service/library/printer) +"ehh" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "ehj" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -19125,6 +19075,17 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"eAT" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "eAV" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/red/filled/line{ @@ -21065,6 +21026,19 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/storage) +"eYB" = ( +/obj/item/kirbyplants/random, +/obj/structure/sign/warning/pods/directional/south{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "eYG" = ( /obj/machinery/shower/directional/west{ name = "emergency shower" @@ -22688,6 +22662,17 @@ }, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) +"fsb" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/department/security) "fse" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -24573,6 +24558,15 @@ }, /turf/open/floor/carpet/green, /area/station/service/library) +"fPB" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "fPJ" = ( /obj/machinery/status_display/ai/directional/north, /obj/machinery/firealarm/directional/east, @@ -25687,6 +25681,25 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay) +"gdU" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/pen{ + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/storage/dice{ + pixel_y = 1; + pixel_x = -2 + }, +/obj/item/toy/plush/lizard_plushie{ + pixel_x = 7 + }, +/turf/open/floor/carpet/black, +/area/station/security/prison/mess) "gee" = ( /obj/structure/sign/painting/library{ pixel_y = -32 @@ -25939,6 +25952,14 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"ggk" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "ggu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -26093,18 +26114,6 @@ /obj/item/taperecorder, /turf/open/floor/iron/grimy, /area/station/command/bridge) -"giN" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/structure/sign/poster/random/directional/east, -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/security/prison/workout) "giP" = ( /obj/item/radio/intercom/prison/directional/east, /turf/open/floor/iron/showroomfloor, @@ -26318,17 +26327,6 @@ }, /turf/open/floor/iron, /area/station/cargo/quartermaster) -"gmr" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/bed/roller, -/obj/machinery/iv_drip, -/obj/machinery/light/cold/directional/west, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white/corner, -/area/station/security/medical) "gms" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -26809,6 +26807,18 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"grh" = ( +/obj/structure/sink/directional/south{ + dir = 8; + pixel_x = 14; + pixel_y = 0 + }, +/obj/structure/mirror/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/ghost_critter_spawn, +/turf/open/floor/wood/parquet, +/area/station/security/prison/safe) "gri" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -27697,6 +27707,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white/side, /area/station/science/research) +"gBw" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "gBx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -27890,14 +27909,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"gDP" = ( -/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/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/security/office) "gDS" = ( /obj/structure/sign/directions/supply{ dir = 4; @@ -28479,6 +28490,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/solars/port/fore) +"gKU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "gKW" = ( /obj/machinery/portable_atmospherics/canister, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ @@ -29074,14 +29092,6 @@ /obj/structure/flora/bush/grassy/style_random, /turf/open/floor/grass, /area/station/hallway/secondary/exit/departure_lounge) -"gTb" = ( -/obj/structure/cable, -/obj/machinery/holopad/secure, -/obj/effect/turf_decal/tile/neutral/full, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/large, -/area/station/security/brig) "gTc" = ( /obj/machinery/air_sensor/ordnance_burn_chamber, /turf/open/floor/engine/vacuum, @@ -29332,9 +29342,12 @@ }, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) -"gWj" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 +"gWc" = ( +/obj/structure/table, +/obj/item/storage/box/bodybags, +/obj/item/pen, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 8 }, /turf/open/floor/iron, /area/station/security/execution/transfer) @@ -30042,6 +30055,17 @@ /obj/effect/turf_decal/trimline/neutral, /turf/open/floor/iron/dark, /area/station/medical/pharmacy) +"hfi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/directions/engineering{ + desc = "A sign that shows there are doors here. There are doors everywhere!"; + icon_state = "doors"; + name = "WARNING: BLAST DOORS"; + pixel_y = 32 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "hfk" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -30217,6 +30241,15 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/execution/education) +"hhq" = ( +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/prison) "hhB" = ( /obj/structure/table/reinforced, /obj/machinery/light/directional/east, @@ -30291,6 +30324,15 @@ }, /turf/open/floor/iron/white, /area/station/science/research) +"hit" = ( +/obj/structure/cable, +/obj/machinery/holopad/secure, +/obj/effect/turf_decal/tile/neutral/full, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/turf/open/floor/iron/large, +/area/station/security/brig) "hiy" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/newscaster/directional/east, @@ -30531,6 +30573,15 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/customs/aft) +"hlk" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "hlv" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -30847,20 +30898,6 @@ }, /turf/open/floor/plating, /area/station/science/research/abandoned) -"hpe" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "hps" = ( /obj/structure/table/reinforced, /obj/item/clothing/shoes/magboots{ @@ -32510,6 +32547,17 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hos) +"hMm" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/door/poddoor/preopen{ + id = "brigprison"; + name = "Prison Blast Door" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "hMn" = ( /obj/machinery/mineral/stacking_unit_console{ pixel_x = 32 @@ -32779,18 +32827,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/cargo/office) -"hPx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/red{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "hPJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold/purple/visible{ dir = 8 @@ -32821,14 +32857,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"hQn" = ( -/obj/structure/table, -/obj/item/restraints/handcuffs, -/obj/item/clothing/suit/armor/vest, -/obj/structure/cable, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "hQq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -33345,6 +33373,14 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs/aft) +"hWN" = ( +/obj/structure/table, +/obj/item/restraints/handcuffs, +/obj/item/clothing/suit/armor/vest, +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "hWP" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -33669,6 +33705,12 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"iam" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "iao" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -35087,6 +35129,21 @@ "ipQ" = ( /turf/closed/wall, /area/station/command/bridge) +"ipW" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Infirmary" + }, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/medical) "iqa" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/machinery/airalarm/directional/east, @@ -36778,6 +36835,16 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/dark, /area/station/command/bridge) +"iMh" = ( +/obj/effect/mapping_helpers/airalarm/engine_access, +/obj/machinery/incident_display/delam/directional/west, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 8; + name = "Gas to Chamber" + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/engine, +/area/station/engineering/supermatter) "iMp" = ( /obj/structure/cable, /obj/machinery/airalarm/directional/east, @@ -37701,15 +37768,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/storage/tech) -"iZc" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags, -/obj/item/pen, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "iZf" = ( /obj/effect/turf_decal/tile/yellow/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -38166,14 +38224,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/checkpoint/escape) -"jdx" = ( -/obj/machinery/door/poddoor/preopen{ - id = "brigprison"; - name = "Prison Blast Door" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plating, -/area/station/security/execution/transfer) "jdB" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/siding/yellow/corner{ @@ -38281,11 +38331,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark, /area/station/command/bridge) -"jeG" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/sign/warning/secure_area/directional/south, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "jeI" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32; @@ -38813,11 +38858,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/port) -"jkw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/office) "jky" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/landmark/navigate_destination/research, @@ -38885,16 +38925,6 @@ /obj/structure/chair/stool/bar/directional/west, /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) -"jlb" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 - }, -/obj/effect/landmark/start/prisoner, -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/turf/open/floor/carpet/donk, -/area/station/security/prison/safe) "jll" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/effect/turf_decal/bot, @@ -39996,25 +40026,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"jzs" = ( -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/pen{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/storage/dice{ - pixel_y = 1; - pixel_x = -2 - }, -/obj/item/toy/plush/lizard_plushie{ - pixel_x = 7 - }, -/turf/open/floor/carpet/black, -/area/station/security/prison/mess) "jzt" = ( /obj/structure/table/wood, /obj/item/paper_bin/construction, @@ -40458,12 +40469,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/command/heads_quarters/cmo) -"jDB" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/brig) "jDU" = ( /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -41233,6 +41238,10 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"jNH" = ( +/obj/effect/turf_decal/siding/dark_red, +/turf/open/floor/iron/dark, +/area/station/security/medical) "jNM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, @@ -41387,15 +41396,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/main) -"jPR" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/security/brig) "jPS" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced/tinted, @@ -41701,15 +41701,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) -"jSG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/landmark/start/hangover, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/incident_display/delam/directional/north, -/turf/open/floor/iron, -/area/station/engineering/break_room) "jSH" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -42759,20 +42750,6 @@ /obj/item/ai_module/core/full/crewsimov, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai_upload) -"keC" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "keE" = ( /obj/structure/table/reinforced, /obj/item/plant_analyzer, @@ -43475,17 +43452,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"klV" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/security/prison/workout) "kmb" = ( /obj/structure/cable, /obj/machinery/computer/security{ @@ -43586,6 +43552,13 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/fore) +"knL" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "knP" = ( /obj/structure/chair{ dir = 8 @@ -43617,6 +43590,12 @@ /obj/effect/mapping_helpers/burnt_floor, /turf/open/floor/plating, /area/station/maintenance/department/science) +"koe" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "kol" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -43826,18 +43805,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/security/execution/transfer) -"krP" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 6 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "krT" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -44327,17 +44294,6 @@ }, /turf/open/floor/iron, /area/station/commons/lounge) -"kyu" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/directions/engineering{ - desc = "A sign that shows there are doors here. There are doors everywhere!"; - icon_state = "doors"; - name = "WARNING: BLAST DOORS"; - pixel_y = 32 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "kyx" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ @@ -44377,6 +44333,15 @@ /obj/structure/sign/warning/fire/directional/east, /turf/open/floor/iron, /area/station/engineering/main) +"kyK" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/duct, +/turf/open/floor/iron/large, +/area/station/security/brig) "kyR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, @@ -45241,12 +45206,6 @@ }, /turf/open/floor/carpet/blue, /area/station/service/library/lounge) -"kKa" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/security/brig) "kKf" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/radiation, @@ -45440,6 +45399,15 @@ }, /turf/open/floor/iron, /area/station/security/processing) +"kMz" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "kMI" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -45717,17 +45685,6 @@ }, /turf/open/floor/carpet/black, /area/station/security/prison/mess) -"kPY" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/hot_pink/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/workout) "kQr" = ( /obj/effect/spawner/random/engineering/atmospherics_portable, /obj/effect/turf_decal/bot, @@ -45866,16 +45823,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/medical/abandoned) -"kSg" = ( -/obj/structure/closet/secure_closet/brig{ - name = "Prisoner Locker" - }, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/light/small/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "kSi" = ( /obj/structure/nestbox, /obj/machinery/light/directional/west, @@ -47155,16 +47102,6 @@ }, /turf/open/floor/wood, /area/station/service/lawoffice) -"lhq" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/item/radio/intercom/directional/north, -/obj/machinery/light/small/red/directional/north, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "lhC" = ( /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 @@ -47535,13 +47472,6 @@ /obj/effect/turf_decal/trimline/purple/filled/line, /turf/open/floor/iron/white, /area/station/science/lobby) -"lmG" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) "lmI" = ( /obj/structure/table/glass, /obj/machinery/computer/records/medical/laptop, @@ -47605,6 +47535,11 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/iron, /area/station/hallway/primary/central/aft) +"lnf" = ( +/obj/machinery/vending/wallmed/directional/north, +/obj/structure/table/optable, +/turf/open/floor/iron/dark, +/area/station/security/medical) "lnm" = ( /obj/structure/closet/secure_closet/captains, /obj/effect/turf_decal/stripes/line{ @@ -47800,12 +47735,6 @@ /obj/item/clothing/mask/gas/sechailer, /turf/open/floor/iron/dark, /area/station/security/office) -"lpW" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "lpY" = ( /obj/structure/table/reinforced, /obj/machinery/light_switch/directional/east, @@ -47890,6 +47819,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/department/chapel) +"lrs" = ( +/obj/machinery/door/poddoor/preopen{ + id = "brigprison"; + name = "Prison Blast Door" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/security/execution/transfer) "lrA" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -47939,6 +47876,13 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/station/service/library) +"lsd" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "lsf" = ( /obj/machinery/light/small/directional/north, /obj/effect/decal/cleanable/dirt, @@ -48596,15 +48540,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"lzJ" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/security/brig) "lzM" = ( /obj/item/paper/pamphlet/violent_video_games, /obj/effect/spawner/random/entertainment/money_small, @@ -49105,18 +49040,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/port) -"lFp" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/item/radio/intercom/prison/directional/east, -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/security/prison/workout) "lFs" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -49526,13 +49449,6 @@ /obj/structure/tank_holder/extinguisher, /turf/open/floor/iron, /area/station/medical/pharmacy) -"lKa" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled, -/obj/structure/weightmachine/weightlifter, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/workout) "lKd" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/condiment/saltshaker{ @@ -49911,6 +49827,16 @@ /obj/structure/sign/warning/no_smoking/directional/east, /turf/open/floor/iron/dark, /area/station/science/ordnance) +"lOD" = ( +/obj/structure/closet/secure_closet/brig{ + name = "Prisoner Locker" + }, +/obj/machinery/status_display/ai/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/south, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "lOG" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -50343,6 +50269,14 @@ /obj/effect/landmark/start/prisoner, /turf/open/floor/iron/freezer, /area/station/security/prison/safe) +"lSP" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "lTg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/red{ @@ -50407,16 +50341,6 @@ dir = 1 }, /area/station/engineering/atmos/pumproom) -"lTJ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/south, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "lTT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -51496,13 +51420,6 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron, /area/station/command/gateway) -"mjr" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white/side, -/area/station/security/medical) "mjz" = ( /turf/closed/wall, /area/station/maintenance/starboard/lesser) @@ -51993,6 +51910,15 @@ }, /turf/open/floor/iron/dark, /area/station/commons/fitness/recreation) +"mpX" = ( +/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 = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/office) "mqb" = ( /obj/machinery/door/morgue{ name = "Confession Booth"; @@ -52749,6 +52675,33 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/station/science/breakroom) +"mzp" = ( +/obj/effect/turf_decal/trimline/green/filled/line{ + dir = 9 + }, +/obj/structure/rack, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -6 + }, +/obj/item/book/manual/wiki/infections, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/reagent_containers/cup/tube, +/obj/item/storage/box/monkeycubes/mousecubes, +/obj/item/storage/box/monkeycubes/mousecubes, +/obj/item/storage/box/monkeycubes/mousecubes, +/turf/open/floor/iron/white, +/area/station/medical/pathology) "mzu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53153,6 +53106,15 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron, /area/station/service/kitchen/abandoned) +"mDJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/landmark/start/hangover, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/iron, +/area/station/engineering/break_room) "mDO" = ( /obj/machinery/door/airlock/glass_large{ name = "Laundromat" @@ -53542,14 +53504,6 @@ /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/white, /area/station/medical/paramedic) -"mIb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/chair/office{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/office) "mIc" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/mapping_helpers/broken_floor, @@ -55874,16 +55828,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lobby) -"nlM" = ( -/obj/effect/mapping_helpers/airalarm/engine_access, -/obj/machinery/incident_display/delam/directional/west, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Chamber" - }, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/engine, -/area/station/engineering/supermatter) "nlS" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -56196,6 +56140,11 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) +"npR" = ( +/obj/machinery/status_display/ai/directional/north, +/obj/machinery/computer/operating, +/turf/open/floor/iron/dark, +/area/station/security/medical) "npZ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -56211,6 +56160,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/corporate_showroom) +"nqi" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled, +/obj/structure/weightmachine/weightlifter, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) "nqk" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -56292,6 +56248,21 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"nrN" = ( +/obj/machinery/light_switch/directional/east, +/obj/machinery/firealarm/directional/east{ + pixel_x = 38 + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/side{ + dir = 8 + }, +/area/station/security/medical) "nsd" = ( /obj/structure/table, /obj/item/rcl/pre_loaded, @@ -56429,12 +56400,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) -"nuc" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron, -/area/station/security/brig) "nuj" = ( /obj/item/kirbyplants/random, /obj/machinery/airalarm/directional/south, @@ -58578,14 +58543,6 @@ "nUp" = ( /turf/closed/wall/r_wall, /area/station/engineering/gravity_generator) -"nUr" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/full, -/turf/open/floor/iron/large, -/area/station/security/brig) "nUu" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -59173,12 +59130,6 @@ }, /turf/open/floor/iron, /area/station/engineering/lobby) -"ocs" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "ocx" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Teleporter Maintenance" @@ -59301,6 +59252,16 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating/airless, /area/station/science/ordnance/bomb) +"oeq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/effect/landmark/start/prisoner, +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/carpet/donk, +/area/station/security/prison/safe) "oez" = ( /obj/machinery/recharge_station, /obj/effect/landmark/start/hangover, @@ -60090,19 +60051,6 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/dark, /area/station/science/ordnance/testlab) -"onu" = ( -/obj/item/kirbyplants/random, -/obj/structure/sign/warning/pods/directional/south{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "onK" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60978,14 +60926,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/engineering/main) -"oAV" = ( -/obj/structure/table/wood, -/obj/item/radio/intercom/prison, -/obj/item/storage/box/lights/mixed{ - pixel_x = 7 - }, -/turf/open/floor/carpet/black, -/area/station/security/prison/mess) "oAW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -61461,6 +61401,18 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"oHf" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/disposalpipe/segment, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) +"oHk" = ( +/obj/effect/turf_decal/stripes/end, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "oHo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tile/brown/half/contrasted, @@ -62102,6 +62054,23 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/space/basic, /area/space/nearstation) +"oPs" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/structure/table/reinforced/rglass, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -5; + pixel_y = 2 + }, +/obj/item/roller, +/obj/item/clothing/neck/stethoscope, +/obj/machinery/duct, +/turf/open/floor/iron/white/side{ + dir = 4 + }, +/area/station/security/medical) "oPz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, @@ -62376,19 +62345,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/department/chapel) -"oTg" = ( -/obj/structure/sink/directional/west, -/obj/machinery/light_switch/directional/east, -/obj/machinery/firealarm/directional/east{ - pixel_x = 38 - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white/side{ - dir = 8 - }, -/area/station/security/medical) "oTs" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62590,6 +62546,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/command/gateway) +"oVU" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/reagent_dispensers/wall/peppertank/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "oVW" = ( /obj/machinery/door/poddoor/preopen{ id = "xenobio_maint_aft"; @@ -63368,6 +63333,12 @@ /obj/machinery/light/small/broken/directional/south, /turf/open/floor/plating, /area/station/service/chapel/storage) +"pgi" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/office) "pgr" = ( /obj/machinery/duct, /obj/effect/turf_decal/stripes/line{ @@ -63694,11 +63665,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/port) -"pjq" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "pjN" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -63726,6 +63692,26 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/bitden) +"pjY" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/button/door/directional/north{ + id = "brigprison"; + name = "Prison Lockdown"; + req_access = list("brig_entrance") + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "pjZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, @@ -63877,15 +63863,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/main) -"plh" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig) "pln" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/portable_atmospherics/canister/water_vapor, @@ -63973,6 +63950,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) +"pmn" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/light/cold/directional/west, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/computer/records/medical/laptop, +/obj/structure/table/reinforced/rglass, +/obj/machinery/duct, +/turf/open/floor/iron/white/corner, +/area/station/security/medical) "pmz" = ( /obj/effect/turf_decal/tile/red{ dir = 4 @@ -64460,6 +64449,16 @@ /obj/structure/cable, /turf/open/floor/circuit/green, /area/station/ai_monitored/turret_protected/ai_upload) +"ptt" = ( +/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/duct, +/turf/open/floor/iron, +/area/station/security/office) "ptA" = ( /obj/structure/cable, /obj/structure/table/reinforced, @@ -64959,12 +64958,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/chapel) -"pzJ" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/security/brig) "pzN" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -64974,14 +64967,6 @@ /obj/structure/sign/poster/random/directional/north, /turf/open/floor/iron, /area/station/commons/fitness/recreation) -"pzP" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/security/brig) "pzS" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, @@ -65018,16 +65003,6 @@ /obj/machinery/light/floor/has_bulb, /turf/open/floor/stone, /area/station/science/xenobiology) -"pAs" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/security/brig) "pAu" = ( /obj/effect/landmark/start/hangover, /obj/effect/turf_decal/siding/white{ @@ -65976,11 +65951,6 @@ }, /turf/open/floor/iron, /area/station/command/gateway) -"pLj" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/effect/turf_decal/tile/red/anticorner/contrasted, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "pLm" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -66212,12 +66182,6 @@ }, /turf/open/floor/iron/large, /area/station/science/research) -"pNI" = ( -/obj/effect/turf_decal/trimline/hot_pink/line, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/workout) "pNJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/north, @@ -68406,14 +68370,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/command/heads_quarters/hop) -"qnU" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/brig) "qnY" = ( /turf/closed/wall, /area/station/science/lobby) @@ -68816,6 +68772,12 @@ }, /turf/open/floor/plating, /area/station/maintenance/solars/starboard/fore) +"qtT" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white/side, +/area/station/security/medical) "qua" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -68870,22 +68832,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"quH" = ( -/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{ - pixel_x = 32 - }, -/obj/machinery/vending/wallmed/directional/north, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark, -/area/station/security/medical) "quQ" = ( /obj/item/kirbyplants{ icon_state = "plant-21" @@ -69169,32 +69115,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/theater/abandoned) -"qyB" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 10 - }, -/obj/machinery/airalarm/directional/west, -/obj/structure/closet{ - name = "Prisoner O2 Storage" - }, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/turf/open/floor/iron/dark/textured_corner{ - dir = 4 - }, -/area/station/security/prison/workout) -"qyK" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin, -/obj/item/pen, -/obj/machinery/light/small/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "qyX" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -69211,6 +69131,25 @@ /obj/effect/mapping_helpers/airlock/access/all/supply/mining, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) +"qzb" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple{ + dir = 8 + }, +/obj/machinery/requests_console/directional/west{ + anon_tips_receiver = 1; + assistance_requestable = 1; + department = "Research Director's Desk"; + name = "Research Director's Requests Console"; + receive_ore_updates = 1; + can_send_announcements = 1 + }, +/obj/item/kirbyplants/random/dead, +/obj/machinery/light/directional/west, +/turf/open/floor/iron, +/area/station/command/heads_quarters/rd) "qzc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70585,6 +70524,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/maintenance/department/science) +"qOv" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/red, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "qOB" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -70718,6 +70664,20 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, /turf/open/floor/iron, /area/station/medical/chemistry) +"qPB" = ( +/obj/structure/table/reinforced, +/obj/item/storage/box/bodybags{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/box/prisoner, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/paper_bin, +/obj/item/pen, +/obj/machinery/light/small/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "qPE" = ( /obj/effect/spawner/random/trash/box, /obj/effect/spawner/random/food_or_drink/snack, @@ -71513,6 +71473,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"rcH" = ( +/obj/effect/landmark/event_spawn, +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "rcI" = ( /turf/open/floor/iron, /area/station/cargo/sorting) @@ -71637,6 +71604,18 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/medical/storage) +"rdY" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/prison/directional/east, +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison/workout) "rem" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/sign/poster/random/directional/west, @@ -71733,20 +71712,6 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"rfG" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Infirmary" - }, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/medical) "rfH" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/door/airlock/external{ @@ -71760,6 +71725,14 @@ /obj/effect/landmark/navigate_destination/dockescpod1, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"rfW" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/rack, +/obj/item/restraints/handcuffs, +/obj/item/assembly/flash/handheld, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "rgf" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -71953,6 +71926,16 @@ /obj/machinery/newscaster/directional/south, /turf/open/floor/iron/dark, /area/station/service/abandoned_gambling_den) +"rhY" = ( +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/prison) "riq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/grille/broken, @@ -73910,23 +73893,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/engineering/atmos/storage) -"rFX" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 6 - }, -/obj/structure/closet{ - name = "Prisoner O2 Storage" - }, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/tank/internals/emergency_oxygen, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/obj/item/clothing/mask/breath, -/turf/open/floor/iron/dark/textured_corner{ - dir = 1 - }, -/area/station/security/prison/workout) "rFZ" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -73970,6 +73936,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/station/maintenance/disposal) +"rGz" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison/workout) "rGO" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -74042,14 +74020,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"rIh" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron, -/area/station/maintenance/department/security) "rIk" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -75029,11 +74999,6 @@ }, /turf/open/floor/iron, /area/station/security/warden) -"rSg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/security/medical) "rSi" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/right/directional/west{ @@ -76030,12 +75995,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/cargo/quartermaster) -"sgh" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/red, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "sgj" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/binary/valve, @@ -77448,25 +77407,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/hallway/secondary/entry) -"syT" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/effect/turf_decal/tile/purple{ - dir = 8 - }, -/obj/machinery/requests_console/directional/west{ - anon_tips_receiver = 1; - assistance_requestable = 1; - department = "Research Director's Desk"; - name = "Research Director's Requests Console"; - receive_ore_updates = 1; - can_send_announcements = 1 - }, -/obj/item/kirbyplants/random/dead, -/obj/machinery/light/directional/west, -/turf/open/floor/iron, -/area/station/command/heads_quarters/rd) "szg" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -78172,13 +78112,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/maintenance/port) -"sIi" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "sIk" = ( /obj/structure/chair/sofa/bench/left{ dir = 1 @@ -79088,11 +79021,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/station/service/theater) -"sRQ" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/brig) "sRT" = ( /obj/structure/bookcase/random/adult, /obj/effect/turf_decal/siding/wood{ @@ -79812,6 +79740,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/service/chapel) +"taY" = ( +/obj/effect/turf_decal/siding/dark_red, +/obj/machinery/defibrillator_mount/directional/east, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/dark, +/area/station/security/medical) "tbd" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -81118,12 +81052,6 @@ /obj/item/reagent_containers/cup/watering_can, /turf/open/floor/iron/dark, /area/station/security/prison/garden) -"tsU" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig) "tsZ" = ( /obj/machinery/door/firedoor/heavy, /obj/effect/turf_decal/stripes/corner{ @@ -81872,6 +81800,16 @@ }, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) +"tCP" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/duct, +/turf/open/floor/iron/large, +/area/station/security/brig) "tCQ" = ( /obj/effect/turf_decal/loading_area{ dir = 4 @@ -82925,14 +82863,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/maintenance/port/aft) -"tOP" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron, -/area/station/security/brig) "tOS" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -83214,14 +83144,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningoffice) -"tSk" = ( -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "tSo" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -83869,6 +83791,23 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"uaq" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 6 + }, +/obj/structure/closet{ + name = "Prisoner O2 Storage" + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/iron/dark/textured_corner{ + dir = 1 + }, +/area/station/security/prison/workout) "uaz" = ( /obj/effect/turf_decal/tile/yellow{ dir = 8 @@ -84780,6 +84719,18 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/entry) +"ulR" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/structure/sign/poster/random/directional/east, +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/turf/open/floor/iron/dark/textured_edge{ + dir = 4 + }, +/area/station/security/prison/workout) "umb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -85385,13 +85336,6 @@ }, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) -"uui" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white/side, -/area/station/security/medical) "uuj" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, @@ -86256,18 +86200,24 @@ /obj/effect/spawner/random/engineering/toolbox, /turf/open/floor/plating, /area/station/maintenance/department/electrical) -"uEy" = ( -/obj/structure/sink/directional/south{ - dir = 8; - pixel_x = 14; - pixel_y = 0 +"uEz" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 10 }, -/obj/structure/mirror/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/structure/ghost_critter_spawn, -/turf/open/floor/wood/parquet, -/area/station/security/prison/safe) +/obj/machinery/airalarm/directional/west, +/obj/structure/closet{ + name = "Prisoner O2 Storage" + }, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/obj/item/clothing/mask/breath, +/turf/open/floor/iron/dark/textured_corner{ + dir = 4 + }, +/area/station/security/prison/workout) "uED" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, @@ -86410,6 +86360,19 @@ /obj/structure/chair/stool/directional/south, /turf/open/floor/plating, /area/station/maintenance/fore) +"uGy" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/maintenance/department/security) "uGB" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -86617,6 +86580,16 @@ }, /turf/open/floor/iron/white, /area/station/medical/pathology) +"uJe" = ( +/obj/machinery/camera/directional/north{ + c_tag = "Security - Escape Pod" + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/status_display/ai/directional/north, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "uJk" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/landmark/start/hangover, @@ -86787,22 +86760,6 @@ /obj/structure/sign/poster/contraband/random/directional/south, /turf/open/floor/iron/dark/herringbone, /area/station/security/prison) -"uLG" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/security/general, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/security/office) "uLZ" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -86875,6 +86832,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"uMN" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/closed/wall/r_wall, +/area/station/security/medical) "uMV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -87274,19 +87235,6 @@ }, /turf/open/floor/iron/white, /area/station/service/kitchen/abandoned) -"uQO" = ( -/obj/effect/turf_decal/trimline/neutral/warning{ - dir = 10 - }, -/obj/effect/turf_decal/trimline/neutral/mid_joiner{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/effect/turf_decal/siding/dark_red, -/turf/open/floor/iron/dark/textured_half{ - dir = 1 - }, -/area/station/security/medical) "uQY" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -87444,6 +87392,23 @@ /obj/effect/turf_decal/tile/neutral/full, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/customs/aft) +"uTa" = ( +/obj/effect/turf_decal/trimline/neutral/warning{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/neutral/mid_joiner{ + dir = 4 + }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Medbay" + }, +/obj/structure/bodycontainer/morgue{ + dir = 2 + }, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, +/area/station/security/medical) "uTb" = ( /obj/machinery/door/airlock/highsecurity{ name = "Emergency Access" @@ -87513,6 +87478,16 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/service/abandoned_gambling_den/gaming) +"uTC" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "uTG" = ( /obj/structure/showcase/cyborg/old{ dir = 4; @@ -87726,6 +87701,17 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/ai) +"uWC" = ( +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/hot_pink/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) "uWI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -88250,16 +88236,6 @@ /obj/effect/turf_decal/tile/purple/full, /turf/open/floor/iron/large, /area/station/science/research) -"vcP" = ( -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/item/radio/intercom/prison/directional/east, -/turf/open/floor/iron/dark/herringbone, -/area/station/security/prison) "vcU" = ( /obj/machinery/computer/security/mining{ dir = 4 @@ -88937,6 +88913,15 @@ /obj/structure/sign/clock/directional/east, /turf/open/floor/wood, /area/station/commons/dorms) +"vnd" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/structure/chair/office, +/obj/effect/landmark/start/brig_physician, +/turf/open/floor/iron/white/side, +/area/station/security/medical) "vnn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -88965,6 +88950,12 @@ /obj/machinery/portable_atmospherics/canister/bz, /turf/open/floor/iron, /area/station/engineering/atmos/storage/gas) +"vnr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/security/medical) "vnu" = ( /obj/machinery/airalarm/directional/north, /obj/structure/rack, @@ -89177,6 +89168,15 @@ }, /turf/open/floor/iron, /area/station/command/heads_quarters/hos) +"vpt" = ( +/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/neutral/half/contrasted, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/office) "vpC" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -90841,17 +90841,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron, /area/station/science/research) -"vIM" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/door/poddoor/preopen{ - id = "brigprison"; - name = "Prison Blast Door" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "vIQ" = ( /turf/closed/wall/r_wall, /area/station/command/teleporter) @@ -91417,6 +91406,31 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/range) +"vSB" = ( +/obj/structure/chair/sofa/bench{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/hot_pink/filled/line{ + dir = 4 + }, +/obj/item/radio/intercom/prison/directional/east, +/turf/open/floor/iron/dark/herringbone, +/area/station/security/prison) +"vSC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Security Maintenance" + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "vSE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 1 @@ -92130,6 +92144,11 @@ /obj/effect/turf_decal/trimline/hot_pink/corner, /turf/open/floor/iron/dark/textured, /area/station/security/prison/workout) +"waA" = ( +/obj/machinery/light/small/directional/south, +/obj/structure/sign/warning/secure_area/directional/south, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "waG" = ( /obj/structure/cable, /obj/structure/lattice/catwalk, @@ -92208,10 +92227,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron, /area/station/hallway/primary/fore) -"wbw" = ( -/obj/item/training_toolbox, -/turf/open/floor/iron/dark/textured, -/area/station/security/prison/workout) "wbA" = ( /obj/machinery/light/directional/south, /obj/machinery/camera/directional/south{ @@ -93284,12 +93299,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/pathology) -"wnF" = ( -/obj/effect/landmark/event_spawn, -/obj/structure/cable, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron, -/area/station/security/brig) "wnI" = ( /obj/item/sign, /obj/effect/spawner/random/structure/crate_empty, @@ -93895,18 +93904,6 @@ }, /turf/open/floor/engine, /area/station/science/xenobiology) -"wtv" = ( -/obj/structure/bed, -/obj/item/bedsheet/medical, -/obj/machinery/airalarm/directional/east, -/obj/machinery/light/cold/directional/east, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/turf/open/floor/iron/white/corner{ - dir = 8 - }, -/area/station/security/medical) "wtz" = ( /obj/structure/table, /obj/effect/turf_decal/trimline/blue/filled/corner{ @@ -94534,6 +94531,12 @@ }, /turf/open/floor/iron, /area/station/cargo/warehouse) +"wAg" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "wAk" = ( /obj/effect/turf_decal/tile/blue{ dir = 1 @@ -96064,18 +96067,6 @@ /obj/effect/landmark/carpspawn, /turf/open/space/basic, /area/space) -"wVo" = ( -/obj/effect/turf_decal/trimline/hot_pink/filled/line{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/structure/chair/sofa/bench{ - dir = 8 - }, -/turf/open/floor/iron/dark/textured_edge{ - dir = 4 - }, -/area/station/security/prison/workout) "wVy" = ( /obj/effect/turf_decal/siding/wood, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -96113,6 +96104,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/storage/tech) +"wWh" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron, +/area/station/security/execution/transfer) +"wWk" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "wWn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/glass, @@ -96729,6 +96730,16 @@ /obj/machinery/duct, /turf/open/floor/stone, /area/station/science/xenobiology) +"xdl" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/full, +/obj/machinery/duct, +/turf/open/floor/iron/large, +/area/station/security/brig) "xdn" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/effect/turf_decal/box/red, @@ -97324,19 +97335,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/security/prison) -"xlF" = ( -/obj/effect/turf_decal/trimline/green/end, -/obj/machinery/growing/tray, -/obj/effect/turf_decal/trimline/green/mid_joiner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/green/mid_joiner{ - dir = 4 - }, -/turf/open/floor/iron/half{ - dir = 8 - }, -/area/station/service/hydroponics/garden) "xlG" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -97365,6 +97363,10 @@ /obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/science/genetics) +"xmb" = ( +/obj/item/training_toolbox, +/turf/open/floor/iron/dark/textured, +/area/station/security/prison/workout) "xmg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue{ @@ -97420,6 +97422,25 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/textured_large, /area/station/science/xenobiology) +"xmQ" = ( +/obj/machinery/airalarm/directional/east, +/obj/machinery/light/cold/directional/east, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/rack, +/obj/item/storage/medkit/regular, +/obj/item/clothing/gloves/latex, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/item/storage/box/bodybags, +/obj/item/storage/medkit/regular, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron/white/corner{ + dir = 8 + }, +/area/station/security/medical) "xmR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ @@ -97576,6 +97597,12 @@ }, /turf/open/floor/iron, /area/station/service/hydroponics) +"xoW" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/security/execution/transfer) "xpr" = ( /obj/effect/spawner/random/decoration/carpet, /obj/effect/spawner/random/structure/furniture_parts, @@ -99719,6 +99746,14 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/fore) +"xOS" = ( +/obj/structure/cable, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "xPc" = ( /turf/closed/wall, /area/station/medical/pathology) @@ -99880,16 +99915,6 @@ /obj/item/clothing/under/dress/redeveninggown, /turf/open/floor/wood, /area/station/commons/dorms) -"xRe" = ( -/obj/machinery/camera/directional/north{ - c_tag = "Security - Escape Pod" - }, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/status_display/ai/directional/north, -/turf/open/floor/iron, -/area/station/security/execution/transfer) "xRo" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -99932,14 +99957,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) -"xRF" = ( -/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 = 8 - }, -/turf/open/floor/iron, -/area/station/security/office) "xRO" = ( /obj/structure/fireplace, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -100102,6 +100119,26 @@ /obj/structure/sign/warning/secure_area/directional/north, /turf/open/floor/plating, /area/station/maintenance/department/science) +"xUk" = ( +/obj/machinery/door/airlock/security{ + name = "Brig" + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/poster/official/nanotrasen_logo{ + pixel_x = -32 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "xUl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -100394,17 +100431,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/station/maintenance/port) -"xXI" = ( -/obj/structure/table/reinforced, -/obj/item/storage/box/bodybags{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/box/prisoner, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark, -/area/station/security/execution/transfer) "xXK" = ( /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, @@ -123510,7 +123536,7 @@ eHy qJs cxp sHT -nlM +iMh aEF oXm sHT @@ -124772,7 +124798,7 @@ vQj uCa uCa leE -jSG +mDJ kyW jzU bAR @@ -131503,7 +131529,7 @@ hkZ voZ iao nLM -syT +qzb hnM urt awA @@ -135658,7 +135684,7 @@ aaa aaa gqm gqm -bmR +mzp grE uxI gqm @@ -140671,7 +140697,7 @@ gvq wkP wZo dGr -xlF +ayQ qAV daR dla @@ -151479,7 +151505,7 @@ oWP vmo lQj xBD -qyB +uEz ydH qfM xzJ @@ -151993,7 +152019,7 @@ sxn cpE xqc eEi -rFX +uaq ydH xPo krO @@ -152290,7 +152316,7 @@ pJq tNZ dth avF -clE +dpB avF rYA qkC @@ -152484,9 +152510,9 @@ cBq brG rRL usE -vcP -atb -aqC +vSB +rhY +hhq uXg vwy aQs @@ -152547,7 +152573,7 @@ nht oXV fIj hie -rIh +hlk ewb avF mEb @@ -152777,34 +152803,34 @@ sFW meT fOH fOH -lmG -qnU -wnF -sRQ -nUr -sIi -pAs -dbw -cOE -plh -tOP +cdv +kMz +rcH +wAg +kyK +xOS +eAT +ggk +xUk +uTC +fPB wUY -jPR +xdl wUY -gTb +hit wUY -jDB +knL wUY -kKa +oHf qFA -kKa -lzJ -pzP -pzJ -tsU -aeY -hPx -bJC +oHf +tCP +gBw +lsd +bdH +vSC +uGy +fsb ieh tuv vHY @@ -153034,7 +153060,7 @@ vCk owO owO dxT -nuc +gKU flD cDm owO @@ -153257,7 +153283,7 @@ giW hLY rnU jmZ -jlb +oeq hBX lTv cBq @@ -153291,7 +153317,7 @@ lET hQq cjN hQq -uLG +dAU jXt hQq cjN @@ -153513,7 +153539,7 @@ brG lXj lTv vmm -uEy +grh lGm lGm aHz @@ -153540,15 +153566,15 @@ hLz iCo nYt lET -hpe -uQO -gmr -dvh +oHk +aAg +pmn +oPs pWT eVE nzR gKp -gDP +vpt rTG nsG ozu @@ -153797,15 +153823,15 @@ hLz iuk puN lET -keC -krP -mjr -rSg -rfG -ymb -mIb -jkw -xRF +uTa +ehh +vnd +vnr +ipW +ptt +aUM +pgi +mpX wdM cbX one @@ -154054,9 +154080,9 @@ mcb iCo spB lET -lET -auu -uui +npR +jNH +qtT rJR fcE ymb @@ -154310,11 +154336,11 @@ ouc mcb iCo krO -qyK -lET -quH -wtv -oTg +uMN +lnf +taY +xmQ +nrN pWT mif qlN @@ -154566,8 +154592,8 @@ tAn lMN mcb iCo -krO -bqE +oVU +lET lET lET lET @@ -154818,13 +154844,13 @@ rnA rnA rnA rnA -pNI -lKa +cgA +nqi hPN hLz iCo krO -xXI +qPB qIH aaa aaa @@ -155076,12 +155102,12 @@ iDC ylB pqk uuf -kPY +uWC xPz hLz -sgh -lTJ -gJk +qOv +yiA +rfW qIH etw qYo @@ -155338,7 +155364,7 @@ lAj vxs kiB krO -kSg +lOD qIH aaa aaa @@ -155580,7 +155606,7 @@ fiO pAx sxn vTP -cSb +azu pMG pMG pMG @@ -155814,8 +155840,8 @@ fRi srJ vNi lqh -oAV -jzs +dBU +gdU nDp fRi vOH @@ -156354,7 +156380,7 @@ vTP pMG sxn rwn -wbw +xmb wIS foR sxn @@ -157135,8 +157161,8 @@ eHO eHO eHO eHO -ddp -onu +pjY +eYB qIH aad aad @@ -157379,11 +157405,11 @@ fiO ivM rzk dbg -klV -lFp -wVo -giN -klV +brc +rdY +rGz +ulR +brc mAA xqc dwC @@ -157392,8 +157418,8 @@ bJx mor dXF eHO -vIM -jdx +hMm +lrs qIH aad aaa @@ -157649,8 +157675,8 @@ gRU xAc mKL sXd -lpW -jeG +xoW +waA qIH qIH qIH @@ -157906,7 +157932,7 @@ swn aAA qbp eHO -kyu +hfi xzJ aMi ojW @@ -158163,7 +158189,7 @@ uuj fRe eho eHO -pjq +wWk xzJ qIH gJk @@ -158421,8 +158447,8 @@ iGx nkn eHO cXC -ocs -iZc +iam +gWc gJk aaa aad @@ -158677,9 +158703,9 @@ omd gku mZA eHO -lhq -tSk -hQn +dqr +lSP +hWN jrA aaa aad @@ -158934,9 +158960,9 @@ skQ pdF rQv eHO -xRe -gWj -pLj +uJe +koe +wWh gJk aaa efQ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index eb5734c42eeb..5e681e64154b 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -2117,13 +2117,9 @@ /turf/open/floor/iron/large, /area/station/commons/storage/tools) "aKt" = ( -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/window/brigdoor/left/directional/south{ - name = "Security Medpost" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/security/medical) "aKG" = ( @@ -5566,6 +5562,7 @@ dir = 4 }, /obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/processing) "bLL" = ( @@ -6371,6 +6368,7 @@ dir = 4 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/processing) "bYK" = ( @@ -11423,6 +11421,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/security/courtroom) +"dyr" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/turf/closed/wall/r_wall, +/area/station/security/medical) "dyE" = ( /obj/structure/chair/pew/right{ dir = 1 @@ -12121,6 +12125,7 @@ }, /obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/duct, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -14881,6 +14886,7 @@ /area/station/commons/dorms) "eGj" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/security/medical) "eGl" = ( @@ -17273,7 +17279,7 @@ dir = 4 }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/red{ +/obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 }, /turf/open/floor/iron, @@ -17722,6 +17728,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/security/processing) "fEC" = ( @@ -18192,9 +18199,8 @@ /turf/open/floor/plating, /area/station/science/research) "fLX" = ( -/obj/structure/bodycontainer/morgue{ - dir = 2 - }, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/shower/directional/south, /turf/open/floor/iron/white/textured, /area/station/security/medical) "fLY" = ( @@ -21672,6 +21678,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/anticorner/contrasted, +/obj/machinery/duct, /turf/open/floor/iron/dark/corner{ dir = 1 }, @@ -23207,6 +23214,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/drone_bay) +"hwh" = ( +/obj/structure/reagent_dispensers/watertank{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "hwn" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -24229,6 +24242,8 @@ "hQd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/item/reagent_containers/blood, +/obj/machinery/iv_drip, /turf/open/floor/iron/white/textured, /area/station/security/medical) "hQi" = ( @@ -25425,6 +25440,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, +/obj/effect/turf_decal/tile/red{ + dir = 4 + }, /turf/open/floor/iron, /area/station/security/brig/upper) "ijY" = ( @@ -25818,10 +25836,10 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/surface/outdoors/nospawn) "ipP" = ( -/obj/structure/bed, -/obj/item/clothing/suit/jacket/straight_jacket, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/table/reinforced/rglass, +/obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/white/textured, /area/station/security/medical) "ipZ" = ( @@ -26390,6 +26408,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) +"iAo" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig/upper) "iAt" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable, @@ -27016,9 +27044,8 @@ /area/station/maintenance/fore) "iLe" = ( /obj/item/radio/intercom/directional/north, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, /obj/machinery/light/directional/north, +/obj/structure/table/optable, /turf/open/floor/iron/white/textured, /area/station/security/medical) "iLf" = ( @@ -28033,6 +28060,12 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/camera/directional/north{ + c_tag = "Security - Upper Brig South" + }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/brig/upper) "jaN" = ( @@ -28437,6 +28470,13 @@ /obj/structure/table, /turf/open/floor/iron/grimy, /area/station/security/prison/work) +"jhL" = ( +/obj/structure/reagent_dispensers/plumbed{ + name = "dormitory water reservoir"; + dir = 8 + }, +/turf/open/floor/plating, +/area/station/maintenance/fore) "jhQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -28526,6 +28566,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/brig/upper) "jjx" = ( @@ -28554,6 +28597,14 @@ /obj/structure/mirror/directional/east, /turf/open/floor/iron/freezer, /area/station/commons/toilet/locker) +"jkf" = ( +/obj/item/clothing/gloves/latex, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/structure/table/reinforced/rglass, +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "jkn" = ( /obj/effect/turf_decal/tile/dark/fourcorners, /turf/open/floor/iron, @@ -31162,6 +31213,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/security/medical) "kce" = ( @@ -31272,10 +31324,7 @@ /turf/open/misc/asteroid/snow/standard_air, /area/station/science/research) "kdT" = ( -/obj/machinery/iv_drip, -/obj/item/reagent_containers/blood, -/obj/machinery/airalarm/directional/north, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/computer/operating, /turf/open/floor/iron/white/textured, /area/station/security/medical) "kdW" = ( @@ -32092,9 +32141,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/carpet, /area/station/service/library) -"kqc" = ( -/turf/closed/wall, -/area/station/security/medical) "kqh" = ( /obj/structure/chair/wood{ dir = 8 @@ -33736,10 +33782,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/ai_upload, /turf/open/floor/iron/dark, /area/station/ai_monitored/turret_protected/aisat_interior) -"kQE" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/open/floor/plating, -/area/station/maintenance/fore) "kQM" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 @@ -34364,6 +34406,7 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/iron/smooth, /area/station/security/processing) "laD" = ( @@ -37293,6 +37336,14 @@ }, /turf/open/floor/grass, /area/station/medical/pathology) +"lYS" = ( +/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/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/fore) "lYY" = ( /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, @@ -38854,10 +38905,10 @@ /turf/open/floor/plating, /area/station/maintenance/department/chapel) "mBK" = ( +/obj/machinery/light/directional/north, /obj/structure/bodycontainer/morgue{ dir = 2 }, -/obj/machinery/light/directional/north, /turf/open/floor/iron/white/textured, /area/station/security/medical) "mBQ" = ( @@ -40031,6 +40082,10 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/brig/upper) "mWU" = ( @@ -41608,6 +41663,7 @@ }, /obj/structure/cable, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/duct, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -43105,6 +43161,13 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/iron/grimy, /area/station/service/bar/atrium) +"nNQ" = ( +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/security/brig/upper) "nNY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43159,16 +43222,6 @@ /obj/item/pillow/random, /turf/open/floor/carpet, /area/station/commons/dorms) -"nOv" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/landmark/start/security_assistant, -/turf/open/floor/iron, -/area/station/security/brig/upper) "nOw" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment, @@ -43466,6 +43519,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/processing) "nSK" = ( @@ -44009,6 +44063,10 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) +"ocl" = ( +/obj/structure/window/reinforced/spawner/directional/south, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "ocu" = ( /obj/effect/turf_decal/bot_white, /obj/structure/cable, @@ -46047,12 +46105,19 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "oIC" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 +/obj/item/storage/box/bodybags, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/item/reagent_containers/syringe{ + name = "steel point" }, -/turf/open/floor/iron, -/area/station/security/brig/upper) +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/structure/table/reinforced/rglass, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/item/roller, +/obj/item/clothing/neck/stethoscope, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "oIJ" = ( /obj/effect/landmark/start/medical_doctor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -52565,6 +52630,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/duct, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -54358,11 +54424,6 @@ /turf/open/floor/iron/textured, /area/mine/mechbay) "rud" = ( -/obj/item/clothing/gloves/latex, -/obj/item/clothing/mask/surgical, -/obj/item/reagent_containers/spray/cleaner, -/obj/structure/table/glass, -/obj/structure/window/reinforced/spawner/directional/south, /turf/open/floor/iron/white/textured, /area/station/security/medical) "ruo" = ( @@ -54769,6 +54830,16 @@ }, /turf/open/floor/plating, /area/station/ai_monitored/turret_protected/aisat/maint) +"rAN" = ( +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig/upper) "rAO" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -55846,6 +55917,7 @@ dir = 4 }, /obj/machinery/door/firedoor, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/processing) "rUb" = ( @@ -56351,13 +56423,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"scu" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/obj/effect/turf_decal/tile/red/half/contrasted, -/turf/open/floor/iron, -/area/station/security/brig/upper) "scw" = ( /turf/open/floor/plating/snowed/smoothed/icemoon, /area/icemoon/underground/explored) @@ -60111,6 +60176,9 @@ /obj/machinery/firealarm/directional/south, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, /turf/open/floor/iron, /area/station/security/brig/upper) "tpx" = ( @@ -60140,15 +60208,8 @@ /turf/open/floor/iron, /area/mine/laborcamp) "tpX" = ( -/obj/item/storage/box/bodybags, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/item/reagent_containers/syringe{ - name = "steel point" - }, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/structure/table/glass, -/obj/structure/window/reinforced/spawner/directional/south, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/white/textured, /area/station/security/medical) "tqb" = ( @@ -60967,11 +61028,17 @@ /turf/open/floor/plating/snowed/icemoon, /area/icemoon/underground/explored) "tDk" = ( +/obj/machinery/door/firedoor/border_only, +/obj/machinery/door/window/brigdoor/left/directional/south{ + name = "Security Medpost"; + req_access = list("security") + }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, -/turf/open/floor/iron, -/area/station/security/brig/upper) +/obj/machinery/duct, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "tDv" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -64256,6 +64323,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/fore) "uHS" = ( @@ -65749,6 +65817,7 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 8 }, +/obj/machinery/duct, /turf/open/floor/iron/dark/corner{ dir = 4 }, @@ -66655,6 +66724,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/landmark/event_spawn, +/obj/structure/chair/office, +/obj/effect/landmark/start/brig_physician, +/obj/machinery/duct, /turf/open/floor/iron/white/textured, /area/station/security/medical) "vxd" = ( @@ -67844,6 +67916,7 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/processing) "vRO" = ( @@ -68759,14 +68832,10 @@ }, /area/station/science/xenobiology) "whd" = ( -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 +/obj/machinery/airalarm/directional/east, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 }, -/obj/item/storage/medkit/regular, -/obj/structure/table/glass, -/obj/structure/window/reinforced/spawner/directional/south, -/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white/textured, /area/station/security/medical) "whf" = ( @@ -69931,14 +70000,8 @@ /obj/structure/disposalpipe/segment{ dir = 10 }, -/obj/machinery/camera/directional/north{ - c_tag = "Security - Upper Brig South" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/security/brig/upper) +/turf/closed/wall/r_wall, +/area/station/security/medical) "wAv" = ( /obj/structure/chair/comfy/brown{ dir = 1 @@ -70081,6 +70144,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"wCf" = ( +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/regular, +/obj/structure/table/reinforced/rglass, +/obj/structure/window/reinforced/spawner/directional/south, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/white/textured, +/area/station/security/medical) "wCg" = ( /obj/machinery/light/small/directional/east, /obj/machinery/light_switch/directional/east, @@ -73315,6 +73389,10 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/brig/upper) "xAS" = ( @@ -74072,7 +74150,6 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "xMn" = ( -/obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/holopad, /turf/open/floor/iron/white/textured, /area/station/security/medical) @@ -74312,6 +74389,7 @@ dir = 4 }, /obj/effect/turf_decal/tile/red/half/contrasted, +/obj/machinery/duct, /turf/open/floor/iron/dark/side{ dir = 1 }, @@ -235745,9 +235823,9 @@ kGc kWh qVJ mgU -kqc -kqc -kqc +kzw +kzw +kzw wAq jaw xwf @@ -236262,7 +236340,7 @@ bUx mBK eGj xMn -cAC +ocl jjt bRG hfA @@ -236520,7 +236598,7 @@ ipP vxc aKt tDk -jjt +iAo lUw iWS vwt @@ -236776,9 +236854,9 @@ bUx iLe aOS rud -cAC +jkf mWM -scu +bRG pmr qPp ryG @@ -237033,9 +237111,9 @@ bUx kdT hQd whd -cAC +wCf mWM -bRG +nNQ kpj fGq eig @@ -237290,7 +237368,7 @@ bUx kzw kzw kzw -cAC +dyr xAQ mEI jNp @@ -237548,7 +237626,7 @@ fXi vhL law eqI -nOv +rAN wAT lbk bln @@ -240889,7 +240967,7 @@ ekW vRN fEA uHF -eqq +lYS eqq qdK eqq @@ -241145,12 +241223,12 @@ aML hPq hSJ ykw +jhL +hwh deY deY deY deY -kQE -deY fhz deY fhz diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index bfa077606ff7..2efd4297657a 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1501,6 +1501,16 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, /turf/open/floor/engine, /area/station/ai_monitored/turret_protected/aisat/atmos) +"aup" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark_red{ + dir = 8 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/security/medical) "auN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/west, @@ -5521,6 +5531,11 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/duct, +/obj/structure/grille/broken, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "bRv" = ( @@ -6039,6 +6054,20 @@ }, /turf/open/floor/iron/dark, /area/station/service/kitchen) +"bZe" = ( +/obj/machinery/door/airlock/maintenance, +/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/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "brig-maint-passthrough" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/security/maintenance, +/obj/machinery/duct, +/turf/open/floor/iron/dark, +/area/station/security/execution/transfer) "bZg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7086,6 +7115,13 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/science/ordnance) +"clH" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "clL" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -9402,10 +9438,11 @@ /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/burnt_floor, +/obj/machinery/duct, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "dbW" = ( @@ -16607,6 +16644,14 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/starboard) +"fqx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/mapping_helpers/burnt_floor, +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/port/lesser) "fqG" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -17648,18 +17693,12 @@ /area/station/maintenance/disposal/incinerator) "fEr" = ( /obj/machinery/firealarm/directional/east, -/obj/structure/table/glass, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = 5; - pixel_y = -1 - }, -/obj/item/reagent_containers/spray/cleaner{ - pixel_x = -3; - pixel_y = 2 +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 }, -/obj/item/healthanalyzer, -/obj/item/clothing/gloves/latex, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/showroomfloor, /area/station/security/medical) "fEu" = ( /obj/effect/turf_decal/siding/yellow{ @@ -17698,6 +17737,7 @@ /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/neutral, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/brig) "fEP" = ( @@ -20528,13 +20568,14 @@ /area/station/maintenance/starboard) "gzh" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, /obj/structure/disposalpipe/segment{ dir = 6 }, /obj/effect/mapping_helpers/burnt_floor, +/obj/structure/reagent_dispensers/plumbed{ + dir = 4 + }, +/obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "gzm" = ( @@ -22369,6 +22410,7 @@ cycle_id = "brig-maint-passthrough" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/execution/transfer) "hfR" = ( @@ -26366,9 +26408,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central) "inI" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) @@ -29444,6 +29483,7 @@ }, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/medical) "jgz" = ( @@ -29626,6 +29666,9 @@ dir = 1 }, /obj/effect/turf_decal/box, +/obj/effect/turf_decal/siding/dark_red{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "jjf" = ( @@ -30854,14 +30897,10 @@ /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 1 }, -/obj/structure/bed{ - dir = 1 - }, -/obj/item/bedsheet/medical{ - dir = 1 - }, -/obj/machinery/iv_drip, /obj/effect/turf_decal/box, +/obj/structure/table/glass, +/obj/machinery/computer/records/medical/laptop, +/obj/effect/turf_decal/siding/dark_red, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "jHR" = ( @@ -31249,11 +31288,14 @@ /turf/open/floor/iron/showroomfloor, /area/station/medical/surgery/aft) "jMh" = ( -/obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron/showroomfloor, +/obj/machinery/shower/directional/north, +/obj/effect/turf_decal/stripes/end{ + dir = 1 + }, +/turf/open/floor/iron/white/textured, /area/station/security/medical) "jMo" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -33854,6 +33896,15 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron, /area/station/security/brig) +"kKM" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/red/half/contrasted, +/obj/effect/turf_decal/tile/neutral, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/iron, +/area/station/security/brig) "kKP" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -33995,6 +34046,7 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/security/execution/transfer) "kNf" = ( @@ -40299,9 +40351,13 @@ /area/station/ai_monitored/command/storage/satellite) "mPG" = ( /obj/machinery/vending/wallmed/directional/east, -/obj/structure/table/glass, -/obj/machinery/computer/records/medical/laptop, -/turf/open/floor/iron/dark, +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/security/medical) "mPP" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -42597,6 +42653,7 @@ /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/neutral/fourcorners, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/brig) "nCI" = ( @@ -44023,7 +44080,10 @@ pixel_x = 22 }, /obj/machinery/light/small/directional/east, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/showroomfloor, /area/station/security/medical) "oeF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44811,9 +44871,6 @@ /turf/open/floor/plating, /area/station/engineering/atmos) "oux" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, /obj/effect/decal/cleanable/blood/old, /obj/effect/turf_decal/tile/neutral, /turf/open/floor/iron/showroomfloor, @@ -47637,6 +47694,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/iron, /area/station/security/brig) "pop" = ( @@ -49517,6 +49575,8 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "pUA" = ( @@ -53941,6 +54001,7 @@ dir = 9 }, /obj/effect/mapping_helpers/broken_floor, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "ron" = ( @@ -55328,6 +55389,7 @@ /turf/open/floor/plating, /area/station/hallway/primary/central/fore) "rJs" = ( +/obj/machinery/duct, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "rJJ" = ( @@ -56353,7 +56415,8 @@ /obj/item/storage/medkit/regular, /obj/item/reagent_containers/cup/bottle/epinephrine, /obj/item/reagent_containers/syringe, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/tile/red/anticorner/contrasted, +/turf/open/floor/iron/showroomfloor, /area/station/security/medical) "sby" = ( /obj/effect/turf_decal/tile/blue, @@ -57308,8 +57371,8 @@ /turf/open/floor/plating, /area/station/maintenance/department/security/upper) "soW" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/effect/turf_decal/tile/neutral, +/obj/effect/turf_decal/tile/red/half/contrasted, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "spd" = ( @@ -58169,10 +58232,22 @@ /obj/item/pen, /obj/structure/table, /obj/item/radio/intercom/directional/west, +/obj/item/clothing/gloves/latex, +/obj/item/healthanalyzer, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = 5; + pixel_y = -1 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -3; + pixel_y = 2 + }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, /area/station/security/medical) "sEx" = ( /obj/effect/turf_decal/tile/neutral{ @@ -62205,7 +62280,9 @@ /obj/structure/bodycontainer/crematorium{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, /area/station/security/medical) "tRL" = ( /obj/effect/decal/cleanable/dirt, @@ -64293,6 +64370,9 @@ "uCd" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, +/obj/effect/turf_decal/siding/dark_red{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "uCf" = ( @@ -65494,13 +65574,13 @@ /turf/open/floor/iron/dark, /area/station/service/hydroponics/garden) "uZr" = ( -/obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, /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/mapping_helpers/broken_floor, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/lesser) "uZN" = ( @@ -65832,6 +65912,9 @@ name = "Infirmary" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 1 + }, /turf/open/floor/iron/dark, /area/station/security/medical) "veP" = ( @@ -67858,6 +67941,7 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/iron/dark, /area/station/security/brig) "vGs" = ( @@ -71548,13 +71632,17 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/brig) "wKw" = ( -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 4 - }, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/effect/landmark/start/brig_physician, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 1 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "wKG" = ( @@ -72755,6 +72843,10 @@ /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 }, +/obj/machinery/duct, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 8 + }, /turf/open/floor/iron/showroomfloor, /area/station/security/medical) "xeP" = ( @@ -74766,7 +74858,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/dark/textured_half{ + dir = 1 + }, /area/station/security/medical) "xNc" = ( /turf/closed/wall/r_wall/rust, @@ -93482,10 +93576,10 @@ kho shZ xNq mlB -vWU +fqx gzh dbR -kgc +bZe kNe qSB gPA @@ -95285,7 +95379,7 @@ pEa phs iMK gyA -enU +kKM gRd jHN sEs @@ -95542,10 +95636,10 @@ cXh rnc rnc vVt -vtf +clH jgv xeL -uCd +aup uCd jiZ veN @@ -95805,7 +95899,7 @@ pUm rJs rJs jMh -ijl +uax lmA rCF eqA diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 36dd38a79272..6283f0be7e29 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1925,6 +1925,22 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/hallway/secondary/service) +"aJK" = ( +/obj/structure/reagent_dispensers/plumbed, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) +"aJN" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "aJO" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers"; @@ -3395,7 +3411,6 @@ /turf/open/floor/iron, /area/station/security/brig) "bhI" = ( -/obj/structure/window/spawner/directional/north, /obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -12674,6 +12689,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"eMS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "eMU" = ( /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 @@ -15654,16 +15678,10 @@ /turf/open/floor/carpet, /area/station/service/theater) "fVz" = ( -/obj/structure/window/spawner/directional/east, -/obj/structure/rack, +/obj/structure/window/reinforced/spawner/directional/east, /obj/machinery/camera/directional/south{ c_tag = "Brig - Infirmary" }, -/obj/item/clothing/under/rank/medical/scrubs/purple, -/obj/item/storage/medkit/regular, -/obj/item/healthanalyzer{ - pixel_y = -2 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -15671,8 +15689,9 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 6 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/computer/operating{ + dir = 1 }, /turf/open/floor/iron/white, /area/station/security/medical) @@ -17976,15 +17995,12 @@ /turf/open/floor/iron/dark, /area/station/medical/morgue) "gMg" = ( -/obj/structure/table, -/obj/item/storage/medkit/regular, -/obj/item/reagent_containers/cup/bottle/epinephrine, -/obj/item/reagent_containers/cup/bottle/multiver, -/obj/item/reagent_containers/syringe, /obj/structure/extinguisher_cabinet/directional/west, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/white, /area/station/security/medical) "gMi" = ( @@ -18954,15 +18970,24 @@ /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/storage/gas) "hcb" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/processor{ - pixel_y = 9 +/obj/structure/table/reinforced, +/obj/item/reagent_containers/condiment/rice{ + pixel_x = -8 }, -/obj/effect/turf_decal/bot, +/obj/machinery/light/directional/west, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/item/reagent_containers/condiment/sugar{ + pixel_x = 7; + pixel_y = 7 + }, +/obj/item/reagent_containers/condiment/flour{ + pixel_x = 5 + }, +/obj/item/storage/fancy/egg_box, /turf/open/floor/iron/white, /area/station/security/prison/mess) "hcv" = ( @@ -22537,7 +22562,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Infirmary" + name = "Infirmary"; + req_access = list("security") }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -23754,8 +23780,8 @@ }, /area/station/service/chapel) "iIw" = ( -/obj/structure/bed/roller, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "iIC" = ( @@ -30332,20 +30358,13 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "kSs" = ( -/obj/structure/table, /obj/item/radio/intercom/directional/north, /obj/machinery/light/small/directional/north, -/obj/item/folder/red{ - pixel_x = 3 - }, -/obj/item/folder/white{ - pixel_x = -4; - pixel_y = 2 - }, -/obj/item/healthanalyzer, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/table/reinforced/rglass, +/obj/machinery/computer/records/medical/laptop, /turf/open/floor/iron/white, /area/station/security/medical) "kSw" = ( @@ -31140,18 +31159,19 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "lhc" = ( -/obj/structure/bed, -/obj/item/bedsheet, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/iv_drip, /obj/effect/turf_decal/tile/red{ dir = 8 }, /obj/structure/cable, /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/obj/structure/table/optable, +/obj/machinery/defibrillator_mount/directional/south, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/security/medical) "lhk" = ( @@ -32065,12 +32085,14 @@ "lvu" = ( /obj/machinery/door/window/left/directional/west{ dir = 4; - name = "Infirmary" + name = "Infirmary"; + req_access = list("security") }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "lvG" = ( @@ -34766,7 +34788,9 @@ /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/oven, +/obj/machinery/chem_master/condimaster{ + name = "CondiMaster Neo" + }, /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/security/prison/mess) @@ -36988,16 +37012,12 @@ /turf/open/floor/iron, /area/station/security/courtroom) "nhO" = ( -/obj/machinery/camera/directional/west{ - c_tag = "Prison Cafeteria"; - network = list("ss13","prison") - }, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, /obj/machinery/griddle, -/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/white, /area/station/security/prison/mess) "nhP" = ( @@ -37863,6 +37883,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/office) +"nuw" = ( +/obj/effect/turf_decal/tile/red{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red, +/obj/structure/table/reinforced, +/obj/machinery/processor{ + pixel_y = 10 + }, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "nuI" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -41721,10 +41752,6 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) -"oPn" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/security/medical) "oPp" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/tcomms_all, @@ -42103,12 +42130,21 @@ /turf/open/floor/iron/dark, /area/station/command/heads_quarters/hop) "oWZ" = ( -/obj/structure/table, /obj/machinery/airalarm/directional/north, -/obj/machinery/computer/records/medical/laptop, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, +/obj/structure/rack, +/obj/item/storage/medkit/regular, +/obj/item/storage/medkit/regular, +/obj/item/clothing/gloves/latex, +/obj/item/roller, +/obj/item/clothing/mask/surgical, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, +/obj/item/reagent_containers/syringe, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/white, /area/station/security/medical) "oXd" = ( @@ -43038,15 +43074,11 @@ /turf/open/floor/iron/white, /area/station/command/heads_quarters/rd) "poE" = ( -/obj/effect/decal/cleanable/food/flour, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/effect/turf_decal/bot, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo" - }, +/obj/machinery/oven, /turf/open/floor/iron/white, /area/station/security/prison/mess) "poJ" = ( @@ -44635,26 +44667,21 @@ /turf/open/floor/plating, /area/station/maintenance/central) "pQV" = ( -/obj/structure/table/reinforced, /obj/effect/turf_decal/tile/red, /obj/effect/turf_decal/tile/red{ dir = 1 }, -/obj/machinery/light/directional/west, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/item/reagent_containers/condiment/flour, -/obj/item/reagent_containers/condiment/rice{ - pixel_x = -10 - }, -/obj/item/reagent_containers/condiment/sugar{ - pixel_x = 9; - pixel_y = 6 +/obj/structure/table/reinforced, +/obj/item/storage/bag/tray, +/obj/item/kitchen/rollingpin{ + pixel_x = -4; + pixel_y = -3 }, -/obj/item/reagent_containers/condiment/flour{ - pixel_x = 7 +/obj/item/kitchen/rollingpin{ + pixel_x = 5; + pixel_y = -3 }, -/obj/item/storage/fancy/egg_box, +/obj/machinery/airalarm/directional/west, /turf/open/floor/iron/white, /area/station/security/prison/mess) "pQW" = ( @@ -51147,9 +51174,6 @@ /obj/structure/table, /turf/open/floor/iron/white, /area/station/science/robotics/lab) -"sch" = ( -/turf/closed/wall, -/area/station/security/medical) "sck" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/line{ @@ -52720,12 +52744,6 @@ /obj/structure/cable, /turf/open/floor/iron/grimy, /area/station/service/chapel/office) -"sEH" = ( -/obj/machinery/portable_atmospherics/canister/air, -/obj/item/tank/internals/oxygen, -/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4, -/turf/open/floor/plating, -/area/station/maintenance/port/fore) "sEI" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -55573,6 +55591,15 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/iron/dark, /area/station/engineering/storage/tcomms) +"tFg" = ( +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "tFj" = ( /obj/structure/railing/corner{ dir = 4 @@ -58862,6 +58889,10 @@ /obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/duct, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/security/medical) "uLa" = ( @@ -59618,6 +59649,7 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "vbq" = ( @@ -60167,13 +60199,22 @@ /turf/open/floor/iron, /area/station/hallway/secondary/exit/departure_lounge) "vkO" = ( -/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/structure/table/reinforced/rglass, +/obj/item/paper_bin{ + pixel_x = -3; + pixel_y = 7 + }, +/obj/item/folder/white{ + pixel_x = -4; + pixel_y = 2 + }, +/obj/item/pen, +/obj/item/folder/red{ + pixel_x = 3 + }, /turf/open/floor/iron/white, /area/station/security/medical) "vkP" = ( @@ -61641,24 +61682,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/break_room) -"vMW" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/red, -/obj/effect/turf_decal/tile/red{ - dir = 1 - }, -/obj/machinery/airalarm/directional/west, -/obj/item/storage/bag/tray, -/obj/item/kitchen/rollingpin{ - pixel_y = -4; - pixel_x = -5 - }, -/obj/item/kitchen/rollingpin{ - pixel_y = -4; - pixel_x = 4 - }, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "vMX" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -63623,6 +63646,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) "wwt" = ( @@ -64374,17 +64398,12 @@ /turf/open/floor/iron/dark, /area/station/ai_monitored/aisat/exterior) "wLH" = ( -/obj/structure/table, -/obj/structure/window/spawner/directional/east, -/obj/item/paper_bin{ - pixel_x = -3; - pixel_y = 7 - }, -/obj/item/pen, -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/shower/directional/south, +/obj/structure/window/reinforced/spawner/directional/east, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, +/turf/open/floor/iron/white/textured, /area/station/security/medical) "wMk" = ( /obj/machinery/door/airlock/maintenance, @@ -67750,6 +67769,8 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, +/obj/effect/landmark/start/brig_physician, +/obj/structure/chair/office, /turf/open/floor/iron/white, /area/station/security/medical) "xUK" = ( @@ -68055,7 +68076,7 @@ /turf/open/floor/wood, /area/station/maintenance/port/aft) "xZv" = ( -/obj/effect/spawner/random/loafer, +/obj/machinery/duct, /turf/open/floor/plating, /area/station/maintenance/port/fore) "xZx" = ( @@ -88607,12 +88628,12 @@ hfU aXa jMx umN -poE muu +poE nhO -pQV -vMW hcb +pQV +nuw aXa fbX oGr @@ -90944,8 +90965,8 @@ aaa aaa aaa jXu -sEH -knQ +aJK +xZv siY jXu jXu @@ -91201,9 +91222,9 @@ aaa aaa bxr jXu -rOz +aJK xZv -siY +tFg jXu aaa aaa @@ -91460,7 +91481,7 @@ uza hZQ jXu jXu -siY +tFg jXu aaa aaa @@ -91717,7 +91738,7 @@ vxC hZQ qmO fsQ -oyO +eMS jXu aaa aaa @@ -91974,7 +91995,7 @@ gdZ hZQ qmO dqc -wfn +aJN jXu aaa aaa @@ -92741,7 +92762,7 @@ tjh pav wsX dla -sch +nRZ kSs xUH euX @@ -92998,12 +93019,12 @@ tjh hQH eXj vSo -sch +nRZ oWZ -oPn +iIw iIw lhc -sch +nRZ bhn tjh uTF @@ -93255,12 +93276,12 @@ tjh wsX wsX fTm -sch +nRZ wLH lvu iom fVz -sch +nRZ pHb guS vVy diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8dcf2521ec34..d67925aea236 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -7212,7 +7212,8 @@ base_state = "right"; dir = 4; icon_state = "right"; - name = "Brig Infirmary" + name = "Brig Infirmary"; + req_access = list("security") }, /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 @@ -10255,6 +10256,8 @@ }, /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, +/obj/machinery/iv_drip, +/obj/item/reagent_containers/blood, /turf/open/floor/iron/white, /area/station/security/medical) "ceQ" = ( @@ -11071,6 +11074,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/service/chapel/office) +"csW" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/duct, +/turf/open/floor/catwalk_floor, +/area/station/maintenance/department/eva) "cta" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/neutral/filled/line{ @@ -11319,6 +11328,13 @@ /obj/item/storage/box/lights/tubes, /turf/open/floor/iron, /area/station/service/janitor) +"cxS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/plumbed{ + name = "dormitory water reservoir" + }, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/eva) "cxV" = ( /obj/machinery/light/directional/east, /obj/structure/chair/office{ @@ -27083,9 +27099,9 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/tram/right) "hKz" = ( -/obj/structure/bed, /obj/effect/turf_decal/trimline/red/filled/line, -/obj/machinery/airalarm/directional/south, +/obj/structure/table/optable, +/obj/machinery/defibrillator_mount/directional/south, /turf/open/floor/iron/white, /area/station/security/medical) "hKH" = ( @@ -28880,6 +28896,7 @@ dir = 8 }, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "inP" = ( @@ -37386,18 +37403,18 @@ /turf/open/floor/iron/white, /area/station/science/lab) "kUf" = ( -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/item/storage/box/bodybags, -/obj/item/reagent_containers/syringe, /obj/structure/extinguisher_cabinet/directional/west, /obj/machinery/camera{ c_tag = "Security - Medical Center"; dir = 10; network = list("ss13","Security") }, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/roller, /turf/open/floor/iron/white, /area/station/security/medical) "kUh" = ( @@ -39682,6 +39699,7 @@ dir = 10 }, /obj/structure/cable, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "lGu" = ( @@ -44072,6 +44090,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"nco" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/duct, +/turf/open/floor/iron/smooth, +/area/station/maintenance/department/eva) "ncE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable, @@ -46079,6 +46102,7 @@ /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 4 }, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "nHu" = ( @@ -46759,10 +46783,20 @@ /turf/open/floor/iron/white, /area/station/science/ordnance/freezerchamber) "nSs" = ( -/obj/structure/table/glass, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 1 }, +/obj/machinery/airalarm/directional/north, +/obj/structure/rack, +/obj/item/storage/medkit/regular{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/storage/medkit/regular, +/obj/item/storage/box/bodybags, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/cup/bottle/epinephrine, +/obj/item/reagent_containers/cup/bottle/multiver, /turf/open/floor/iron/white, /area/station/security/medical) "nSI" = ( @@ -47081,11 +47115,9 @@ /turf/open/space/basic, /area/space/nearstation) "nYY" = ( -/obj/structure/table/glass, -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 5 - }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/shower/directional/south, +/turf/open/floor/iron/white/textured, /area/station/security/medical) "nZJ" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ @@ -53512,6 +53544,7 @@ name = "Security Maintenance Hatch" }, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/iron/smooth, /area/station/maintenance/department/eva) "qcY" = ( @@ -53557,16 +53590,13 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "qdr" = ( -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, -/obj/item/storage/medkit/regular{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/storage/medkit/regular, /obj/item/radio/intercom/directional/west, +/obj/item/clothing/gloves/latex, +/obj/item/clothing/neck/stethoscope, /turf/open/floor/iron/white, /area/station/security/medical) "qdv" = ( @@ -54935,10 +54965,11 @@ /turf/open/floor/catwalk_floor, /area/station/maintenance/tram/mid) "qAg" = ( -/obj/structure/bodycontainer/morgue, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, +/obj/structure/closet/secure_closet/brig_physician, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/dark, /area/station/security/medical) "qAi" = ( @@ -58477,10 +58508,12 @@ /turf/open/floor/plating/airless, /area/station/engineering) "rFF" = ( -/obj/structure/bed, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 6 }, +/obj/machinery/computer/operating{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/security/medical) "rFW" = ( @@ -62839,7 +62872,7 @@ /turf/open/floor/carpet, /area/station/service/chapel) "sZD" = ( -/obj/structure/table/glass, +/obj/structure/table/reinforced/rglass, /obj/effect/turf_decal/trimline/red/filled/line{ dir = 4 }, @@ -70378,6 +70411,16 @@ /obj/structure/liquid_barrier, /turf/open/floor/catwalk_floor, /area/station/science/xenobiology) +"vqi" = ( +/obj/effect/turf_decal/trimline/red/filled/line{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/landmark/start/brig_physician, +/obj/structure/chair/office, +/obj/machinery/duct, +/turf/open/floor/iron/white, +/area/station/security/medical) "vqn" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ @@ -72190,6 +72233,7 @@ /area/station/command/heads_quarters/ce) "vRy" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/duct, /turf/open/floor/iron/white, /area/station/security/medical) "vRA" = ( @@ -78175,6 +78219,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/security/general, +/obj/machinery/duct, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/eva) "xSD" = ( @@ -158517,10 +158562,10 @@ aaa aaa aaa osk -gKX -gKX +cxS +nco qcV -jta +csW ayR tVp mdV @@ -158777,7 +158822,7 @@ osk vkc gKX osk -jta +csW ayR xMg xMg @@ -159034,7 +159079,7 @@ run run run ayR -jta +csW ayR hzN hzN @@ -159291,7 +159336,7 @@ sZD kUf lqP ayR -jta +csW ayR dsF dsF @@ -159544,11 +159589,11 @@ dta mjM ceO inO -inO +vqi inO lGn xSB -jta +csW ayR eeL kHZ diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 9d591178c574..42bca6794547 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -95,6 +95,7 @@ #define SECHUD_BARTENDER "hudbartender" #define SECHUD_BITRUNNER "hudbitrunner" #define SECHUD_BOTANIST "hudbotanist" +#define SECHUD_BRIG_PHYSICIAN "hudbrigphysician" #define SECHUD_CAPTAIN "hudcaptain" #define SECHUD_CARGO_TECHNICIAN "hudcargotechnician" #define SECHUD_CHAPLAIN "hudchaplain" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 8ab7647d47e8..77f6a7f9823f 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -46,6 +46,7 @@ #define JOB_PERSONAL_AI "Personal AI" //Security #define JOB_WARDEN "Warden" +#define JOB_BRIG_PHYSICIAN "Brig Physician" #define JOB_DETECTIVE "Detective" #define JOB_SECURITY_OFFICER "Security Officer" #define JOB_SECURITY_OFFICER_MEDICAL "Security Officer (Medical)" @@ -150,10 +151,11 @@ #define JOB_DISPLAY_ORDER_GENETICIST 31 #define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 32 #define JOB_DISPLAY_ORDER_WARDEN 33 -#define JOB_DISPLAY_ORDER_DETECTIVE 34 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 35 -#define JOB_DISPLAY_ORDER_SECURITY_ASSISTANT 36 // monkestation edit: security assistants -#define JOB_DISPLAY_ORDER_PRISONER 37 +#define JOB_DISPLAY_ORDER_BRIG_PHYSICIAN 34 +#define JOB_DISPLAY_ORDER_DETECTIVE 35 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 36 +#define JOB_DISPLAY_ORDER_SECURITY_ASSISTANT 37 // monkestation edit: security assistants +#define JOB_DISPLAY_ORDER_PRISONER 38 #define DEPARTMENT_UNASSIGNED "No Department" diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 4abc323961de..e151967a1c7f 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -106,12 +106,13 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) JOB_SECURITY_OFFICER_SUPPLY = 16, JOB_DETECTIVE = 17, JOB_SECURITY_ASSISTANT = 18, // monkestation edit: add security assistants + JOB_BRIG_PHYSICIAN = 19, // monkestation edit: add brig physician // 20-29: Medbay - JOB_CHIEF_MEDICAL_OFFICER = 20, - JOB_CHEMIST = 21, - JOB_VIROLOGIST = 22, - JOB_MEDICAL_DOCTOR = 23, - JOB_PARAMEDIC = 24, + JOB_CHIEF_MEDICAL_OFFICER = 21, + JOB_CHEMIST = 22, + JOB_VIROLOGIST = 23, + JOB_MEDICAL_DOCTOR = 24, + JOB_PARAMEDIC = 25, // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 79550320237e..c00b9cb60e99 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -92,7 +92,7 @@ new /obj/item/circuitboard/machine/techfab/department/medical(src) new /obj/item/storage/photo_album/cmo(src) new /obj/item/storage/lockbox/medal/med(src) - new /obj/item/extrapolator(src) +// new /obj/item/extrapolator(src) //MONKESTATION EDIT: extrapolators are not useful! missed this single case! -Dexee, 04/13/24 /obj/structure/closet/secure_closet/chief_medical/populate_contents_immediate() . = ..() diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index b3022560075e..725e3b27702a 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -34,6 +34,10 @@ /obj/item/clothing/head/helmet/hat/cowboy = 3, /obj/item/clothing/head/costume/constable = 3, //monkestation edit /obj/item/clothing/under/rank/security/constable = 3, //Monkestation edit + /obj/item/clothing/under/rank/security/brig_physician = 3, //Monkestation edit + /obj/item/clothing/under/rank/security/brig_physician/skirt = 3, //Monkestation edit + /obj/item/clothing/suit/toggle/labcoat/brig_physician = 3, //Monkestation edit + /obj/item/clothing/shoes/sneakers/secred = 3, //Monkestation edit ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, diff --git a/icons/mob/huds/hud.dmi b/icons/mob/huds/hud.dmi index 6420db1c8750..708882bb2302 100644 Binary files a/icons/mob/huds/hud.dmi and b/icons/mob/huds/hud.dmi differ diff --git a/icons/mob/inhands/equipment/backpack_lefthand.dmi b/icons/mob/inhands/equipment/backpack_lefthand.dmi index 6c600e85e8aa..7bed688b2b96 100644 Binary files a/icons/mob/inhands/equipment/backpack_lefthand.dmi and b/icons/mob/inhands/equipment/backpack_lefthand.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index be13305ca8d4..95d8375d739d 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/monkestation/code/datums/id_trim/jobs.dm b/monkestation/code/datums/id_trim/jobs.dm new file mode 100644 index 000000000000..ece4a2889851 --- /dev/null +++ b/monkestation/code/datums/id_trim/jobs.dm @@ -0,0 +1,28 @@ +/datum/id_trim/job/brig_physician + assignment = "Brig Physician" + trim_state = "trim_brigphysician" + department_color = COLOR_SECURITY_RED + subdepartment_color = COLOR_MEDICAL_BLUE + sechud_icon_state = SECHUD_BRIG_PHYSICIAN + minimal_access = list( + ACCESS_BRIG, + ACCESS_BRIG_ENTRANCE, + ACCESS_COURT, + ACCESS_MECH_SECURITY, + ACCESS_MEDICAL, + ACCESS_MINERAL_STOREROOM, + ACCESS_MORGUE, + ACCESS_SECURITY, + ACCESS_WEAPONS, + ) + extra_access = list( + ACCESS_DETECTIVE, + ACCESS_MAINT_TUNNELS, + ACCESS_SURGERY, + ) + template_access = list( + ACCESS_CAPTAIN, + ACCESS_CHANGE_IDS, + ACCESS_HOS, + ) + job = /datum/job/brig_physician diff --git a/monkestation/code/game/objects/effects/landmark.dm b/monkestation/code/game/objects/effects/landmark.dm index ee0bbd5fa0dc..266d1b747262 100644 --- a/monkestation/code/game/objects/effects/landmark.dm +++ b/monkestation/code/game/objects/effects/landmark.dm @@ -129,3 +129,10 @@ /obj/effect/landmark/start/security_assistant name = "Security Assistant" icon_state = "Security Officer" + +//Brig Physician Spawn Location Marker - Dexee, 4/13/24 + +/obj/effect/landmark/start/brig_physician + name = "Brig Physician" + icon = 'monkestation/icons/mob/landmarks.dmi' + icon_state = "Brig Physician" diff --git a/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm b/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm new file mode 100644 index 000000000000..df453599a12a --- /dev/null +++ b/monkestation/code/game/objects/items/devices/radio/encryptionkey.dm @@ -0,0 +1,6 @@ +/obj/item/encryptionkey/headset_secmed + name = "brig physician radio encryption key" + icon_state = "cypherkey_security" + channels = list(RADIO_CHANNEL_SECURITY = 1, RADIO_CHANNEL_MEDICAL = 1) + greyscale_config = /datum/greyscale_config/encryptionkey_security + greyscale_colors = "#820a16#280b1a" diff --git a/monkestation/code/game/objects/items/devices/radio/headset.dm b/monkestation/code/game/objects/items/devices/radio/headset.dm new file mode 100644 index 000000000000..c266ed70b6b4 --- /dev/null +++ b/monkestation/code/game/objects/items/devices/radio/headset.dm @@ -0,0 +1,6 @@ +/obj/item/radio/headset/headset_secmed + name = "brig physician radio headset" + desc = "This is used by your secure doctor." + icon_state = "sec_headset" + worn_icon_state = "sec_headset" + keyslot = /obj/item/encryptionkey/headset_secmed diff --git a/monkestation/code/game/objects/items/storage/garment.dm b/monkestation/code/game/objects/items/storage/garment.dm new file mode 100644 index 000000000000..e80e5175ae1f --- /dev/null +++ b/monkestation/code/game/objects/items/storage/garment.dm @@ -0,0 +1,13 @@ +/obj/item/storage/bag/garment/brig_physician + name = "brig physician's garment bag" + desc = "A bag for storing extra clothes and shoes. This one belongs to the brig physician." + +/obj/item/storage/bag/garment/brig_physician/PopulateContents() + new /obj/item/clothing/under/rank/security/brig_physician(src) + new /obj/item/clothing/under/rank/security/brig_physician/skirt(src) + new /obj/item/clothing/under/rank/security/scrubs/sec(src) + new /obj/item/clothing/head/utility/surgerycap/sec(src) + new /obj/item/clothing/suit/toggle/labcoat/brig_physician(src) + new /obj/item/clothing/shoes/sneakers/secred(src) + new /obj/item/clothing/gloves/latex/nitrile(src) + diff --git a/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm b/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm new file mode 100644 index 000000000000..a2ae5b7beaaf --- /dev/null +++ b/monkestation/code/game/objects/structures/crates_lockers/closets/secure/brig_physician.dm @@ -0,0 +1,17 @@ +/obj/structure/closet/secure_closet/brig_physician + name = "brig physician's locker" + icon = 'monkestation/icons/obj/storage/closet.dmi' + icon_state = "brigphys" + req_access = list(ACCESS_BRIG) + + +/obj/structure/closet/secure_closet/brig_physician/PopulateContents() + ..() + + new /obj/item/flashlight/seclite(src) + new /obj/item/storage/bag/garment/brig_physician(src) + new /obj/item/storage/backpack/brig_physician(src) + new /obj/item/storage/backpack/duffelbag/sec/surgery(src) + new /obj/item/clothing/glasses/hud/health(src) + new /obj/item/healthanalyzer(src) + new /obj/item/defibrillator/loaded(src) diff --git a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm index 2ad3e7a4f200..3f272441f7cd 100644 --- a/monkestation/code/modules/client/preferences/alt_jobs/titles.dm +++ b/monkestation/code/modules/client/preferences/alt_jobs/titles.dm @@ -68,6 +68,15 @@ "Rancher", ) +/datum/job/brig_physician + alt_titles = list( + "Jail Doctor", + "Brig Orderly", + "Prison Medic", + "Chief Tickler", + "Navy Corpsman", + ) + /datum/job/captain alt_titles = list( "Captain", diff --git a/monkestation/code/modules/clothing/jobs/brig_physician.dm b/monkestation/code/modules/clothing/jobs/brig_physician.dm new file mode 100644 index 000000000000..5aacbace4da7 --- /dev/null +++ b/monkestation/code/modules/clothing/jobs/brig_physician.dm @@ -0,0 +1,99 @@ +/obj/item/clothing/under/rank/security/brig_physician + desc = "A formerly retired security uniform pattern now brought back for those working the medical profession in the security apparatus." + name = "brig physician's jumpsuit" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "brigphys" + inhand_icon_state = "gy_suit" + +/obj/item/clothing/under/rank/security/brig_physician/skirt + name = "brig physician's jumpskirt" + desc = "A formerly retired security uniform pattern now brought back for those working the medical profession in the security apparatus." + icon_state = "brigphys_skirt" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + inhand_icon_state = "gy_suit" + body_parts_covered = CHEST|GROIN|ARMS + dying_key = DYE_REGISTRY_JUMPSKIRT + female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON + +/obj/item/clothing/under/rank/security/scrubs/sec + armor_type = /datum/armor/rank_medical + name = "brig physician's security scrubs" + desc = "It's made of a special fiber that provides minor protection against biohazards. This one is in security red." + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "scrubssec" + +/obj/item/clothing/head/utility/surgerycap/sec + name = "security surgical cap" + desc = "A security red medical surgery cap to prevent suspects from grabbing their doctor." + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "surgicalcapsec" + +/obj/item/clothing/under/plasmaman/brig_physician + desc = "A new pattern plasmaman suit for those qualified as a brig physician." + name = "brig physician's envirosuit" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "brigphys_envirosuit" + +/obj/item/clothing/head/helmet/space/plasmaman/brig_physician + desc = "A new pattern plasmaman helmet for those qualified as a brig physician. This is still EVA rated too!" + name = "brig physician's envirosuit helmet" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "brigphys_envirohelm" + +/obj/item/clothing/gloves/color/plasmaman/brig_physician + desc = "A new pattern plasmaman glove set to match that drippy security grey suit." + name = "brig physician's envirogloves" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "brigphysplasma" + greyscale_colors = "#918F8C" + +/obj/item/clothing/suit/toggle/labcoat/brig_physician + name = "brig physician's labcoat" + desc = "A formerly retired labcoat pattern now brought back for those working the medical profession in the security apparatus." + icon_state = "labcoat_brigphys" + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + +/obj/item/storage/backpack/brig_physician + name = "brig physician's backpack" + desc = "You wear this on your back and put items into it." + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "backpack-brigphys" + inhand_icon_state = "backpack-brigphys" + lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' + +/obj/item/storage/backpack/satchel/brig_physician + name = "brig physician's satchel" + desc = "You wear this on your back and put items into it." + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "satchel-brigphys" + inhand_icon_state = "satchel-brigphys" + lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' + +/obj/item/storage/backpack/duffelbag/brig_physician + name = "brig physician's duffelbag" + desc = "You wear this on your back and put items into it." + icon = 'monkestation/icons/obj/clothing/jobs/brig_physician.dmi' + worn_icon = 'monkestation/icons/mob/clothing/jobs/brig_physician.dmi' + icon_state = "duffel-brigphys" + inhand_icon_state = "duffel-brigphys" + lefthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi' + righthand_file = 'monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi' + +/obj/item/clothing/shoes/sneakers/secred + name = "security red sneakers" + desc = "A nice set of sneakers in security red. These even have the custom fabric used by medical white! Sweet!" + armor_type = /datum/armor/sneakers_white + greyscale_colors = "#a52f29#918f8c" diff --git a/monkestation/code/modules/jobs/job_types/brig_physician.dm b/monkestation/code/modules/jobs/job_types/brig_physician.dm new file mode 100644 index 000000000000..3865969ff26f --- /dev/null +++ b/monkestation/code/modules/jobs/job_types/brig_physician.dm @@ -0,0 +1,71 @@ +/datum/job/brig_physician + title = JOB_BRIG_PHYSICIAN + description = "Stitch up security, prisoners, sometimes the crew." + auto_deadmin_role_flags = DEADMIN_POSITION_SECURITY + department_head = list(JOB_HEAD_OF_SECURITY) + faction = FACTION_STATION + total_positions = 1 + spawn_positions = 1 + supervisors = SUPERVISOR_HOS + exp_granted_type = EXP_TYPE_CREW + config_tag = "BRIG_PHYSICIAN" + + outfit = /datum/outfit/job/brig_physician + plasmaman_outfit = /datum/outfit/plasmaman/security + + paycheck = PAYCHECK_CREW + paycheck_department = ACCOUNT_SEC + + liver_traits = list(TRAIT_MEDICAL_METABOLISM) + + display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN + bounty_types = CIV_JOB_MED + departments_list = list( + /datum/job_department/security, + ) + + family_heirlooms = list(/obj/item/storage/medkit/ancient/heirloom, /obj/item/scalpel, /obj/item/hemostat, /obj/item/circular_saw, /obj/item/retractor, /obj/item/cautery) + + mail_goodies = list( + /obj/item/healthanalyzer/advanced = 15, + /obj/item/scalpel/advanced = 6, + /obj/item/retractor/advanced = 6, + /obj/item/cautery/advanced = 6, + /obj/item/reagent_containers/cup/bottle/formaldehyde = 6, + /obj/effect/spawner/random/medical/organs = 5, + /obj/effect/spawner/random/medical/memeorgans = 1 + ) + rpg_title = "Chirurgeon" + job_flags = JOB_ANNOUNCE_ARRIVAL | JOB_CREW_MANIFEST | JOB_EQUIP_RANK | JOB_CREW_MEMBER | JOB_NEW_PLAYER_JOINABLE | JOB_REOPEN_ON_ROUNDSTART_LOSS | JOB_ASSIGN_QUIRKS | JOB_CAN_BE_INTERN + + +/datum/outfit/job/brig_physician + name = "Brig Physician" + jobtype = /datum/job/brig_physician + + id_trim = /datum/id_trim/job/brig_physician + uniform = /obj/item/clothing/under/rank/security/scrubs/sec + suit = /obj/item/clothing/suit/toggle/labcoat/brig_physician + suit_store = /obj/item/flashlight/pen + belt = /obj/item/modular_computer/pda/security + ears = /obj/item/radio/headset/headset_secmed + head = /obj/item/clothing/head/utility/surgerycap/sec + shoes = /obj/item/clothing/shoes/sneakers/secred + l_hand = /obj/item/storage/medkit/surgery + + backpack = /obj/item/storage/backpack/brig_physician + satchel = /obj/item/storage/backpack/satchel/brig_physician + duffelbag = /obj/item/storage/backpack/duffelbag/brig_physician + + box = /obj/item/storage/box/survival/medical + chameleon_extras = /obj/item/gun/syringe + skillchips = list(/obj/item/skillchip/entrails_reader) + implants = list(/obj/item/implant/mindshield) + +/datum/outfit/plasmaman/brig_physician + name = "Brig Physician Plasmaman" + + uniform = /obj/item/clothing/under/plasmaman/brig_physician + gloves = /obj/item/clothing/gloves/color/plasmaman/brig_physician + head = /obj/item/clothing/head/helmet/space/plasmaman/brig_physician + diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm index cc79e2a2f7fa..700957dff6c6 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodcult.dm @@ -16,6 +16,7 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) enemy_roles = list( JOB_CAPTAIN, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm index 31fa22fc383b..1bdf4c177a0a 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/bloodsuckers.dm @@ -14,6 +14,7 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm index 82decee034ee..c29c3ee7eac3 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/brother.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/brother.dm @@ -15,6 +15,7 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm index ec0f4d5cae34..39e9d605a7e4 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/changeling.dm @@ -14,6 +14,7 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm index b1e009c05f3c..0ebe10a6fd18 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clockwork_cult.dm @@ -16,6 +16,7 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) enemy_roles = list( JOB_CAPTAIN, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm index d9854eb7394a..dc86d98cb9b9 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/clown_operative.dm @@ -18,6 +18,7 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 5 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm index eb7e43577b2e..04905fcedf42 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/ghosts/nuclear_operative_ghost.dm @@ -17,6 +17,7 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 4 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm index 63e495b808c2..726b1a809bbf 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/heretic.dm @@ -15,6 +15,7 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm index 713bd92de057..2bf10fa56d9b 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/malf.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/malf.dm @@ -12,6 +12,7 @@ JOB_SECURITY_OFFICER, JOB_SECURITY_ASSISTANT, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) shared_occurence_type = SHARED_HIGH_THREAT maximum_antags = 1 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm index be39ec01ca7d..52f7647ae515 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/monsterhunter.dm @@ -18,6 +18,7 @@ JOB_PRISONER, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm index a6ca5701b713..f2a5a12a3e14 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/nuclear_operative.dm @@ -18,6 +18,7 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) base_antags = 3 maximum_antags = 5 diff --git a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm index aabee93a82a8..eb8fce9f4aeb 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/revolutionary.dm @@ -18,6 +18,7 @@ JOB_RESEARCH_DIRECTOR, JOB_SECURITY_OFFICER, JOB_WARDEN, + JOB_BRIG_PHYSICIAN, ) base_antags = 2 enemy_roles = list( diff --git a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm index ecc377c9f386..58ed6dd76653 100644 --- a/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm +++ b/monkestation/code/modules/storytellers/converted_events/solo/traitor.dm @@ -14,6 +14,7 @@ JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_SECURITY_ASSISTANT, + JOB_BRIG_PHYSICIAN, ) restricted_roles = list( JOB_AI, diff --git a/monkestation/icons/mob/clothing/jobs/brig_physician.dmi b/monkestation/icons/mob/clothing/jobs/brig_physician.dmi new file mode 100644 index 000000000000..56be335082d7 Binary files /dev/null and b/monkestation/icons/mob/clothing/jobs/brig_physician.dmi differ diff --git a/monkestation/icons/mob/clothing/species/suit_digi.dmi b/monkestation/icons/mob/clothing/species/suit_digi.dmi index 89b99dbf2306..392e8319d99c 100644 Binary files a/monkestation/icons/mob/clothing/species/suit_digi.dmi and b/monkestation/icons/mob/clothing/species/suit_digi.dmi differ diff --git a/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi b/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi new file mode 100644 index 000000000000..2d51c710748f Binary files /dev/null and b/monkestation/icons/mob/inhands/equipment/brigphys_lefthand.dmi differ diff --git a/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi b/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi new file mode 100644 index 000000000000..7b4f607810b1 Binary files /dev/null and b/monkestation/icons/mob/inhands/equipment/brigphys_righthand.dmi differ diff --git a/monkestation/icons/mob/landmarks.dmi b/monkestation/icons/mob/landmarks.dmi new file mode 100644 index 000000000000..534d291e79b3 Binary files /dev/null and b/monkestation/icons/mob/landmarks.dmi differ diff --git a/monkestation/icons/mob/species/misc/uniform_digi.dmi b/monkestation/icons/mob/species/misc/uniform_digi.dmi index fe7835409e99..30467bb4ddc0 100644 Binary files a/monkestation/icons/mob/species/misc/uniform_digi.dmi and b/monkestation/icons/mob/species/misc/uniform_digi.dmi differ diff --git a/monkestation/icons/obj/clothing/jobs/brig_physician.dmi b/monkestation/icons/obj/clothing/jobs/brig_physician.dmi new file mode 100644 index 000000000000..2f622cf58741 Binary files /dev/null and b/monkestation/icons/obj/clothing/jobs/brig_physician.dmi differ diff --git a/monkestation/icons/obj/storage/closet.dmi b/monkestation/icons/obj/storage/closet.dmi new file mode 100644 index 000000000000..f57673554e1d Binary files /dev/null and b/monkestation/icons/obj/storage/closet.dmi differ diff --git a/tgstation.dme b/tgstation.dme index c9af4e7decc0..9feb7e8127ab 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -5767,6 +5767,7 @@ #include "monkestation\code\datums\elements\area_locked.dm" #include "monkestation\code\datums\elements\uncompressed_storage.dm" #include "monkestation\code\datums\ert\moff_inspectors.dm" +#include "monkestation\code\datums\id_trim\jobs.dm" #include "monkestation\code\datums\keybinding\carbon.dm" #include "monkestation\code\datums\keybinding\communication.dm" #include "monkestation\code\datums\keybinding\living.dm" @@ -5828,6 +5829,8 @@ #include "monkestation\code\game\objects\items\circuitboards\machine_circuitboards.dm" #include "monkestation\code\game\objects\items\devices\compression_kit.dm" #include "monkestation\code\game\objects\items\devices\scanners.dm" +#include "monkestation\code\game\objects\items\devices\radio\encryptionkey.dm" +#include "monkestation\code\game\objects\items\devices\radio\headset.dm" #include "monkestation\code\game\objects\items\devices\scanners\gas_analyzer.dm" #include "monkestation\code\game\objects\items\drugs\cocaine_chem.dm" #include "monkestation\code\game\objects\items\drugs\cocaine_item.dm" @@ -5852,10 +5855,12 @@ #include "monkestation\code\game\objects\items\storage\book.dm" #include "monkestation\code\game\objects\items\storage\boxes.dm" #include "monkestation\code\game\objects\items\storage\crate.dm" +#include "monkestation\code\game\objects\items\storage\garment.dm" #include "monkestation\code\game\objects\items\storage\uplink_kits.dm" #include "monkestation\code\game\objects\structures\tables_racks.dm" #include "monkestation\code\game\objects\structures\beds_chairs\chair.dm" #include "monkestation\code\game\objects\structures\crates_lockers\crates.dm" +#include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\brig_physician.dm" #include "monkestation\code\game\objects\structures\crates_lockers\closets\secure\security.dm" #include "monkestation\code\game\objects\structures\crates_lockers\crates\secure.dm" #include "monkestation\code\game\turfs\open\water.dm" @@ -6571,6 +6576,7 @@ #include "monkestation\code\modules\clothing\head\costume.dm" #include "monkestation\code\modules\clothing\head\hat.dm" #include "monkestation\code\modules\clothing\head\misc.dm" +#include "monkestation\code\modules\clothing\jobs\brig_physician.dm" #include "monkestation\code\modules\clothing\masks\gasmask.dm" #include "monkestation\code\modules\clothing\masks\misc.dm" #include "monkestation\code\modules\clothing\neck\cloaks.dm" @@ -6741,6 +6747,7 @@ #include "monkestation\code\modules\job_xp\milestones\botany_milestones.dm" #include "monkestation\code\modules\job_xp\preferences\base_preferences.dm" #include "monkestation\code\modules\job_xp\preferences\xp_handlers.dm" +#include "monkestation\code\modules\jobs\job_types\brig_physician.dm" #include "monkestation\code\modules\jobs\job_types\candysalesman.dm" #include "monkestation\code\modules\jobs\job_types\chaplain.dm" #include "monkestation\code\modules\jobs\job_types\clown.dm" diff --git a/tgui/packages/tgui/interfaces/common/JobToIcon.ts b/tgui/packages/tgui/interfaces/common/JobToIcon.ts index c75cee645baa..55875d76fdea 100644 --- a/tgui/packages/tgui/interfaces/common/JobToIcon.ts +++ b/tgui/packages/tgui/interfaces/common/JobToIcon.ts @@ -7,6 +7,8 @@ const BASEICONS = { 'Bit Avatar': 'code', 'Bitrunner': 'gamepad', 'Botanist': 'seedling', + // Really I wanted this to be like heart wings but thats not really an option + 'Brig Physician': 'heart', 'Captain': 'crown', 'Cargo Technician': 'box', 'CentCom Commander': 'star', @@ -226,11 +228,6 @@ const ALTTITLES = { 'Xenoarchaeologist': BASEICONS['Scientist'], 'Research Assistant': BASEICONS['Scientist'], 'Graduate Student': BASEICONS['Scientist'], - // Security Medic - heart-pulse - 'Field Medic': BASEICONS['Security Medic'], - 'Security Corpsman': BASEICONS['Security Medic'], - 'Brig Physician': BASEICONS['Security Medic'], - 'Combat Medic': BASEICONS['Security Medic'], // Security Officer - shield-halved 'Security Operative': BASEICONS['Security Officer'], 'Peacekeeper': BASEICONS['Security Officer'], @@ -257,6 +254,13 @@ const ALTTITLES = { 'Dispatch Officer': BASEICONS['Warden'], 'Brig Governor': BASEICONS['Warden'], 'Jailer': BASEICONS['Warden'], + // Brig Physician - heart + 'Brig Physician': BASEICONS['Brig Physician'], + 'Jail Doctor': BASEICONS['Brig Physician'], + 'Brig Orderly': BASEICONS['Brig Physician'], + 'Prison Medic': BASEICONS['Brig Physician'], + 'Chief Tickler': BASEICONS['Brig Physician'], + 'Navy Corpsman': BASEICONS['Brig Physician'], } as const; // Combine the Base icons and ALt titles