diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index 863cf951a34a..15cd6ecb41f0 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -21439,6 +21439,19 @@ }, /turf/simulated/floor/carpet/black, /area/station/command/meeting_room) +"bFf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/camera{ + dir = 6; + c_tag = "Brig Med 2" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "bFi" = ( /obj/machinery/navbeacon{ codes_txt = "patrol;next_patrol=Dorm"; @@ -26685,6 +26698,17 @@ /obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) +"cbt" = ( +/obj/item/soap/deluxe/laundry, +/obj/structure/closet/secure_closet/brigphysic, +/obj/item/roller_holder, +/obj/item/roller_holder, +/obj/item/clothing/under/rank/security/brigphysic/skirt, +/obj/item/clothing/under/rank/security/brigphysic, +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "cbu" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -38464,6 +38488,18 @@ }, /turf/simulated/floor/plating, /area/station/engineering/supermatter_room) +"cTz" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "cTA" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -42436,6 +42472,19 @@ icon_state = "grimy" }, /area/station/maintenance/fsmaint) +"dhN" = ( +/obj/machinery/crema_switch{ + pixel_y = 27; + id = 2; + idle_power_consumption = 5000; + pixel_x = 0 + }, +/obj/machinery/iv_drip, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "dhQ" = ( /obj/structure/grille, /turf/simulated/floor/plating, @@ -46127,6 +46176,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "dGa" = ( @@ -47895,6 +47945,15 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) +"emo" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/alarm/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "emr" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48227,6 +48286,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/closet/secure_closet/brig, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) "esO" = ( @@ -53868,6 +53931,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"gtl" = ( +/obj/structure/bed/roller, +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "gtx" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -54487,6 +54560,14 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/security/prison/cell_block/A) +"gEc" = ( +/obj/effect/spawner/window/reinforced/grilled, +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/station/security/brigmed) "gEd" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -54906,6 +54987,21 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/medical/medbay) +"gKR" = ( +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "BP" + }, +/obj/machinery/light/floor, +/turf/simulated/floor/plasteel{ + icon_state = "darkbluefull" + }, +/area/station/security/brigmed) "gKS" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/sign/nosmoking_1, @@ -58558,23 +58654,26 @@ icon_state = "freezerfloor" }, /area/station/service/kitchen) +"hUo" = ( +/obj/structure/closet/crate/freezer/iv_storage, +/obj/machinery/alarm/directional/west, +/obj/machinery/camera{ + dir = 4; + c_tag = "Brig Med 1" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "hUC" = ( /obj/machinery/computer/arcade, /obj/machinery/light/small/directional/north, /turf/simulated/floor/wood/oak, /area/station/security/permabrig) "hUP" = ( -/obj/structure/closet/secure_closet/brig, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "red" - }, -/area/station/security/prisonlockers) +/turf/simulated/wall/r_wall, +/area/station/security/brigmed) "hUV" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ @@ -60309,6 +60408,14 @@ icon_state = "white" }, /area/station/science/toxins/mixing) +"iFx" = ( +/obj/item/kirbyplants, +/obj/item/radio/intercom/directional/north, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "iFI" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ @@ -60564,6 +60671,13 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) +"iKy" = ( +/obj/machinery/light/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "iKN" = ( /obj/structure/cable{ d1 = 1; @@ -62916,8 +63030,7 @@ }, /area/station/science/hallway) "jDf" = ( -/obj/structure/table, -/obj/item/hand_labeler, +/obj/structure/closet/wardrobe/orange/prison, /turf/simulated/floor/plasteel{ icon_state = "red" }, @@ -66039,6 +66152,11 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) +"kKP" = ( +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "kKV" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable, @@ -67305,6 +67423,9 @@ /area/station/engineering/control) "lgS" = ( /obj/structure/closet/secure_closet/brig, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -70353,6 +70474,22 @@ }, /turf/simulated/floor/light/purple, /area/station/service/bar) +"mhL" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "mhQ" = ( /obj/structure/railing/cap/reversed{ dir = 4 @@ -71840,6 +71977,16 @@ icon_state = "brown" }, /area/station/supply/storage) +"mIC" = ( +/obj/structure/closet/secure_closet/medical2, +/obj/item/handheld_defibrillator, +/obj/item/defibrillator/loaded, +/obj/item/reagent_containers/glass/bottle/morphine, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "mIJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -72220,6 +72367,34 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"mSD" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/airlock/security/glass{ + id = "brigmed" + }, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "mSI" = ( /obj/structure/chair/comfy/brown, /obj/effect/decal/cleanable/dust, @@ -74905,23 +75080,13 @@ }, /area/station/public/sleep) "nNv" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable{ - d2 = 2; - icon_state = "0-2" - }, -/obj/structure/cable{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/structure/cable{ - d1 = 2; d2 = 4; - icon_state = "2-4" + icon_state = "0-4" }, +/obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/security/prisonlockers) +/area/station/security/brigmed) "nNX" = ( /obj/structure/cable{ d1 = 4; @@ -76442,6 +76607,9 @@ icon_state = "cult" }, /area/station/maintenance/fsmaint) +"ooV" = ( +/turf/space, +/area/space/nearstation) "ooY" = ( /obj/machinery/atmospherics/air_sensor{ autolink_id = "burn_sensor" @@ -76505,6 +76673,12 @@ icon_state = "whitehall" }, /area/station/science/lobby) +"opt" = ( +/obj/machinery/bodyscanner, +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "opF" = ( /obj/structure/cable, /obj/machinery/power/apc/directional/south, @@ -78257,6 +78431,14 @@ icon_state = "dark" }, /area/station/security/main) +"oUl" = ( +/obj/machinery/optable, +/obj/item/storage/firstaid/surgery, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "oUn" = ( /obj/effect/landmark/start/doctor, /obj/structure/cable{ @@ -79951,6 +80133,13 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/simulated/floor/engine, /area/station/science/misc_lab) +"pwh" = ( +/obj/structure/closet/wardrobe/orange/prison, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/station/security/prisonlockers) "pwk" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/power/apc/directional/east, @@ -80489,6 +80678,15 @@ /obj/item/stack/sheet/mineral/plasma/fifty, /turf/simulated/floor/plating, /area/station/engineering/secure_storage) +"pFH" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "pGR" = ( /obj/structure/closet/crate/can, /obj/effect/spawner/random/trash, @@ -80520,6 +80718,15 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"pHx" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "pHG" = ( /obj/structure/cable{ d1 = 2; @@ -82414,6 +82621,24 @@ /obj/machinery/light_switch/south, /turf/simulated/floor/plasteel, /area/station/supply/sorting) +"qpQ" = ( +/obj/structure/morgue{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window/reinforced/normal{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/brig{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "qqy" = ( /obj/structure/cable{ d1 = 2; @@ -83022,6 +83247,15 @@ }, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"qAJ" = ( +/obj/structure/crematorium{ + id = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "qAK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -84718,6 +84952,15 @@ /obj/effect/turf_decal/stripes, /turf/simulated/floor/plating, /area/station/security/permabrig) +"rcp" = ( +/obj/machinery/computer/operating, +/obj/machinery/light/small/directional/east, +/obj/item/radio/intercom/directional/east, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "rcs" = ( /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "CMO" @@ -84924,6 +85167,16 @@ }, /turf/space, /area/space/nearstation) +"rfY" = ( +/obj/machinery/sleeper{ + dir = 4; + pixel_x = 3 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "rgl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/visible, @@ -86863,6 +87116,20 @@ icon_state = "dark" }, /area/station/engineering/supermatter_room) +"rWx" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/brigphysician, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "red" + }, +/area/station/security/prisonlockers) "rWy" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -87505,6 +87772,15 @@ icon_state = "whitebluefull" }, /area/station/maintenance/aft) +"siv" = ( +/obj/structure/closet/secure_closet/brig, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/station/security/prisonlockers) "six" = ( /obj/structure/cable{ d1 = 4; @@ -88094,6 +88370,34 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/public/locker) +"srU" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/machinery/power/apc/directional/west, +/obj/structure/shelf/medbay, +/obj/item/storage/belt/medical{ + pixel_y = -5; + pixel_x = 0 + }, +/obj/item/reagent_containers/spray/cleaner{ + pixel_x = -8; + pixel_y = 11 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 9; + pixel_x = 6 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "ssc" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, @@ -89366,6 +89670,7 @@ /obj/structure/chair{ dir = 8 }, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel, /area/station/security/main) "sNJ" = ( @@ -91592,6 +91897,17 @@ icon_state = "caution" }, /area/station/public/fitness) +"tDi" = ( +/obj/machinery/sleeper{ + dir = 4; + pixel_x = 3 + }, +/obj/machinery/firealarm/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "tDn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -93286,6 +93602,8 @@ /area/station/maintenance/asmaint2) "ufw" = ( /obj/structure/closet/wardrobe/orange/prison, +/obj/machinery/status_display/directional/north, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "red" @@ -93956,17 +94274,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/port) "utu" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) @@ -94406,6 +94723,17 @@ icon_state = "whiteblue" }, /area/station/medical/reception) +"uAD" = ( +/obj/machinery/economy/vending/medical, +/obj/machinery/light/directional/east, +/obj/structure/sign/poster/official/taa{ + pixel_x = 32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "uAG" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -94698,6 +95026,13 @@ icon_state = "bar" }, /area/station/security/permabrig) +"uFZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/security/brigmed) "uGf" = ( /obj/structure/table/reinforced, /obj/item/food/grilledcheese{ @@ -95776,6 +96111,26 @@ "vaH" = ( /turf/simulated/wall, /area/station/engineering/hallway) +"vaI" = ( +/obj/structure/chair/office/dark{ + dir = 8 + }, +/obj/effect/landmark/start/brigphysician, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/machinery/light_switch/east{ + pixel_x = 29; + pixel_y = 11 + }, +/obj/machinery/newscaster/security_unit/east{ + pixel_x = 30; + pixel_y = -4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkredcorners" + }, +/area/station/security/brigmed) "vbf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -97920,6 +98275,23 @@ /obj/effect/spawner/window/reinforced/tinted/grilled, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"vMh" = ( +/obj/structure/morgue{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/window/reinforced/normal{ + dir = 1 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/security/brig{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "vMv" = ( /obj/structure/punching_bag, /obj/effect/turf_decal/delivery/hollow, @@ -98989,6 +99361,20 @@ icon_state = "darkpurple" }, /area/station/science/genetics) +"wfv" = ( +/obj/machinery/button/windowtint/south{ + id = "BP" + }, +/obj/machinery/light_switch/south{ + pixel_x = 0; + pixel_y = -34 + }, +/obj/machinery/firealarm/directional/east, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "wgs" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -99689,9 +100075,8 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "wsY" = ( -/obj/structure/table, -/obj/item/storage/box/prisoner, /obj/item/radio/intercom/directional/south, +/obj/structure/closet/wardrobe/orange/prison, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -101222,6 +101607,7 @@ d2 = 8; icon_state = "4-8" }, +/obj/item/cartridge/secmed, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -103966,8 +104352,14 @@ }, /area/station/maintenance/aft) "xRT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /turf/simulated/floor/plasteel, /area/station/security/prisonlockers) @@ -104204,9 +104596,7 @@ /turf/simulated/floor/plating, /area/station/security/prisonlockers) "xVM" = ( -/obj/structure/closet/secure_closet/brig, -/obj/machinery/status_display/directional/north, -/obj/machinery/light/directional/north, +/obj/item/kirbyplants, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -104979,6 +105369,14 @@ icon_state = "bar" }, /area/station/security/permabrig) +"yiM" = ( +/obj/structure/table, +/obj/item/storage/box/prisoner, +/obj/item/hand_labeler, +/turf/simulated/floor/plasteel{ + icon_state = "red" + }, +/area/station/security/prisonlockers) "yiR" = ( /obj/machinery/atmospherics/pipe/manifold/visible/yellow{ dir = 4 @@ -128924,10 +129322,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa +afO +afO +afO +afO aaa aaa aaa @@ -129180,12 +129578,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afO +afX +afX +afX +afO aaa aaa aab @@ -129437,12 +129835,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afX +afX +afX +afO +aab aaa aaa aab @@ -129693,15 +130091,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afX +afX +afO +afO +afO +aab +aab +aab aab aaa aaa @@ -129950,15 +130348,15 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afX +afX +afO +hUP +hUP +hUP +hUP +hUP aab aaa aaa @@ -130206,19 +130604,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aMr -aMr -aMr +afO +afO +afX +afX +afO +hUP +qAJ +iKy +qpQ +hUP +aab +aab +aab aab jMx akZ @@ -130463,22 +130861,22 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -akZ +afO +afX +afX +afO +aab +hUP +dhN +kKP +vMh +hUP +hUP +hUP +hUP +hUP +hUP +hUP ufw hEu iyY @@ -130719,24 +131117,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -akZ -xVM +afO +afO +afX +afX +afO +aab +hUP +pHx +kKP +emo +hUP +iFx +hUo +srU +rfY +tDi +nNv +pwh rwo ydz jDf @@ -130976,27 +131374,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -jbR -lgS +afO +afX +afX +afX +afO +aab +hUP +bFf +oUl +pFH +gKR +uFZ +uFZ +mhL +cTz +cTz +mSD +rWx xRT ydz -hLh +yiM xVF ago iwJ @@ -131233,24 +131631,24 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -nNv +afO +afX +afX +afO +afO +aab hUP +mIC +rcp +wfv +hUP +uAD +cbt +vaI +opt +gtl +gEc +xVM utu dFK xJD @@ -131490,27 +131888,27 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -wPX +afO +afX +afX +afO +afO +aab +hUP +hUP +hUP +hUP +hUP +hUP +hUP +hUP +hUP +hUP +hUP lgS esN xue -hLh +siv aeg iOG hQH @@ -131747,19 +132145,19 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afX +afX +afO +aab +aab +aab abY afO aab afO qTO -aMr +afO aab aab abY @@ -132004,12 +132402,12 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa +afO +afX +afX +afO +afO +ooV afO aab ahF @@ -132262,9 +132660,9 @@ aaa aaa aaa aaa -aaa -aaa -aaa +afX +afX +afX afO afO afO @@ -132519,10 +132917,10 @@ aaa aaa aaa aaa -aaa -aaa -aaa afO +afX +afX +afX afO afO aab @@ -132776,11 +133174,11 @@ aaa aaa aaa aaa -aaa -aaa afO afX afX +afX +afO aaa abY ahF @@ -133033,13 +133431,13 @@ aaa aaa aaa aaa -aaa -aaa -afX +afO afX afX afX -aYm +afO +afO +afO ahF ahF ahF @@ -133293,10 +133691,10 @@ aaa afO afX afX -afX afO -afX -afX +afO +afO +afO ahF ahF ahF diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index b1b4de056143..69280b8ba39d 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -4724,11 +4724,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore2) "awv" = ( -/obj/machinery/computer/security, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, +/obj/machinery/computer/med_data, +/obj/machinery/light/directional/north, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "aww" = ( /obj/structure/cable{ d2 = 8; @@ -8060,17 +8059,25 @@ }, /area/station/maintenance/disposal/west) "aIe" = ( -/obj/machinery/door/airlock/security/glass, +/obj/machinery/door/airlock/security/glass{ + id_tag = "brigmed" + }, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/barricade/wooden, -/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "aIf" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -9113,7 +9120,6 @@ /turf/space, /area/space/nearstation) "aLV" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -9123,8 +9129,11 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "BP" + }, /turf/simulated/floor/plating, -/area/station/security/podpilot) +/area/station/security/brigmed) "aLW" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -9199,7 +9208,6 @@ }, /area/station/engineering/mechanic) "aMe" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ d2 = 2; icon_state = "0-2" @@ -9209,12 +9217,14 @@ d2 = 4; icon_state = "2-4" }, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Secure Gate"; - name = "Security Blast Door" +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "BP" }, /turf/simulated/floor/plating, -/area/station/security/podpilot) +/area/station/security/brigmed) "aMf" = ( /obj/structure/sign/vacuum/external, /turf/simulated/wall, @@ -10771,15 +10781,19 @@ }, /area/station/hallway/primary/central/se) "aTw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /obj/structure/cable{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "aTz" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/effect/decal/cleanable/dirt, @@ -10811,12 +10825,19 @@ /turf/simulated/floor/transparent/glass/reinforced, /area/station/public/pool) "aTD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/effect/decal/cleanable/blood/oil/streak, -/obj/item/clothing/head/welding, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/structure/table/reinforced, +/obj/item/autopsy_scanner, +/obj/machinery/light_switch/west{ + pixel_x = -24; + pixel_y = -5 + }, +/obj/machinery/button/windowtint/west{ + pixel_x = -25; + pixel_y = 6; + id = "BP" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "aTE" = ( /obj/structure/cable, /obj/effect/spawner/window/reinforced/polarized/grilled{ @@ -14311,16 +14332,12 @@ /turf/simulated/floor/greengrid, /area/station/turret_protected/ai) "biJ" = ( -/obj/structure/table/reinforced, -/obj/item/wrench{ - name = "PodPilot Wrench"; - desc = "Этим ключом явно много работали, но сейчас он покрыт пылью." +/obj/machinery/alarm/directional/south, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/item/crowbar, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "biK" = ( /turf/simulated/floor/engine/n20, /area/station/engineering/atmos) @@ -14781,7 +14798,10 @@ }, /area/station/security/prisonershuttle) "bjO" = ( -/obj/machinery/door/airlock/security/glass, +/obj/machinery/door/airlock/security/glass{ + id_tag = "brigmed"; + id = "BP" + }, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable{ d1 = 1; @@ -14793,10 +14813,19 @@ d2 = 4; icon_state = "1-4" }, -/obj/structure/barricade/wooden, -/obj/effect/mapping_helpers/airlock/access/any/security/general, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/polarized{ + id = "BP" + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "bjP" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -14861,21 +14890,9 @@ /turf/simulated/floor/plating, /area/station/public/vacant_office/secondary) "bkd" = ( -/obj/structure/table/reinforced, -/obj/item/paper_bin/nanotrasen{ - pixel_x = -6; - pixel_y = 4 - }, -/obj/item/pen/multi{ - pixel_x = -4; - pixel_y = 5 - }, -/obj/item/restraints/handcuffs, -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, +/obj/machinery/optable, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "bke" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, @@ -15251,12 +15268,8 @@ /turf/simulated/floor/plasteel/grimy, /area/station/command/office/ce) "blN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/fakesyndi, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "blO" = ( /obj/structure/window/reinforced{ dir = 8 @@ -23301,16 +23314,13 @@ /turf/simulated/floor/plasteel, /area/station/engineering/tech_storage) "bOl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/sign/poster/ripped{ - pixel_x = -32 - }, /obj/structure/chair{ dir = 4 }, +/obj/machinery/newscaster/security_unit/west, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "bOn" = ( /obj/structure/table, /obj/machinery/light_switch/west, @@ -27126,10 +27136,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/office/hop) "caT" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, +/obj/structure/morgue, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "caV" = ( /obj/item/kirbyplants, /obj/machinery/light/directional/north, @@ -37598,13 +37611,15 @@ /turf/simulated/floor/engine, /area/station/science/toxins/mixing) "cRA" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ d2 = 2; icon_state = "0-2" }, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "BP" + }, /turf/simulated/floor/plating, -/area/station/security/podpilot) +/area/station/security/brigmed) "cRD" = ( /turf/simulated/wall/mineral/titanium, /area/shuttle/pod_2) @@ -39394,10 +39409,11 @@ /turf/simulated/floor/carpet, /area/station/legal/lawoffice) "cXS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "cXT" = ( /obj/effect/spawner/random/fungus/maybe, /turf/simulated/wall, @@ -39465,11 +39481,18 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cYh" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/reagent_dispensers/watertank, +/obj/structure/crematorium{ + dir = 1; + id = 2 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "cYi" = ( /obj/structure/disposaloutlet{ name = "evidence outlet" @@ -41616,22 +41639,13 @@ }, /area/station/maintenance/fore) "diL" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/rack, -/obj/item/secbot_assembly{ - desc = "Мы не ценим то что имеем пока не потеряем."; - pixel_y = 6; - name = "Podsky" - }, -/obj/machinery/door_control/shutter/north{ - id = "secpilot"; - req_access = list(63); - name = "\improper SecPilot pod door" +/obj/structure/morgue, +/obj/structure/window/reinforced{ + dir = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "diN" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/any/engineering/maintenance, @@ -55125,16 +55139,9 @@ /turf/simulated/floor/carpet/black, /area/station/service/chapel/bedroom) "fqo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/blood/old, -/obj/structure/closet/cardboard, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "fqr" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -58973,11 +58980,11 @@ }, /area/station/medical/morgue) "gBh" = ( -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/structure/closet/secure_closet/medical2, +/obj/item/defibrillator/loaded, +/obj/item/handheld_defibrillator, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "gBo" = ( /obj/structure/cable{ d1 = 1; @@ -61453,11 +61460,18 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hov" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /obj/machinery/light/small/directional/south, +/obj/structure/morgue{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "hox" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -63530,15 +63544,24 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "hSp" = ( -/obj/item/flashlight, -/obj/effect/decal/cleanable/dirt, -/obj/structure/sign/poster/ripped{ - pixel_x = -32 +/obj/structure/shelf/medbay, +/obj/item/reagent_containers/spray/cleaner{ + pixel_y = 10; + pixel_x = -8 + }, +/obj/item/clothing/glasses/hud/health{ + pixel_y = 10; + pixel_x = 5 + }, +/obj/item/storage/belt/medical{ + pixel_y = -6 + }, +/obj/machinery/camera{ + dir = 4; + c_tag = "Brig Med 1" }, -/obj/structure/rack, -/obj/machinery/light/small/directional/west, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "hSK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64158,11 +64181,8 @@ /area/station/maintenance/aft) "idf" = ( /obj/machinery/computer/secure_data, -/obj/effect/decal/cleanable/cobweb, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "ido" = ( /obj/machinery/economy/vending/wallmed/directional/east, /turf/simulated/floor/plasteel{ @@ -64746,9 +64766,9 @@ }, /area/station/medical/medbay) "ilT" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/structure/sign/poster/official/taa, +/turf/simulated/wall/r_wall, +/area/station/security/brigmed) "ilY" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -65556,13 +65576,12 @@ }, /area/station/maintenance/apmaint) "iwi" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /obj/structure/cable, /obj/machinery/power/apc/directional/south, +/obj/structure/bed/roller, +/obj/machinery/iv_drip, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "iwz" = ( /obj/machinery/door/airlock/security/glass, /obj/effect/mapping_helpers/airlock/autoname, @@ -68473,6 +68492,12 @@ d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -69714,6 +69739,7 @@ dir = 8 }, /obj/machinery/firealarm/directional/east, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -71802,14 +71828,18 @@ /turf/simulated/floor/plating, /area/station/science/research) "kjw" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/crema_switch{ + pixel_y = 0; + id = 2; + idle_power_consumption = 5000; + pixel_x = 25 + }, +/obj/item/radio/intercom/directional/east{ + pixel_x = 31; + pixel_y = 0 }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "kjB" = ( /obj/structure/chair/stool{ dir = 8 @@ -74835,6 +74865,7 @@ /obj/structure/chair{ dir = 4 }, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -83397,7 +83428,6 @@ }, /area/station/medical/medbay2) "nGR" = ( -/obj/effect/decal/cleanable/dirt, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -83408,8 +83438,14 @@ d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "nGZ" = ( /obj/machinery/alarm/directional/east, /obj/structure/table/reinforced, @@ -86619,12 +86655,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/aft_port) "ozs" = ( -/obj/structure/closet/secure_closet/security, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb, /obj/machinery/light_switch/north, +/obj/item/roller_holder, +/obj/item/roller_holder, +/obj/machinery/light/small/directional/north, +/obj/machinery/firealarm/directional/west, +/obj/structure/closet/secure_closet/brigphysic, +/obj/item/soap/deluxe/laundry, +/obj/item/clothing/under/rank/security/brigphysic, +/obj/item/clothing/under/rank/security/brigphysic/skirt, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "ozw" = ( /obj/structure/filingcabinet/chestdrawer, /obj/machinery/light/directional/north, @@ -87755,15 +87796,21 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "oRu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/sign/poster/contraband/fun_police{ - pixel_x = 32 +/obj/structure/table/reinforced, +/obj/item/paper_bin/nanotrasen{ + pixel_x = -6; + pixel_y = 4 + }, +/obj/item/pen/multi{ + pixel_x = -4; + pixel_y = 5 + }, +/obj/machinery/photocopier{ + pixel_x = 0; + pixel_y = 32 }, -/obj/structure/closet, -/obj/item/melee/baton, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "oRx" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ @@ -87999,7 +88046,7 @@ /area/station/command/office/hop) "oVL" = ( /turf/simulated/wall/r_wall, -/area/station/security/podpilot) +/area/station/security/brigmed) "oVN" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -92173,15 +92220,19 @@ }, /area/station/security/processing) "qfb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /obj/structure/cable{ d1 = 1; d2 = 8; icon_state = "1-8" }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "qfc" = ( /obj/structure/table/wood, /obj/item/radio/security{ @@ -93296,10 +93347,12 @@ }, /area/station/hallway/primary/fore) "qvV" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/ore_box, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/sleeper{ + pixel_x = 3 + }, +/obj/structure/window/reinforced, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "qwd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -93593,12 +93646,14 @@ }, /area/station/security/interrogation/observation) "qBe" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/poddoor/multi_tile/two_tile_ver{ - id_tag = "secpilot" +/obj/machinery/sleeper{ + pixel_x = 3 }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "qBo" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/dirt, @@ -94636,19 +94691,13 @@ }, /area/station/supply/warehouse) "qPu" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/item/storage/toolbox/electrical{ - pixel_y = 5 - }, -/obj/structure/table/reinforced, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "qPD" = ( /obj/effect/spawner/random_spawners/wall_rusted_maybe, /turf/simulated/wall, @@ -94683,12 +94732,6 @@ /obj/structure/disposalpipe/junction/reversed{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -94699,6 +94742,8 @@ d2 = 8; icon_state = "2-8" }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "redfull" }, @@ -96776,9 +96821,17 @@ /turf/simulated/floor/plating, /area/station/security/interrogation) "ruC" = ( -/obj/structure/fans/tiny, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/computer/operating{ + dir = 8 + }, +/obj/machinery/light/small/directional/east, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera{ + dir = 8; + c_tag = "Brig Med 2" + }, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "ruI" = ( /obj/structure/table, /obj/item/reagent_containers/drinks/coffee{ @@ -96956,11 +97009,13 @@ /turf/simulated/wall, /area/station/service/barber) "rwX" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, +/obj/machinery/bodyscanner, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/light/small/directional/east, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "rwY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -102183,6 +102238,7 @@ /obj/effect/turf_decal/siding/wood{ dir = 8 }, +/obj/item/cartridge/secmed, /turf/simulated/floor/wood, /area/station/command/office/hos) "sYI" = ( @@ -107157,10 +107213,10 @@ /turf/simulated/floor/carpet/royalblack, /area/station/legal/magistrate) "uxJ" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/economy/vending/medical, +/obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "uyc" = ( /obj/structure/cable{ d1 = 2; @@ -107808,9 +107864,12 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "uJH" = ( /obj/machinery/atmospherics/unary/vent_pump{ autolink_id = "n2o_out"; @@ -109581,17 +109640,18 @@ }, /area/station/security/storage) "viW" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable{ d2 = 8; icon_state = "0-8" }, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Secure Gate"; - name = "Security Blast Door" +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "BP" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 }, /turf/simulated/floor/plating, -/area/station/security/podpilot) +/area/station/security/brigmed) "viY" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -114550,15 +114610,14 @@ /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) "wKy" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, -/area/station/security/podpilot) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/plasteel/dark, +/area/station/security/brigmed) "wLe" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -114807,9 +114866,9 @@ }, /area/station/maintenance/port) "wPa" = ( -/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/freezer/iv_storage, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "wPb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -118925,11 +118984,17 @@ }, /area/station/science/genetics) "xVq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dust, -/obj/structure/reagent_dispensers/fueltank, +/obj/structure/morgue{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, -/area/station/security/podpilot) +/area/station/security/brigmed) "xVw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -175288,7 +175353,7 @@ oVL oVL oVL ozs -kjw +aTw uxJ siM vix @@ -175799,9 +175864,9 @@ vUE oyu nSd awv -caT -ilT -wPa +blN +blN +fqo uJu biJ oVL @@ -176055,11 +176120,11 @@ xFq jqC xAF nSd -bkd +blN oRu -wPa +qBe qvV -fqo +aTw rwX oVL pTD @@ -176313,7 +176378,7 @@ qPc hFx nSd oVL -oVL +ilT cRA aLV bjO @@ -177086,7 +177151,7 @@ abj aaa viW blN -cXS +bkd cXS cYh oVL @@ -177343,8 +177408,8 @@ aaa abj oVL gBh -caT -caT +ruC +kjw xVq oVL sCQ @@ -177600,8 +177665,8 @@ aaa abj oVL oVL -ruC -qBe +oVL +oVL oVL oVL abj @@ -177856,10 +177921,10 @@ aaa aaa abj abj -aaa -aaa -aaa -aaa +abj +abj +abj +abj abj abj aaa diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index 45a193d69788..c4b2917d5b62 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -2330,12 +2330,16 @@ /turf/simulated/wall/r_wall, /area/station/security/warden) "aqw" = ( -/obj/structure/closet/crate, -/obj/item/bodybag, -/obj/item/radio, -/obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/structure/cable/yellow, +/obj/machinery/power/apc/directional/south, +/obj/machinery/camera{ + c_tag = "Brig Med 1"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "aqz" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, @@ -2529,9 +2533,22 @@ /area/station/maintenance/disposal) "arH" = ( /obj/machinery/light/small/directional/east, -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/structure/morgue{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/security/brig{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/machinery/door/window/reinforced/normal{ + dir = 8; + req_access = list(63) + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "arI" = ( /obj/structure/lattice/catwalk, /obj/structure/cable, @@ -2552,21 +2569,20 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "arR" = ( -/obj/machinery/door/poddoor/preopen{ - id_tag = "Secure Gate"; - name = "brig shutters" - }, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/security/general, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/door/airlock/security/glass, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel, +/area/station/security/brigmed) "arT" = ( /obj/structure/cable/yellow{ d2 = 4; @@ -3976,8 +3992,14 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/computer/operating{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "axv" = ( /obj/structure/disposalpipe/junction{ dir = 4 @@ -4043,16 +4065,27 @@ }, /area/station/security/execution) "axB" = ( -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/optable, +/obj/item/tank/internals/anesthetic, +/obj/item/clothing/mask/breath/medical, +/obj/item/storage/firstaid/surgery, +/obj/machinery/camera{ + dir = 10; + c_tag = "Brig Med 2" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "axG" = ( /obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -4107,6 +4140,21 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"axU" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/closet/secure_closet/brigphysic, +/obj/item/autopsy_scanner, +/obj/item/defibrillator/loaded, +/obj/item/handheld_defibrillator, +/obj/item/clothing/under/rank/security/brigphysic, +/obj/item/clothing/under/rank/security/brigphysic/skirt, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "axV" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -11138,9 +11186,19 @@ /turf/simulated/wall, /area/station/medical/chemistry) "aWS" = ( -/obj/machinery/light/small/directional/north, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "aWT" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Fore - Port Corner"; @@ -11956,6 +12014,25 @@ }, /turf/simulated/floor/wood, /area/station/service/cafeteria) +"aZG" = ( +/obj/structure/morgue{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/windoor/access/all/security/brig{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/machinery/door/window/reinforced/normal{ + dir = 8; + req_access = list(63) + }, +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "aZH" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -12469,6 +12546,10 @@ icon_state = "brown" }, /area/station/supply/lobby) +"bbb" = ( +/obj/structure/lattice, +/turf/simulated/wall/r_wall, +/area/station/security/brigmed) "bbe" = ( /obj/item/radio/intercom/directional/south, /obj/machinery/camera{ @@ -44037,12 +44118,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "dhI" = ( -/mob/living/simple_animal/bot/cleanbot{ - name = "Mopfficer Sweepsky"; - on = 0 +/obj/structure/crematorium{ + dir = 1; + id = 2 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "dhW" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 5 @@ -44958,6 +45041,13 @@ icon_state = "C9" }, /area/station/hallway/primary/central) +"dFg" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "dFD" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -45081,6 +45171,7 @@ /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -45570,6 +45661,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -45779,6 +45873,9 @@ }, /turf/simulated/floor/wood, /area/station/maintenance/apmaint) +"ebH" = ( +/turf/simulated/wall, +/area/station/security/brigmed) "ebM" = ( /obj/machinery/atmospherics/pipe/simple/visible/green{ dir = 4 @@ -45817,6 +45914,13 @@ icon_state = "freezerfloor" }, /area/station/public/toilet/lockerroom) +"ece" = ( +/obj/machinery/light/floor, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkred" + }, +/area/station/security/brigmed) "edg" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/public/glass, @@ -46050,10 +46154,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/airlock/security, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "eib" = ( /obj/structure/table/reinforced, /obj/item/clipboard{ @@ -47765,12 +47874,17 @@ }, /area/station/medical/paramedic) "eYw" = ( -/obj/item/flashlight{ - pixel_x = 1; - pixel_y = 5 +/obj/machinery/crema_switch{ + pixel_y = -28; + id = 2; + idle_power_consumption = 5000; + pixel_x = 0 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/structure/closet/crate/freezer/iv_storage, +/turf/simulated/floor/plasteel{ + icon_state = "darkblue" + }, +/area/station/security/brigmed) "eYA" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -49103,6 +49217,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/supply/lobby) +"fCR" = ( +/obj/machinery/sleeper{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "darkred" + }, +/area/station/security/brigmed) "fCW" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -50652,6 +50775,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/item/cartridge/secmed, /turf/simulated/floor/plasteel/dark, /area/station/command/office/hos) "gpe" = ( @@ -51095,9 +51219,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/turf_decal/stripes/line, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "gCp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -51783,6 +51909,15 @@ icon_state = "dark" }, /area/station/security/main) +"gRR" = ( +/obj/machinery/bodyscanner{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkred" + }, +/area/station/security/brigmed) "gSa" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -51940,19 +52075,6 @@ icon_state = "whiteblue" }, /area/station/medical/reception) -"gUz" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/structure/cable/yellow{ - d2 = 4; - icon_state = "0-4" - }, -/obj/structure/cable/yellow{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "gUL" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -53542,6 +53664,16 @@ icon_state = "white" }, /area/station/medical/medbay) +"hDX" = ( +/obj/machinery/defibrillator_mount/loaded{ + pixel_x = -32; + pixel_y = 0 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "darkred" + }, +/area/station/security/brigmed) "hDY" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -57110,6 +57242,13 @@ /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/genetics, /turf/simulated/floor/grass/no_creep, /area/station/science/genetics) +"jpO" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/structure/closet/crate/freezer/iv_storage/organ, +/turf/simulated/floor/plasteel, +/area/station/security/brig) "jrc" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable/yellow{ @@ -57558,9 +57697,6 @@ d2 = 8; icon_state = "1-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57569,6 +57705,7 @@ d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -57887,9 +58024,12 @@ }, /area/station/engineering/atmos) "jJn" = ( -/obj/structure/girder, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/iv_drip, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "jJo" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -63402,8 +63542,16 @@ d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/machinery/light/small/directional/west, +/obj/item/radio/intercom/directional/west, +/turf/simulated/floor/plasteel{ + dir = 10; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "mcw" = ( /obj/effect/landmark/lightsout, /turf/simulated/floor/plasteel{ @@ -63953,6 +64101,7 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/A) "mnl" = ( @@ -64863,11 +65012,11 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/area/station/security/brigmed) "mOL" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65094,6 +65243,14 @@ icon_state = "red" }, /area/station/security/brig) +"mSJ" = ( +/obj/machinery/light/small/directional/north, +/obj/machinery/economy/vending/wallmed/survival_pod/directional/north, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "mTB" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, @@ -67042,6 +67199,12 @@ icon_state = "darkgreycheck" }, /area/station/command/office/rd) +"nFQ" = ( +/turf/simulated/floor/plasteel{ + dir = 6; + icon_state = "darkred" + }, +/area/station/security/brigmed) "nFZ" = ( /obj/machinery/door/airlock/external{ id_tag = "engine_door_ext"; @@ -67320,6 +67483,26 @@ /obj/machinery/light/small/directional/east, /turf/simulated/floor/plating, /area/station/maintenance/starboard) +"nOK" = ( +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "darkbluecorners" + }, +/area/station/security/brigmed) "nOR" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance_hatch, @@ -69279,6 +69462,7 @@ /obj/structure/closet, /obj/effect/spawner/random/maintenance, /obj/structure/sign/poster/contraband/random/north, +/obj/machinery/light/small/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "oUs" = ( @@ -70881,30 +71065,23 @@ }, /area/station/engineering/atmos) "pJx" = ( -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/sign/electricshock{ pixel_x = 32 }, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/turf/simulated/wall/r_wall, +/area/station/security/brigmed) "pJE" = ( /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 8; - icon_state = "2-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "pKi" = ( @@ -77805,11 +77982,22 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/yellow{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "sVO" = ( /obj/structure/table/reinforced, /obj/item/paper_bin, @@ -78330,6 +78518,9 @@ icon_state = "darkblue" }, /area/station/medical/surgery/secondary) +"tgm" = ( +/turf/simulated/wall/r_wall, +/area/station/security/brigmed) "tgC" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -79339,6 +79530,24 @@ }, /turf/simulated/floor/carpet, /area/station/legal/magistrate) +"tHz" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/security/brig, +/obj/machinery/door/poddoor/preopen{ + id_tag = "Secure Gate"; + name = "brig shutters" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/fpmaint) "tHA" = ( /obj/structure/chair/office/light{ dir = 4 @@ -83408,17 +83617,10 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "vIG" = ( -/obj/effect/spawner/window/reinforced/grilled, /obj/structure/sign/electricshock{ pixel_x = -32 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/cable/yellow, -/turf/simulated/floor/plating, +/turf/simulated/wall, /area/station/maintenance/fpmaint) "vIU" = ( /obj/structure/window/reinforced{ @@ -84406,6 +84608,12 @@ /obj/structure/disposalpipe/segment/corner{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel, /area/station/security/brig) "wlo" = ( @@ -85379,8 +85587,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "darkblue" + }, +/area/station/security/brigmed) "wNP" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -86328,6 +86546,9 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/landmark/start/brigphysician, /turf/simulated/floor/plasteel, /area/station/security/brig) "xkY" = ( @@ -86472,6 +86693,15 @@ icon_state = "whiteblue" }, /area/station/medical/cryo) +"xoo" = ( +/obj/machinery/sleeper{ + dir = 2 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "darkred" + }, +/area/station/security/brigmed) "xoq" = ( /obj/machinery/newscaster/directional/north, /obj/machinery/disposal, @@ -86967,12 +87197,15 @@ d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "redcorner" @@ -110043,10 +110276,10 @@ aqC leh rGj umr -aOB -aWS -jGH -gUz +aky +aky +tHz +aky aaa aBb aDt @@ -110300,10 +110533,10 @@ xgb bpT pgt pgt -aOB +tgm jJn -jGH -gUz +aWS +tgm aaa aBb aCB @@ -110551,14 +110784,14 @@ udK udK udK abW -abq -aOB -aOB -aOB -aOB -aOB -aOB -adY +bbb +tgm +tgm +tgm +tgm +tgm +tgm +mSJ axB pJx abq @@ -110808,16 +111041,16 @@ wjs iyj bPP abW -aaa -aaa -aaa -aOB +xoo +hDX +gRR +axU mcp gCo ehO mOD axu -aOB +tgm aaa aaa abq @@ -111065,16 +111298,16 @@ lLb ivD qIB abW -aaa -aaa -aaa -aOB -wNL -dhI -aOB -aOB -aOB -aOB +fCR +ece +nFQ +dFg +nOK +eYw +ebH +ebH +ebH +tgm aHI aHI aHI @@ -111325,10 +111558,10 @@ tfl tfl hUG fbB -aky +tgm wNL -eYw -aOB +dhI +ebH ryz qQO xgE @@ -111585,7 +111818,7 @@ xkX arR sVG aqw -aOB +ebH jIM lqQ cTy @@ -111838,11 +112071,11 @@ lAl cPh hph xAI -crD -aky +jpO +tgm arH -tup -aOB +aZG +ebH fma iVU cTy @@ -112096,10 +112329,10 @@ cPh jXe dXJ qCv -aky -aky -aky -aky +tgm +tgm +tgm +tgm aHD aHD aHD diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 56a2029797f1..9d75bf14d687 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -533,6 +533,11 @@ GLOBAL_VAR_INIT(record_id_num, 1001) clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "trainee_s") clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "orange"), ICON_UNDERLAY) clothes_s.Blend(new /icon('icons/mob/clothing/belt.dmi', "utility"), ICON_OVERLAY) + + if("Security Medic") + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "sec_medic_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) // SS220 ADDITION - END if("Syndicate Agent") diff --git a/code/game/jobs/job/security_jobs.dm b/code/game/jobs/job/security_jobs.dm index b3e218efb9ec..786ee3b52ef4 100644 --- a/code/game/jobs/job/security_jobs.dm +++ b/code/game/jobs/job/security_jobs.dm @@ -186,6 +186,8 @@ H.dna.SetSEState(GLOB.soberblock, TRUE) H.check_mutations = 1 +datum/job/brigphysic // SS220 ADDITION - add brig physician + /datum/job/officer title = "Security Officer" flag = JOB_OFFICER diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 741357eb01c1..965416f76572 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -1189,6 +1189,8 @@ return "Thunderdome Red" if("TDgreen") return "Thunderdome Green" + if("brigphysician") + return "Security Medic" //SS220 ADDICTION - add brig physician else return capitalize(skin) diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm index cf0d80700287..daf6d3da97c3 100644 --- a/code/modules/mob/living/carbon/human/species/plasmaman.dm +++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm @@ -73,7 +73,7 @@ if("Chef") O = new /datum/outfit/plasmaman/chef - if("Security Officer", "Special Operations Officer") + if("Security Officer", "Special Operations Officer", "Security Medic") O = new /datum/outfit/plasmaman/security if("Detective") diff --git a/config/example/config.toml b/config/example/config.toml index 47422b062196..a8add07a06e9 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -497,6 +497,7 @@ job_slot_amounts = [ { name = "Security Cadet", lowpop = 0, highpop = 0 }, { name = "Warden", lowpop = 1, highpop = 1 }, { name = "Internal Affairs Agent", lowpop = 2, highpop = 2 }, + { name = "Security Medic", lowpop = 1, highpop = 1 }, # Service { name = "Bartender", lowpop = 1, highpop = 1 }, { name = "Botanist", lowpop = 2, highpop = 2 }, diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi index 1a772a813e47..7f2aece236b3 100644 Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ diff --git a/modular_ss220/_defines220/code/job_defines.dm b/modular_ss220/_defines220/code/job_defines.dm index e93e785a5198..2ce846ba755a 100644 --- a/modular_ss220/_defines220/code/job_defines.dm +++ b/modular_ss220/_defines220/code/job_defines.dm @@ -5,7 +5,7 @@ // Но так как они больше не планируют и выступают против добавления новых профессий, скорее всего ничего и не изменится. // JOBCAT_"отдел"_LAST - нужен для корректного вывода из БД, иначе чуда не будет. -// Максимальный сдвиг (1<<22), Последний сдвиг (1<<23) +// Максимальный сдвиг (1<<23), Последний сдвиг (1<<24) // Он должен быть всегда как минимум на 1 больше последнего, по дефолту у ОФФов (1<<16) @@ -22,8 +22,9 @@ #define JOB_VIP_GUEST (1<<20) #define JOB_BANKER (1<<21) #define JOB_SECURITY_CLOWN (1<<22) +#define JOB_BRIGPHYSICIAN (1<<23) -#define JOBCAT_LAST_ENGSEC (1<<23) +#define JOBCAT_LAST_ENGSEC (1<<24) // ==================================== diff --git a/modular_ss220/aesthetics/better_ids/code/better_ids.dm b/modular_ss220/aesthetics/better_ids/code/better_ids.dm index bf5baa161c74..e48747c99ca9 100644 --- a/modular_ss220/aesthetics/better_ids/code/better_ids.dm +++ b/modular_ss220/aesthetics/better_ids/code/better_ids.dm @@ -1,7 +1,7 @@ GLOBAL_LIST_INIT(card_skins_ss220, list( "id", "silver", "gold", "data", "assistant", "civilian", "librarian", "chaplain", "janitor", "botanist", "chef", "bartender", "clown", "mime", - "intern", "medical", "paramedic", "psychiatrist", "coroner", "virologist", "chemist", "warden", "internalaffairsagent", + "intern", "medical", "paramedic", "psychiatrist", "coroner", "virologist", "chemist", "brigphysician", "warden", "internalaffairsagent", "geneticist", "student", "research", "roboticist", "cadet", "security", "detective", "quartermaster", "cargo", "explorer", "shaftminer", "trainee", "engineering", "atmostech", "captain", "HoP", "HoS", "CMO", "RD", "CE", "prisoner", "rainbow" )) diff --git a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi index 09e2c4a107f4..49587189ed16 100644 Binary files a/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi and b/modular_ss220/aesthetics/better_ids/icons/better_ids.dmi differ diff --git a/modular_ss220/aesthetics/closets/code/closets.dm b/modular_ss220/aesthetics/closets/code/closets.dm index a269306e34ab..600645468e85 100644 --- a/modular_ss220/aesthetics/closets/code/closets.dm +++ b/modular_ss220/aesthetics/closets/code/closets.dm @@ -9,3 +9,27 @@ /obj/structure/closet/secure_closet/personal/cabinet icon = 'modular_ss220/aesthetics/closets/icons/closets.dmi' + +/obj/structure/closet/secure_closet/brigphysic + name = "security medic's locker" + req_access = list(ACCESS_SECURITY) + icon_state = "sec" + +/obj/structure/closet/secure_closet/brigphysic/populate_contents() + if(prob(50)) + new /obj/item/storage/backpack/security(src) + else + new /obj/item/storage/backpack/satchel_sec(src) + new /obj/item/radio/headset/headset_secmedical/alt(src) + new /obj/item/radio/headset/headset_secmedical(src) + new /obj/item/defibrillator/compact/loaded(src) + new /obj/item/holosign_creator/security(src) + new /obj/item/storage/box/gloves(src) + new /obj/item/storage/box/masks(src) + new /obj/item/storage/box/syringes(src) + new /obj/item/storage/box/autoinjectors(src) + new /obj/item/storage/box/bodybags(src) + new /obj/item/clothing/glasses/hud/health/sunglasses(src) + new /obj/item/flashlight/seclite(src) + new /obj/item/clothing/gloves/color/latex(src) + new /obj/item/clothing/gloves/color/latex/nitrile(src) diff --git a/modular_ss220/clothing/icons/mob/species/drask/under.dmi b/modular_ss220/clothing/icons/mob/species/drask/under.dmi index 9e5b8f3a7f07..c507e007725d 100644 Binary files a/modular_ss220/clothing/icons/mob/species/drask/under.dmi and b/modular_ss220/clothing/icons/mob/species/drask/under.dmi differ diff --git a/modular_ss220/clothing/icons/mob/species/vox/under.dmi b/modular_ss220/clothing/icons/mob/species/vox/under.dmi index 92db8e05e138..15aa9be2c938 100644 Binary files a/modular_ss220/clothing/icons/mob/species/vox/under.dmi and b/modular_ss220/clothing/icons/mob/species/vox/under.dmi differ diff --git a/modular_ss220/jobs/_jobs.dm b/modular_ss220/jobs/_jobs.dm index 486c0fe25233..5874c30bad9c 100644 --- a/modular_ss220/jobs/_jobs.dm +++ b/modular_ss220/jobs/_jobs.dm @@ -1,7 +1,7 @@ /datum/modpack/jobs name = "Работы" desc = "Новые джобки и изменения старых" - author = "furior, PhantomRU" + author = "furior, PhantomRU, Glamyr" /datum/modpack/jobs/initialize() . = ..() diff --git a/modular_ss220/jobs/code/card_id.dm b/modular_ss220/jobs/code/card_id.dm index d61e04da44db..18d7464f31f6 100644 --- a/modular_ss220/jobs/code/card_id.dm +++ b/modular_ss220/jobs/code/card_id.dm @@ -209,3 +209,11 @@ access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT) icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' icon_state = "securityclown" + +/obj/item/card/id/brigphysician + name = "Security Medic ID" + icon = 'modular_ss220/aesthetics/better_ids/icons/better_ids.dmi' + icon_state = "brigphysician" + registered_name = "Security Medic" + access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SEC_DOORS, ACCESS_SECURITY, ACCESS_SURGERY, ACCESS_WEAPONS, ACCESS_CREMATORIUM) + diff --git a/modular_ss220/jobs/code/clothing/security_clothing.dm b/modular_ss220/jobs/code/clothing/security_clothing.dm index aac6f3f2f341..6bfe8cc8c6d8 100644 --- a/modular_ss220/jobs/code/clothing/security_clothing.dm +++ b/modular_ss220/jobs/code/clothing/security_clothing.dm @@ -37,3 +37,65 @@ item_color = "security_clown" item_state = "clown" +/obj/item/clothing/under/rank/security/brigphysic + name = "security medic turtleneck" + icon = 'modular_ss220/jobs/icons/clothing/uniforms.dmi' + icon_override = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi' + desc = "Модная и удобная водолазка, специально для медика отдела службы безопасности!" + icon_state = "sec_medic_s" + item_state = "sec_medic_s" + item_color = "sec_medic" + sprite_sheets = null + random_sensor = TRUE + sprite_sheets = list( + "Abductor" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Diona" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', + "Golem" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Grey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Kidan" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Machine" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Monkey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Nian" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Shadow" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Skrell" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Slime People" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Unathi" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', + "Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + ) + + +/obj/item/clothing/under/rank/security/brigphysic/skirt + name = "security medic skirtleneck" + desc = "Модная и удобная юбка-водолазка, специально для медика отдела службы безопасности!" + icon_state = "sec_medic_skirt_s" + item_state = "sec_medic_skirt_s" + item_color = "sec_medic_skirt" + sprite_sheets = list( + "Abductor" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Ancient Skeleton" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Diona" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Drask" = 'modular_ss220/clothing/icons/mob/species/drask/under.dmi', + "Golem" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Grey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Human" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Kidan" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Machine" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Monkey" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Nian" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Plasmaman" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Shadow" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Skrell" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Slime People" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Tajaran" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Unathi" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Vox" = 'modular_ss220/clothing/icons/mob/species/vox/under.dmi', + "Vulpkanin" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + "Nucleation" = 'modular_ss220/jobs/icons/clothing/mob/uniform.dmi', + ) diff --git a/modular_ss220/jobs/code/job/security_jobs.dm b/modular_ss220/jobs/code/job/security_jobs.dm index 7f4e5f1d02e1..4bfb3ff3ba98 100644 --- a/modular_ss220/jobs/code/job/security_jobs.dm +++ b/modular_ss220/jobs/code/job/security_jobs.dm @@ -53,6 +53,9 @@ /datum/job/officer exp_map = list(EXP_TYPE_SECURITY = (600 + NOVICE_CADET_JOB_MINUTES)) +/datum/job/brigphysic + exp_map = list(EXP_TYPE_SECURITY = (900 + NOVICE_CADET_JOB_MINUTES)) + /datum/job/detective exp_map = list(EXP_TYPE_SECURITY = (900 + NOVICE_CADET_JOB_MINUTES)) @@ -61,3 +64,54 @@ /datum/job/hos exp_map = list(EXP_TYPE_SECURITY = (1200 + NOVICE_CADET_JOB_MINUTES)) + +/datum/job/brigphysic + title = "Security Medic" + flag = JOB_BRIGPHYSICIAN + department_flag = JOBCAT_ENGSEC + total_positions = 1 + spawn_positions = 1 + alt_titles = list("Brig Physician", "Security Doctor", "Security Paramedic") + supervisors = "the head of security" + department_head = list("Head of Security") + selection_color = "#ffeeee" + job_department_flags = DEP_FLAG_SECURITY + access = list(ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SEC_DOORS, ACCESS_SECURITY, ACCESS_SURGERY, ACCESS_WEAPONS, ACCESS_CREMATORIUM, ACCESS_EVA) + minimal_player_age = 21 + exp_map = list(EXP_TYPE_SECURITY = 900) + blacklisted_disabilities = list(DISABILITY_FLAG_BLIND, DISABILITY_FLAG_DEAF, DISABILITY_FLAG_MUTE, DISABILITY_FLAG_DIZZY) + missing_limbs_allowed = FALSE + outfit = /datum/outfit/job/brigphysic + important_information = "Вы медик службы безопасности. \ + Лечите своих коллег и заключённых. Следите за стерильностью своей комнаты. \ + Помните о том что вы не офицер службы безопаности, а их медик и вместо войны должны заниматся лечением." + +/datum/outfit/job/brigphysic + name = "Security Medic" + jobtype = /datum/job/brigphysic + uniform = /obj/item/clothing/under/rank/security/brigphysic + suit = /obj/item/clothing/suit/storage/labcoat + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/beret/sec + l_ear = /obj/item/radio/headset/headset_secmedical/alt + id = /obj/item/card/id/brigphysician + l_pocket = /obj/item/reagent_containers/spray/pepper + r_pocket = /obj/item/flash + l_hand = /obj/item/storage/firstaid/doctor + pda = /obj/item/pda/brigphysic + backpack_contents = list( + /obj/item/melee/classic_baton/telescopic = 1 + ) + + bio_chips = list(/obj/item/bio_chip/mindshield) + + backpack = /obj/item/storage/backpack/security + satchel = /obj/item/storage/backpack/satchel_sec + dufflebag = /obj/item/storage/backpack/duffel/security + +/datum/outfit/job/brigphysic/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + + if(H.gender == FEMALE) + uniform = /obj/item/clothing/under/rank/security/brigphysic/skirt diff --git a/modular_ss220/jobs/code/jobs_character.dm b/modular_ss220/jobs/code/jobs_character.dm index 4874dc74bde9..a88321aadf0f 100644 --- a/modular_ss220/jobs/code/jobs_character.dm +++ b/modular_ss220/jobs/code/jobs_character.dm @@ -5,7 +5,7 @@ var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman switch(current_job) - if("Security Cadet") + if("Security Cadet", "Security Medic") O = new /datum/outfit/plasmaman/security if("Medical Intern") @@ -207,6 +207,19 @@ else if(backbag == 3 || backbag == 4) clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-clown"), ICON_OVERLAY) + if(JOB_BRIGPHYSICIAN) + clothes_s = new /icon('modular_ss220/jobs/icons/clothing/mob/uniform.dmi', "sec_medic[g ? "_skirt" : ""]_s") + clothes_s.Blend(new /icon('icons/mob/clothing/feet.dmi', "laceups"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/head/beret.dmi',"beret_officer"), ICON_UNDERLAY) + clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "labcoat_open"), ICON_OVERLAY) + switch(backbag) + if(1) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "securitypack"), ICON_OVERLAY) + if(2) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel-sec"), ICON_OVERLAY) + if(3) + clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "satchel"), ICON_OVERLAY) else if(job_support_high) switch(job_support_high) diff --git a/modular_ss220/jobs/code/jobs_global_list.dm b/modular_ss220/jobs/code/jobs_global_list.dm index 02c3923603db..d9016fa12d68 100644 --- a/modular_ss220/jobs/code/jobs_global_list.dm +++ b/modular_ss220/jobs/code/jobs_global_list.dm @@ -13,6 +13,7 @@ GLOBAL_LIST_INIT(engineering_positions_ss220, list( )) GLOBAL_LIST_INIT(security_positions_ss220, list( + "Security Medic", "Security Cadet", )) diff --git a/modular_ss220/jobs/code/landmarks.dm b/modular_ss220/jobs/code/landmarks.dm index 320bce69e5a4..db397bd7c841 100644 --- a/modular_ss220/jobs/code/landmarks.dm +++ b/modular_ss220/jobs/code/landmarks.dm @@ -42,3 +42,8 @@ icon = 'modular_ss220/jobs/icons/landmarks.dmi' name = "Bath" icon_state = "bath" + +/obj/effect/landmark/start/brigphysician + icon = 'modular_ss220/jobs/icons/landmarks.dmi' + name = "Security Medic" + icon_state = "brigphysician" diff --git a/modular_ss220/jobs/code/objects/job_objects.dm b/modular_ss220/jobs/code/objects/job_objects.dm index a04173bca270..83403889c00f 100644 --- a/modular_ss220/jobs/code/objects/job_objects.dm +++ b/modular_ss220/jobs/code/objects/job_objects.dm @@ -179,3 +179,24 @@ new /obj/item/grenade/chem_grenade/cleaner(src) new /obj/item/grenade/chem_grenade/cleaner(src) update_icon() + +// Гарнитура Бриг-Медика // +/obj/item/encryptionkey/headset_secmedical + name = "Security-Medical Radio Encryption Key" + icon_state = "sec_cypherkey" + channels = list("Security" = 1, "Medical" = 1) + +/obj/item/radio/headset/headset_secmedical + name = "Security-medical radio headset" + desc = "Это используется вашим элитным медиком службы безопасности." + icon_state = "sec_headset" + item_state = "headset" + ks2type = /obj/item/encryptionkey/headset_secmedical + + +/obj/item/radio/headset/headset_secmedical/alt + name = "Security-medical bowman headset" + desc = "Это используется вашим элитным медиком службы безопасности. Защищает уши от светошумовых гранат." + flags = EARBANGPROTECT + icon_state = "sec_headset_alt" + item_state = "sec_headset_alt" diff --git a/modular_ss220/jobs/icons/clothing/mob/uniform.dmi b/modular_ss220/jobs/icons/clothing/mob/uniform.dmi index c14f29cbca83..92fec61c28be 100644 Binary files a/modular_ss220/jobs/icons/clothing/mob/uniform.dmi and b/modular_ss220/jobs/icons/clothing/mob/uniform.dmi differ diff --git a/modular_ss220/jobs/icons/clothing/uniforms.dmi b/modular_ss220/jobs/icons/clothing/uniforms.dmi index 7b593a0b97f4..34a756c7103b 100644 Binary files a/modular_ss220/jobs/icons/clothing/uniforms.dmi and b/modular_ss220/jobs/icons/clothing/uniforms.dmi differ diff --git a/modular_ss220/jobs/icons/hud.dmi b/modular_ss220/jobs/icons/hud.dmi index 9a032a279adf..e8b01a4ff1bc 100644 Binary files a/modular_ss220/jobs/icons/hud.dmi and b/modular_ss220/jobs/icons/hud.dmi differ diff --git a/modular_ss220/jobs/icons/landmarks.dmi b/modular_ss220/jobs/icons/landmarks.dmi index 2e114e152c5f..fcf9346c4a7f 100644 Binary files a/modular_ss220/jobs/icons/landmarks.dmi and b/modular_ss220/jobs/icons/landmarks.dmi differ diff --git a/modular_ss220/jobs/icons/uniforms.dmi b/modular_ss220/jobs/icons/uniforms.dmi index cab653e13b24..8c742ce518c6 100644 Binary files a/modular_ss220/jobs/icons/uniforms.dmi and b/modular_ss220/jobs/icons/uniforms.dmi differ diff --git a/modular_ss220/maps220/code/Station/station_areas.dm b/modular_ss220/maps220/code/Station/station_areas.dm index 96d8b808c5e4..90fd8b0dc730 100644 --- a/modular_ss220/maps220/code/Station/station_areas.dm +++ b/modular_ss220/maps220/code/Station/station_areas.dm @@ -20,6 +20,12 @@ icon_state = "security" request_console_name = "Security" +/area/station/security/brigmed + name = "Медпункт отдела Службы Безопасности" + icon = 'modular_ss220/maps220/icons/areas.dmi' + icon_state = "brigmed" + request_console_name = "Security" + /area/mine/laborcamp request_console_name = "Labor Camp" diff --git a/modular_ss220/maps220/icons/areas.dmi b/modular_ss220/maps220/icons/areas.dmi index a73470565a07..151a233a5b44 100644 Binary files a/modular_ss220/maps220/icons/areas.dmi and b/modular_ss220/maps220/icons/areas.dmi differ diff --git a/modular_ss220/objects/_objects.dme b/modular_ss220/objects/_objects.dme index e38f4a613dc4..d4c28dec4b37 100644 --- a/modular_ss220/objects/_objects.dme +++ b/modular_ss220/objects/_objects.dme @@ -39,6 +39,7 @@ #include "code/miscellaneous.dm" #include "code/officetoys.dm" #include "code/papershredder.dm" +#include "code/pdas.dm" #include "code/plastic_chair.dm" #include "code/platform.dm" #include "code/posters.dm" diff --git a/modular_ss220/objects/code/pdas.dm b/modular_ss220/objects/code/pdas.dm new file mode 100644 index 000000000000..8c7373919031 --- /dev/null +++ b/modular_ss220/objects/code/pdas.dm @@ -0,0 +1,18 @@ +/obj/item/pda/brigphysic + default_cartridge = /obj/item/cartridge/secmed + icon = 'icons/obj/pda.dmi' //для сохранения функционала ПДА-пэйнтера + icon_state = "pda-brigphysic" + desc = "ПДА для медика отдела службы безопасности. Включает в себя передовой картридж, только если его не украли." + +// картридж для пда // +/obj/item/cartridge/secmed + name = "Sec&med" + desc = "A data cartridge for portable microcomputers. Has medical and security records and a med and reagent scanners." + icon = 'icons/obj/pda.dmi' + icon_state = "cart-sm" + programs = list( + new /datum/data/pda/utility/scanmode/medical, + new /datum/data/pda/utility/scanmode/reagent, + new /datum/data/pda/app/crew_records/security, + new /datum/data/pda/app/crew_records/medical, + ) diff --git a/modular_ss220/text_to_speech/code/tts_subsystem.dm b/modular_ss220/text_to_speech/code/tts_subsystem.dm index 02bdfafdf1a6..3f0b47b1a0e9 100644 --- a/modular_ss220/text_to_speech/code/tts_subsystem.dm +++ b/modular_ss220/text_to_speech/code/tts_subsystem.dm @@ -200,6 +200,9 @@ SUBSYSTEM_DEF(tts220) "Security Assistant" = "Ассистент службы безопасности", "Security Graduate" = "Выпускник кадетской академии", "brig physician" = "Врач брига", + "security medic" = "Медик службы безопасности", + "security doctor" = "Доктор службы безопасности", + "security paramedic" = "Парамедик службы безопасности", "security pod pilot" = "Пилот пода службы безопасности", "captain" = "Капитан", "ai" = "И И",