diff --git a/_maps/map_files/EclipseStation/EclipseStation.dmm b/_maps/map_files/EclipseStation/EclipseStation.dmm
index 98925f30d0d6..ef514c065582 100644
--- a/_maps/map_files/EclipseStation/EclipseStation.dmm
+++ b/_maps/map_files/EclipseStation/EclipseStation.dmm
@@ -660,50 +660,6 @@
},
/turf/open/floor/plasteel/freezer,
/area/security/prison)
-"acp" = (
-/obj/structure/table/glass,
-/obj/machinery/computer/security/telescreen{
- desc = "Used for watching Prison Wing holding areas.";
- name = "Prison Monitor";
- network = list("Prison");
- pixel_y = 30
- },
-/obj/item/razor{
- pixel_x = -6
- },
-/obj/item/stack/medical/ointment{
- pixel_y = 4
- },
-/obj/item/stack/medical/bruise_pack{
- pixel_x = 10;
- pixel_y = 2
- },
-/obj/item/reagent_containers/syringe/epinephrine{
- pixel_x = 5;
- pixel_y = -2
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"acq" = (
-/obj/structure/table/glass,
-/obj/item/radio/intercom{
- freerange = 1;
- name = "Common Channel";
- pixel_x = 30
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"acr" = (
-/obj/structure/table/glass,
-/obj/item/reagent_containers/blood/random,
-/obj/item/reagent_containers/blood/random,
-/obj/item/healthanalyzer,
-/obj/machinery/light{
- dir = 1;
- light_color = "#c1caff"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
"acs" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 8
@@ -838,13 +794,6 @@
"acD" = (
/turf/closed/wall,
/area/security/detectives_office)
-"acE" = (
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -24
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
"acF" = (
/turf/open/floor/plasteel/dark,
/area/security/prison)
@@ -968,19 +917,6 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel,
/area/security/prison)
-"acV" = (
-/obj/structure/window/reinforced,
-/mob/living/simple_animal/bot/medbot,
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"acW" = (
-/obj/structure/cable{
- icon_state = "2-4";
- tag = ""
- },
-/obj/machinery/door/window/southleft,
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
"acX" = (
/obj/structure/table,
/obj/item/paper,
@@ -1902,9 +1838,6 @@
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
/area/security/main)
-"aeM" = (
-/turf/closed/wall/r_wall,
-/area/security/processing/cremation)
"aeN" = (
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
@@ -1926,29 +1859,6 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plasteel/dark,
/area/security/prison)
-"aeP" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Prison Wing";
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper,
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
-"aeQ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Prison Morgue";
- req_access_txt = "2"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
"aeR" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 1
@@ -1956,17 +1866,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/closed/wall/r_wall,
/area/security/execution)
-"aeS" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Evidence Storage";
- req_access_txt = "63"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"aeT" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -2031,28 +1930,9 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
-"afb" = (
-/obj/structure/bodycontainer/crematorium,
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
-"afc" = (
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
-"afd" = (
-/obj/structure/table,
-/obj/item/book/manual/wiki/security_space_law,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
-"afe" = (
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"aff" = (
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
-"afg" = (
-/obj/structure/closet/secure_closet/injection,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"afh" = (
/obj/machinery/power/apc{
areastring = "/area/security/execution";
@@ -2335,12 +2215,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
-"afK" = (
-/obj/machinery/button/crematorium{
- pixel_x = 22
- },
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
"afL" = (
/obj/structure/chair{
dir = 4
@@ -2676,10 +2550,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
/area/security/prison)
-"agB" = (
-/obj/structure/bodycontainer/morgue,
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
"agC" = (
/obj/machinery/airalarm{
dir = 4;
@@ -3028,11 +2898,6 @@
/obj/machinery/door/firedoor,
/turf/open/floor/plating,
/area/ai_monitored/security/armory)
-"ahj" = (
-/obj/structure/table,
-/obj/item/electropack,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"ahk" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 8
@@ -3049,13 +2914,6 @@
/obj/machinery/light/small,
/turf/open/floor/plasteel,
/area/security/prison)
-"ahl" = (
-/obj/structure/table,
-/obj/item/clothing/suit/straight_jacket,
-/obj/item/clothing/glasses/blindfold,
-/obj/item/clothing/mask/muzzle,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"ahm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
@@ -4023,39 +3881,6 @@
/obj/effect/spawner/structure/window/reinforced,
/turf/open/floor/plating,
/area/security/processing)
-"aiY" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/door/airlock/security/glass{
- name = "Prison Wing";
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/security/main)
-"aiZ" = (
-/obj/machinery/door/airlock/security/glass{
- name = "Prison Wing";
- req_access_txt = "2"
- },
-/obj/effect/mapping_helpers/airlock/cyclelink_helper{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/security/main)
"aja" = (
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
@@ -5840,11 +5665,6 @@
/obj/effect/landmark/start/security_officer,
/turf/open/floor/plasteel/dark,
/area/security/main)
-"amu" = (
-/obj/structure/table,
-/obj/item/radio/security,
-/turf/open/floor/plasteel/dark,
-/area/security/main)
"amv" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -7929,26 +7749,6 @@
/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel,
/area/security/brig)
-"aqS" = (
-/obj/machinery/power/apc{
- areastring = "/area/security/prison";
- dir = 4;
- name = "Prison Wing APC";
- pixel_x = 24
- },
-/obj/structure/window/reinforced,
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/machinery/camera{
- c_tag = "Prison Medical";
- dir = 8;
- network = list("ss13","prison")
- },
-/obj/structure/cable{
- icon_state = "0-8"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
"aqT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 4
@@ -12950,14 +12750,6 @@
/obj/item/paper_bin/construction,
/turf/open/floor/plasteel/vaporwave,
/area/storage/art)
-"aCs" = (
-/obj/machinery/camera{
- c_tag = "Prison Morgue";
- dir = 1;
- network = list("ss13","prison")
- },
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
"aCt" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -71736,20 +71528,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/execution)
-"cQE" = (
-/obj/machinery/light{
- dir = 4;
- light_color = "#e8eaff"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/processing/cremation)
-"cQF" = (
-/obj/structure/table,
-/obj/item/clothing/head/helmet,
-/obj/item/assembly/signaler,
-/obj/machinery/light,
-/turf/open/floor/plating,
-/area/security/processing/cremation)
"cQG" = (
/obj/machinery/light{
dir = 4;
@@ -81052,6 +80830,21 @@
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/carpet/red,
/area/hallway/primary/fore)
+"dqn" = (
+/obj/machinery/light,
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"dsj" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -81219,6 +81012,18 @@
},
/turf/open/floor/plasteel/dark,
/area/security/main)
+"dQC" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/security/glass{
+ name = "Prison Wing";
+ req_access_txt = "2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"dRl" = (
/obj/structure/disposalpipe/segment{
dir = 6
@@ -81228,6 +81033,25 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"dRM" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/security/glass{
+ name = "Prison Wing";
+ req_one_access_txt = "2;5"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/main)
"dRS" = (
/obj/effect/turf_decal/tile/white{
dir = 8;
@@ -81534,6 +81358,16 @@
},
/turf/open/floor/plasteel,
/area/medical/paramedic/a)
+"eDb" = (
+/obj/machinery/door/window/southleft{
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"eIq" = (
/obj/machinery/airalarm{
dir = 1;
@@ -81571,6 +81405,18 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"eKM" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"eMp" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -82259,6 +82105,19 @@
},
/turf/open/floor/plasteel/dark,
/area/security/main)
+"gfH" = (
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 9
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"ggq" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
@@ -82272,6 +82131,13 @@
},
/turf/open/floor/plasteel,
/area/quartermaster/office)
+"gic" = (
+/obj/structure/cable{
+ icon_state = "2-4";
+ tag = ""
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"gje" = (
/turf/open/floor/plating,
/area/hallway/primary/starboard)
@@ -82856,6 +82722,18 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
+"hvn" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ pixel_x = -2;
+ pixel_y = 1
+ },
+/obj/item/radio/security{
+ pixel_x = 5;
+ pixel_y = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/main)
"hwU" = (
/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
@@ -82945,6 +82823,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel/dark,
/area/teleporter/hub/science)
+"hGM" = (
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop,
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = 29
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"hJa" = (
/obj/machinery/door/airlock/maintenance{
req_access_txt = "12"
@@ -83121,6 +83008,20 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/crew_quarters/fitness/recreation)
+"hVX" = (
+/obj/effect/mapping_helpers/airlock/cyclelink_helper{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/airlock/security/glass{
+ name = "Prison Wing";
+ req_one_access_txt = "2;5"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/main)
"hXw" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -83221,6 +83122,14 @@
/obj/effect/turf_decal/tile/white,
/turf/open/floor/plasteel/dark,
/area/teleporter/hub/bridge)
+"ids" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/holopad,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"idt" = (
/obj/structure/rack,
/obj/effect/spawner/lootdrop/costume,
@@ -83406,6 +83315,24 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/theatre)
+"ixV" = (
+/obj/machinery/computer/operating,
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_y = 26
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"iBM" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
@@ -83486,6 +83413,15 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/teleporter/hub/science)
+"iHR" = (
+/obj/effect/spawner/structure/window/reinforced/shutter,
+/obj/structure/cable,
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/turf/open/space/basic,
+/area/security/physician)
"iKX" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 6
@@ -83558,6 +83494,9 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/starboard)
+"iUq" = (
+/turf/closed/wall/r_wall,
+/area/security/physician)
"iUv" = (
/obj/structure/reagent_dispensers/watertank,
/turf/open/floor/plating,
@@ -83786,6 +83725,22 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms/b)
+"jqP" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/extinguisher_cabinet{
+ dir = 4;
+ pixel_x = -24
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"juS" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 8
@@ -84016,6 +83971,14 @@
},
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
+"jZr" = (
+/obj/structure/window/reinforced,
+/obj/structure/rack,
+/obj/item/electropack,
+/obj/item/assembly/signaler,
+/obj/item/clothing/head/helmet,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"kaQ" = (
/obj/structure/chair{
dir = 8
@@ -84135,6 +84098,33 @@
/obj/effect/spawner/lootdrop/costume,
/turf/open/floor/plating,
/area/maintenance/department/science)
+"kij" = (
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"klx" = (
/obj/structure/chair/office/dark{
dir = 4
@@ -84257,6 +84247,15 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"kvK" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"kxf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
@@ -84371,6 +84370,25 @@
/obj/structure/disposalpipe/segment,
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"kHR" = (
+/obj/structure/cable,
+/obj/machinery/power/apc{
+ areastring = "/area/security/brig/infirmary";
+ dir = 2;
+ name = "Infirmary APC";
+ pixel_y = -23
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/closet/crate/freezer/blood,
+/obj/machinery/iv_drip,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"kIl" = (
/obj/structure/cable{
icon_state = "4-8";
@@ -84410,6 +84428,17 @@
},
/turf/open/floor/plasteel/dark,
/area/teleporter/hub/bridge)
+"kJI" = (
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 30
+ },
+/obj/structure/bodycontainer/morgue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"kKD" = (
/obj/machinery/power/terminal,
/obj/structure/cable{
@@ -84595,6 +84624,14 @@
"ljL" = (
/turf/closed/wall/r_wall,
/area/solar/port/fore)
+"llN" = (
+/obj/machinery/light{
+ dir = 1;
+ light_color = "#c1caff"
+ },
+/obj/structure/closet/secure_closet/injection,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"loI" = (
/obj/machinery/light{
dir = 1
@@ -84926,6 +84963,14 @@
},
/turf/open/floor/plating,
/area/solar/starboard/aft)
+"lUg" = (
+/obj/structure/bodycontainer/crematorium{
+ dir = 8;
+ icon_state = "crema1";
+ id = "crematoriumChapel"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/physician)
"lUJ" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/item/radio/intercom{
@@ -85047,6 +85092,9 @@
/obj/structure/closet/toolcloset,
/turf/open/floor/plating,
/area/maintenance/port/fore)
+"mfz" = (
+/turf/closed/wall/r_wall,
+/area/security/brig/infirmary)
"mgj" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 6
@@ -85290,12 +85338,30 @@
/obj/structure/lattice/catwalk,
/turf/open/space/basic,
/area/solar/port/fore)
+"mDB" = (
+/obj/effect/landmark/start/yogs/brigphsyician,
+/obj/structure/chair/office/dark,
+/obj/item/radio/intercom{
+ freerange = 1;
+ name = "Common Channel";
+ pixel_x = 30
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"mEe" = (
/obj/structure/light_construct/small{
dir = 1
},
/turf/open/floor/wood,
/area/maintenance/department/chapel)
+"mHg" = (
+/obj/machinery/camera{
+ c_tag = "Prison Storage";
+ dir = 2;
+ network = list("ss13","prison")
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"mHD" = (
/obj/machinery/firealarm{
dir = 8;
@@ -85475,6 +85541,12 @@
},
/turf/open/floor/plasteel/dark,
/area/ai_monitored/nuke_storage)
+"mWy" = (
+/obj/machinery/computer/security{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"mXS" = (
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
dir = 1
@@ -85787,6 +85859,12 @@
},
/turf/open/floor/plating,
/area/maintenance/department/science)
+"nCS" = (
+/obj/machinery/button/crematorium{
+ pixel_x = -22
+ },
+/turf/closed/wall,
+/area/maintenance/department/security)
"nDP" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -85885,6 +85963,23 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"nQs" = (
+/obj/machinery/light,
+/obj/structure/cable,
+/obj/machinery/button/crematorium{
+ pixel_x = -22
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 1
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/physician";
+ dir = 2;
+ name = "Brig Physician's Office APC";
+ pixel_y = -23
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/physician)
"nSi" = (
/obj/machinery/camera{
c_tag = "Prison Holodeck";
@@ -86461,6 +86556,24 @@
/obj/effect/mapping_helpers/teleport_anchor,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"pmh" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 2
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"pnk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
/obj/machinery/firealarm{
@@ -86835,6 +86948,18 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/fore)
+"quI" = (
+/obj/structure/window/reinforced,
+/obj/machinery/camera{
+ c_tag = "Prison Medical";
+ dir = 8;
+ network = list("ss13","prison")
+ },
+/obj/structure/bodycontainer/morgue{
+ dir = 8
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"qvi" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
@@ -86903,6 +87028,28 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/hallway/primary/port)
+"qDM" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/machinery/camera{
+ c_tag = "Prison Infirmary";
+ dir = 8;
+ network = list("ss13","prison")
+ },
+/obj/machinery/airalarm{
+ dir = 8;
+ pixel_x = 24
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"qEa" = (
/obj/structure/cable{
icon_state = "1-2"
@@ -87091,6 +87238,17 @@
/obj/machinery/bounty_board,
/turf/closed/wall,
/area/security/main)
+"rbX" = (
+/mob/living/simple_animal/bot/medbot,
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"rdp" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/item/radio/intercom{
@@ -88178,6 +88336,14 @@
/obj/structure/table,
/turf/open/floor/plating,
/area/vacant_room)
+"tsf" = (
+/obj/effect/spawner/structure/window/reinforced/shutter,
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/turf/open/space/basic,
+/area/security/physician)
"tsE" = (
/obj/machinery/button/door{
id = "commissarydoor";
@@ -88228,6 +88394,32 @@
},
/turf/open/floor/plating/airless,
/area/construction)
+"tvc" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/structure/cable{
+ icon_state = "1-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Brig Physician's Office";
+ req_access_txt = "74"
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"twa" = (
/obj/structure/table,
/obj/machinery/firealarm{
@@ -88287,6 +88479,10 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"tAg" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"tAq" = (
/obj/structure/grille/ratvar/broken,
/turf/open/floor/plating,
@@ -89039,6 +89235,14 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/morgue)
+"vhr" = (
+/obj/effect/spawner/structure/window/reinforced/shutter,
+/obj/structure/cable{
+ icon_state = "0-2";
+ pixel_y = 1
+ },
+/turf/open/space/basic,
+/area/security/brig/infirmary)
"vhW" = (
/obj/structure/mineral_door/wood,
/turf/open/floor/plating,
@@ -89256,6 +89460,25 @@
/obj/item/paper/fluff/holodeck/disclaimer,
/turf/open/floor/plasteel,
/area/crew_quarters/fitness/recreation)
+"vEn" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"vFg" = (
/obj/machinery/camera{
c_tag = "Port Hall East 7";
@@ -89321,6 +89544,20 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos_distro)
+"vKG" = (
+/obj/structure/table/optable,
+/obj/machinery/vending/wallmed{
+ pixel_y = 28
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/item/storage/backpack/duffelbag/sec/surgery,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"vLm" = (
/obj/structure/closet,
/obj/effect/spawner/lootdrop/maintenance/two,
@@ -89482,6 +89719,28 @@
},
/turf/open/floor/plasteel/dark,
/area/security/main)
+"waP" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-8";
+ tag = ""
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"wbn" = (
/obj/structure/disposalpipe/segment,
/obj/structure/cable{
@@ -89495,6 +89754,18 @@
/obj/effect/spawner/lootdrop/maintenance/two,
/turf/open/floor/plating,
/area/maintenance/department/chapel)
+"wbB" = (
+/obj/machinery/power/apc{
+ areastring = "/area/security/prison";
+ dir = 4;
+ name = "Prison Wing APC";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"wcp" = (
/obj/effect/turf_decal/bot,
/obj/machinery/shieldwallgen,
@@ -89683,6 +89954,10 @@
"wud" = (
/turf/closed/wall,
/area/science/test_area)
+"wuC" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2,
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"wvB" = (
/obj/structure/cable{
icon_state = "4-8";
@@ -89813,6 +90088,17 @@
},
/turf/open/floor/plasteel,
/area/security/prison)
+"wJz" = (
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/structure/rack,
+/obj/item/clothing/suit/straight_jacket,
+/obj/item/clothing/glasses/blindfold,
+/obj/item/clothing/mask/muzzle,
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
"wJC" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -90263,6 +90549,19 @@
},
/turf/open/floor/plasteel,
/area/clerk)
+"xQX" = (
+/obj/structure/closet/secure_closet/physician,
+/obj/machinery/camera{
+ c_tag = "Brig Physician's Office";
+ dir = 2;
+ network = list("ss13","prison")
+ },
+/obj/machinery/airalarm{
+ dir = 2;
+ pixel_y = 24
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"xUN" = (
/obj/structure/rack,
/obj/machinery/light/small,
@@ -90341,6 +90640,18 @@
/obj/item/reagent_containers/glass/bucket,
/turf/open/floor/plasteel,
/area/hydroponics)
+"ycN" = (
+/obj/machinery/door/firedoor/border_only,
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "2;5"
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"ycU" = (
/obj/effect/turf_decal/tile/yellow{
dir = 8
@@ -107476,7 +107787,7 @@ agV
cUD
agV
agV
-agU
+nCS
avH
ayf
aIk
@@ -119021,7 +119332,7 @@ aML
akq
ala
anI
-amu
+hvn
ann
geo
apc
@@ -126463,12 +126774,12 @@ aej
aeO
adm
afH
-agA
+vEn
agA
agA
ahY
aiw
-aiY
+dRM
ajo
apP
akD
@@ -126717,15 +127028,15 @@ abe
acF
adI
adQ
-aeP
-acF
-afJ
+dQC
ajS
+afJ
+eKM
cFF
cQG
ahZ
aix
-aiZ
+hVX
ajh
ajU
cQw
@@ -126974,12 +127285,12 @@ adE
ado
adK
kIl
-abe
-abe
-abe
-abe
-abe
-abe
+mfz
+mfz
+vhr
+kij
+mfz
+mfz
aia
abe
ahw
@@ -127231,12 +127542,12 @@ abe
adp
adI
adQ
-aeM
-afb
-afc
-agB
-agB
-aeM
+ycN
+jqP
+kvK
+waP
+kHR
+mfz
fDf
aiJ
ahw
@@ -127488,12 +127799,12 @@ abe
adq
adL
adQ
-aeQ
-afc
-afK
-cQE
-aCs
-aeM
+mfz
+ixV
+tAg
+rbX
+dqn
+mfz
fDf
aib
ahw
@@ -127739,18 +128050,18 @@ abq
abB
abP
abe
-acr
-acE
-acV
+llN
+wJz
+jZr
acF
adI
ihF
-aeM
-aeM
-aeM
-aeM
-aeM
-aeM
+mfz
+vKG
+ids
+pmh
+qDM
+mfz
fDf
aib
ahw
@@ -127996,18 +128307,18 @@ uxZ
aeB
cFA
abe
-acp
-acF
-acW
+mHg
+gic
+eDb
adr
adM
ael
-aeM
-afd
-afe
-afe
-ahj
-aeM
+iUq
+tsf
+iHR
+tvc
+iUq
+iUq
fDf
aib
ahw
@@ -128253,18 +128564,18 @@ abq
abC
abR
abe
-acq
-acF
-aqS
+kJI
+wbB
+quI
acF
adI
adQ
-aeS
-afe
-afe
-afe
-cQF
-aeM
+iUq
+xQX
+wuC
+gfH
+nQs
+iUq
fDf
aib
ahw
@@ -128516,12 +128827,12 @@ abe
ads
adN
jnZ
-aeM
-afg
-afe
-afe
-ahl
-aeM
+iUq
+hGM
+mDB
+mWy
+lUg
+iUq
hKE
pFn
ahw
@@ -128773,13 +129084,13 @@ abe
acF
adI
lhb
-aeM
-aeM
-aeM
-aeM
-aeM
-aeM
-aeM
+iUq
+iUq
+iUq
+iUq
+iUq
+iUq
+abe
aiy
ahw
aft
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 347c46b8f818..3b766a1966a3 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -1958,10 +1958,10 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/mob/living/simple_animal/bot/secbot/pingsky,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
+/mob/living/simple_animal/bot/secbot/pingsky,
/turf/open/floor/engine,
/area/ai_monitored/turret_protected/aisat_interior)
"adn" = (
@@ -3615,12 +3615,13 @@
/turf/open/floor/plasteel/dark,
/area/security/prison)
"agd" = (
-/obj/structure/bodycontainer/morgue,
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
dir = 4
},
-/obj/effect/turf_decal/delivery,
+/obj/machinery/computer/operating{
+ dir = 4
+ },
/turf/open/floor/plasteel/dark,
/area/security/warden)
"age" = (
@@ -6136,18 +6137,17 @@
},
/area/maintenance/port/fore)
"akT" = (
-/obj/structure/bed,
-/obj/machinery/iv_drip,
-/obj/item/bedsheet/medical,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/decal/cleanable/blood/old,
/obj/machinery/light/small{
dir = 4
},
/obj/effect/turf_decal/tile/red,
+/obj/structure/chair/office{
+ dir = 1
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"akV" = (
@@ -7957,9 +7957,6 @@
/turf/open/floor/plasteel/dark,
/area/security/warden)
"anM" = (
-/obj/structure/table/glass,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/healthanalyzer,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -7969,15 +7966,7 @@
pixel_x = 26
},
/obj/effect/turf_decal/tile/red,
-/obj/item/storage/box/bodybags,
-/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/structure/closet/secure_closet/physician,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"anN" = (
@@ -18191,13 +18180,6 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/genetics/cloning)
-"aFu" = (
-/obj/machinery/door/airlock/medical/glass{
- name = "Infirmary";
- req_one_access_txt = "1;34"
- },
-/turf/open/floor/plasteel/dark,
-/area/security/main)
"aFv" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control";
@@ -45307,6 +45289,12 @@
/obj/effect/landmark/start/bartender,
/turf/open/floor/plasteel/dark,
/area/crew_quarters/bar)
+"bvl" = (
+/obj/machinery/modular_computer/console/preset/curator{
+ dir = 4
+ },
+/turf/open/floor/plasteel/dark,
+/area/library)
"bvm" = (
/obj/effect/turf_decal/tile/neutral,
/obj/effect/turf_decal/tile/neutral{
@@ -76649,10 +76637,6 @@
/turf/closed/wall/rust,
/area/maintenance/port/fore)
"cxu" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -76671,6 +76655,8 @@
pixel_x = 24
},
/obj/effect/turf_decal/tile/red,
+/obj/machinery/iv_drip,
+/obj/structure/closet/crate/freezer/blood,
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"cxv" = (
@@ -87198,10 +87184,10 @@
/obj/effect/turf_decal/tile/green{
dir = 8
},
-/mob/living/simple_animal/spiffles,
/obj/structure/window/reinforced/tinted{
dir = 1
},
+/mob/living/simple_animal/spiffles,
/turf/open/floor/plasteel,
/area/clerk)
"emk" = (
@@ -90909,6 +90895,14 @@
},
/turf/open/floor/plating,
/area/hallway/primary/fore)
+"iFa" = (
+/obj/machinery/door/airlock/medical/glass{
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/main)
"iGD" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 4
@@ -91376,7 +91370,9 @@
/area/maintenance/port/aft)
"iZe" = (
/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
+/obj/machinery/computer/med_data/laptop{
+ pixel_x = -3
+ },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -91394,6 +91390,14 @@
/obj/machinery/vending/wallmed{
pixel_x = 24
},
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 10;
+ pixel_y = 10
+ },
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ pixel_x = 10;
+ pixel_y = 5
+ },
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
"iZu" = (
@@ -91768,6 +91772,9 @@
/obj/item/radio/intercom{
pixel_x = -28
},
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/table/optable,
+/obj/item/storage/backpack/duffelbag/sec/surgery,
/turf/open/floor/plasteel/dark,
/area/security/warden)
"jwf" = (
@@ -93077,10 +93084,10 @@
/turf/open/floor/plasteel/showroomfloor,
/area/security/prison)
"kQv" = (
-/mob/living/simple_animal/hostile/asteroid/hivelord,
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 8
},
+/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/open/floor/plating,
/area/quartermaster/warehouse)
"kQQ" = (
@@ -93251,6 +93258,10 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"kTR" = (
+/obj/effect/decal/cleanable/blood/old,
+/turf/open/floor/plating/asteroid,
+/area/space/nearstation)
"kUb" = (
/obj/machinery/door/airlock/maintenance{
name = "kitchen maintenance";
@@ -96535,18 +96546,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,
/turf/open/space,
/area/space/nearstation)
-"phd" = (
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
-/obj/machinery/door/airlock/medical/glass{
- name = "Infirmary"
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 1
- },
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/security/warden)
"pii" = (
/obj/effect/turf_decal/sand/plating,
/turf/open/floor/plating,
@@ -97659,6 +97658,20 @@
},
/turf/open/floor/plasteel/dark,
/area/medical/genetics)
+"qrw" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/door/airlock/medical/glass{
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 1
+ },
+/obj/machinery/door/firedoor/border_only,
+/turf/open/floor/plasteel/dark,
+/area/security/warden)
"qsW" = (
/obj/effect/turf_decal/stripes/line{
dir = 6
@@ -100704,12 +100717,6 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/central)
-"tYo" = (
-/obj/machinery/modular_computer/console/preset/curator{
- dir = 4
- },
-/turf/open/floor/plasteel/dark,
-/area/library)
"tYt" = (
/obj/effect/turf_decal/stripes/corner{
dir = 1
@@ -104037,6 +104044,11 @@
},
/turf/open/floor/plasteel/dark,
/area/engine/atmos)
+"xOK" = (
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/effect/landmark/start/yogs/brigphsyician,
+/turf/open/floor/plasteel/showroomfloor,
+/area/security/warden)
"xOW" = (
/obj/effect/turf_decal/tile/brown,
/obj/effect/turf_decal/tile/brown{
@@ -104367,10 +104379,6 @@
icon_state = "platingdmg3"
},
/area/maintenance/disposal/incinerator)
-"ymm" = (
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating/asteroid,
-/area/space/nearstation)
(1,1,1) = {"
aaa
@@ -117605,7 +117613,7 @@ rJG
rJG
cwq
aLZ
-ymm
+kTR
xjU
aLZ
aLZ
@@ -123549,12 +123557,12 @@ aef
aef
bXp
adz
-phd
+qrw
cdp
-cnB
+xOK
cnB
crz
-aFu
+iFa
aLi
bxS
bPI
@@ -128921,7 +128929,7 @@ buC
rRJ
bgY
bjk
-tYo
+bvl
bvb
rve
mfB
diff --git a/_maps/map_files/Omegastation/omegastation.dmm b/_maps/map_files/Omegastation/omegastation.dmm
index 8648f38cf44e..5d06a7970cf0 100644
--- a/_maps/map_files/Omegastation/omegastation.dmm
+++ b/_maps/map_files/Omegastation/omegastation.dmm
@@ -7880,6 +7880,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/effect/landmark/start/yogs/brigphsyician,
/turf/open/floor/plasteel,
/area/security/brig)
"akX" = (
@@ -11661,20 +11662,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
-"asL" = (
-/obj/machinery/firealarm{
- dir = 1;
- pixel_y = -26
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 1
- },
-/obj/effect/turf_decal/tile/neutral{
- dir = 4
- },
-/obj/structure/rack,
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
"asM" = (
/obj/structure/cable/white,
/obj/effect/spawner/structure/window/reinforced,
@@ -14499,9 +14486,6 @@
/turf/open/floor/plasteel/white/corner,
/area/engine/atmos)
"aCB" = (
-/obj/item/twohanded/required/kirbyplants{
- icon_state = "plant-22"
- },
/obj/effect/turf_decal/tile/red{
dir = 4
},
@@ -14509,6 +14493,12 @@
dir = 4;
icon_state = "vent_map_on-1"
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aCC" = (
@@ -14750,6 +14740,9 @@
pixel_x = 6;
pixel_y = 24
},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aDr" = (
@@ -15280,6 +15273,10 @@
dir = 8;
pixel_x = 24
},
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1;
+ icon_state = "vent_map_on-1"
+ },
/turf/open/floor/plasteel,
/area/security/prison)
"aFk" = (
@@ -26904,6 +26901,29 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
+"faw" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Prison Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"faQ" = (
/obj/structure/extinguisher_cabinet{
pixel_x = 24
@@ -29187,9 +29207,7 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/security/prison)
"hsE" = (
@@ -31664,6 +31682,18 @@
},
/turf/open/floor/plasteel/dark,
/area/security/brig)
+"jPP" = (
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"jQD" = (
/obj/machinery/conveyor{
dir = 9;
@@ -33642,12 +33672,10 @@
/obj/structure/cable/white{
icon_state = "1-8"
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 9
- },
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
dir = 4
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/plasteel,
/area/security/prison)
"lXc" = (
@@ -35906,6 +35934,23 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/port)
+"owM" = (
+/obj/structure/closet/secure_closet/physician,
+/obj/machinery/camera{
+ c_tag = "Prison Infirmary";
+ dir = 1;
+ network = list("ss13","prison")
+ },
+/obj/item/radio/intercom{
+ name = "Station Intercom";
+ pixel_x = 0;
+ pixel_y = -28
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"oxa" = (
/obj/structure/cable/white{
icon_state = "1-8"
@@ -36422,6 +36467,19 @@
/obj/item/reagent_containers/food/drinks/bottle/lizardwine,
/turf/open/floor/plasteel,
/area/crew_quarters/bar/atrium)
+"oRv" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4;
+ icon_state = "vent_map_on-1"
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"oSY" = (
/obj/structure/disposalpipe/trunk{
dir = 1
@@ -37135,6 +37193,7 @@
/obj/structure/extinguisher_cabinet{
pixel_y = -30
},
+/obj/effect/landmark/start/yogs/brigphsyician,
/turf/open/floor/plasteel,
/area/security/prison)
"pGz" = (
@@ -37979,6 +38038,21 @@
},
/turf/open/floor/plasteel/dark,
/area/maintenance/starboard/aft)
+"qBN" = (
+/obj/machinery/firealarm{
+ dir = 1;
+ pixel_y = -26
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/neutral{
+ dir = 4
+ },
+/obj/structure/rack,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
"qCI" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{
dir = 4
@@ -38841,6 +38915,25 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/heads/chief)
+"rrL" = (
+/obj/machinery/computer/security/telescreen{
+ desc = "Used for watching Prison Wing holding areas.";
+ name = "Prison Monitor";
+ network = list("prison");
+ pixel_y = 30
+ },
+/obj/machinery/vending/wallmed{
+ pixel_x = -26
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
+ dir = 4;
+ icon_state = "scrub_map_on-3"
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"rrP" = (
/obj/effect/turf_decal/stripes/line{
dir = 9
@@ -43773,6 +43866,13 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit)
+"uLe" = (
+/obj/structure/table/optable,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"uLo" = (
/obj/machinery/door/airlock/public/glass{
name = "Atrium"
@@ -45966,6 +46066,18 @@
},
/turf/open/floor/plasteel,
/area/crew_quarters/dorms)
+"xpT" = (
+/obj/machinery/computer/operating{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel,
+/area/security/prison)
"xqK" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -79971,9 +80083,9 @@ aad
aad
aad
aad
-aad
-aad
-afL
+abO
+abO
+abO
agF
agF
agF
@@ -80228,9 +80340,9 @@ aad
aad
aad
aad
-aad
-abT
-agE
+abO
+rrL
+owM
swZ
aim
aiR
@@ -80485,9 +80597,9 @@ aad
aad
aad
aad
-aad
-afL
-abj
+abO
+jPP
+uLe
swZ
ain
qpM
@@ -80742,9 +80854,9 @@ abO
abO
aad
aad
-aad
-afM
-aaV
+abO
+oRv
+xpT
agF
aio
pzB
@@ -80757,7 +80869,7 @@ oAQ
anR
arF
aeW
-asL
+qBN
agF
atb
avO
@@ -81000,7 +81112,7 @@ abO
azo
abO
abO
-abO
+faw
agF
agF
aip
diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm
index 43adc1fa231f..5535c33cd57d 100644
--- a/_maps/map_files/YogStation/YogStation.dmm
+++ b/_maps/map_files/YogStation/YogStation.dmm
@@ -2031,7 +2031,6 @@
/area/security/prison)
"afz" = (
/obj/structure/table,
-/obj/item/restraints/handcuffs,
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -2039,6 +2038,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/clothing/suit/straight_jacket,
/turf/open/floor/plasteel,
/area/security/prison)
"afA" = (
@@ -2072,6 +2072,7 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/item/restraints/handcuffs,
/turf/open/floor/plasteel,
/area/security/prison)
"afE" = (
@@ -2487,11 +2488,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"agB" = (
-/obj/structure/table,
-/obj/item/assembly/flash/handheld,
-/turf/open/floor/plasteel,
-/area/security/main)
"agD" = (
/obj/machinery/door/poddoor/preopen{
id = "Prison Gate";
@@ -2573,34 +2569,23 @@
},
/turf/open/floor/plasteel/showroomfloor,
/area/security/warden)
-"agM" = (
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/reagent_containers/spray/cleaner,
-/obj/structure/table/glass,
+"agN" = (
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
-"agN" = (
-/obj/item/storage/firstaid/regular{
- pixel_x = 3;
- pixel_y = 3
- },
-/obj/item/storage/firstaid/regular,
-/obj/structure/table/glass,
-/obj/effect/turf_decal/tile/red{
- dir = 1
+/obj/machinery/computer/operating,
+/obj/machinery/flasher{
+ id = "briginfirmary";
+ pixel_x = 8;
+ pixel_y = 28
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
+/obj/machinery/button/flasher{
+ id = "briginfirmary";
+ pixel_x = -8;
+ pixel_y = 28
},
/turf/open/floor/plasteel/white,
/area/security/brig)
@@ -2747,20 +2732,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"ahh" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 4
- },
-/turf/open/floor/plasteel,
-/area/security/main)
"ahi" = (
/obj/effect/turf_decal/tile/yellow{
dir = 4
@@ -2775,8 +2746,6 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/machinery/iv_drip,
-/obj/item/reagent_containers/blood,
/obj/effect/turf_decal/tile/red{
dir = 1
},
@@ -2784,6 +2753,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/closet/secure_closet/physician,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/mask/surgical,
/turf/open/floor/plasteel/white,
/area/security/brig)
"ahn" = (
@@ -2832,39 +2804,36 @@
pixel_y = 24
},
/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop,
+/obj/machinery/computer/med_data/laptop{
+ pixel_x = -3
+ },
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
-/turf/open/floor/plasteel/white,
-/area/security/brig)
-"aht" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
+/obj/item/reagent_containers/glass/bottle/charcoal{
+ pixel_x = 11;
+ pixel_y = 5
},
-/turf/open/floor/plasteel/white,
-/area/security/brig)
-"ahu" = (
-/obj/item/storage/box/bodybags,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
+/obj/item/reagent_containers/glass/bottle/epinephrine{
+ pixel_x = 11;
+ pixel_y = 10
},
/obj/item/reagent_containers/syringe{
- name = "steel point"
+ pixel_x = 11;
+ pixel_y = 3
},
-/obj/item/reagent_containers/glass/bottle/charcoal,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
+/turf/open/floor/plasteel/white,
+/area/security/brig)
+"ahu" = (
/obj/machinery/light{
dir = 8
},
-/obj/structure/table/glass,
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
@@ -2961,17 +2930,6 @@
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/security/main)
-"ahD" = (
-/obj/machinery/door/window/westleft{
- dir = 4;
- name = "Brig Infirmary"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
"ahE" = (
/obj/machinery/door/airlock/security/glass{
name = "Brig Control";
@@ -3196,12 +3154,20 @@
/turf/open/floor/plasteel,
/area/security/main)
"ahW" = (
-/obj/structure/bodycontainer/morgue,
-/obj/machinery/camera{
- c_tag = "Brig Infirmary";
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/sleeper{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/obj/structure/extinguisher_cabinet{
+ pixel_x = -27
+ },
+/turf/open/floor/plasteel/white,
/area/security/brig)
"ahX" = (
/obj/machinery/computer/crew{
@@ -3336,15 +3302,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"ain" = (
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
"aip" = (
/obj/machinery/light,
/obj/effect/turf_decal/tile/red,
@@ -3411,38 +3368,12 @@
"aiv" = (
/turf/open/floor/plasteel,
/area/engine/foyer)
-"aiw" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- dir = 4;
- icon_state = "right";
- name = "Brig Infirmary"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
"aiy" = (
/obj/effect/turf_decal/tile/red{
dir = 4
},
/turf/open/floor/plasteel,
/area/security/brig)
-"aiz" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
-/obj/machinery/airalarm{
- dir = 4;
- pixel_x = -24
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
"aiB" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -3454,6 +3385,10 @@
/area/security/prison)
"aiD" = (
/obj/structure/bodycontainer/morgue,
+/obj/structure/window/reinforced{
+ dir = 1;
+ layer = 2.9
+ },
/turf/open/floor/plasteel/dark,
/area/security/brig)
"aiE" = (
@@ -3465,15 +3400,6 @@
},
/turf/open/floor/plasteel/dark,
/area/security/prison)
-"aiF" = (
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
"aiG" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -3572,8 +3498,6 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/bed,
-/obj/item/clothing/suit/straight_jacket,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 4
@@ -3581,6 +3505,9 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/structure/closet/crate/freezer/blood,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white,
/area/security/brig)
"aiQ" = (
@@ -3961,18 +3888,6 @@
},
/turf/open/floor/plasteel,
/area/security/brig)
-"ajI" = (
-/obj/structure/cable{
- icon_state = "1-8"
- },
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
- dir = 1
- },
-/turf/open/floor/plasteel,
-/area/security/brig)
"ajJ" = (
/obj/machinery/holopad,
/obj/structure/cable{
@@ -35622,6 +35537,16 @@
"ewG" = (
/turf/closed/wall,
/area/maintenance/solars/starboard/fore)
+"ewO" = (
+/obj/effect/landmark/start/yogs/brigphsyician,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 5
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"ewU" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -38142,6 +38067,25 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"gmi" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"gmQ" = (
/obj/effect/turf_decal/stripes/line{
dir = 10
@@ -38655,6 +38599,23 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating/airless,
/area/space/nearstation)
+"gCK" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/table/optable,
+/obj/item/storage/backpack/duffelbag/sec/surgery,
+/obj/machinery/vending/wallmed{
+ pixel_y = 29
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"gDj" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -39768,10 +39729,6 @@
/obj/structure/rack,
/obj/item/clothing/shoes/winterboots,
/obj/item/clothing/suit/hooded/wintercoat,
-/obj/structure/extinguisher_cabinet{
- pixel_x = 5;
- pixel_y = -32
- },
/turf/open/floor/plasteel/dark,
/area/maintenance/department/tcoms)
"hwl" = (
@@ -41141,6 +41098,13 @@
},
/turf/open/floor/plating,
/area/maintenance/fore/secondary)
+"imy" = (
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"imA" = (
/obj/structure/closet/toolcloset,
/obj/item/toy/figure/assistant,
@@ -44744,6 +44708,24 @@
"kCr" = (
/turf/open/floor/carpet,
/area/crew_quarters/cryopods)
+"kCI" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/table,
+/obj/item/paper_bin{
+ pixel_x = -3;
+ pixel_y = 7
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/item/reagent_containers/spray/cleaner{
+ pixel_x = 5;
+ pixel_y = 2
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"kCS" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -55746,6 +55728,15 @@
},
/turf/open/floor/plasteel,
/area/engine/engineering)
+"rVu" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/bed,
+/obj/item/bedsheet/medical,
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"rVx" = (
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -55899,6 +55890,27 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"sag" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 10
+ },
+/turf/open/floor/plasteel,
+/area/security/brig)
"saK" = (
/obj/machinery/disposal/bin,
/obj/structure/disposalpipe/trunk{
@@ -58642,6 +58654,21 @@
/obj/effect/spawner/lootdrop/techstorage/service,
/turf/open/floor/plasteel/white,
/area/storage/tech)
+"tVV" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/airalarm{
+ dir = 4;
+ pixel_x = -24
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/security/brig)
"tVY" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -58905,6 +58932,18 @@
/obj/machinery/door/airlock/maintenance_hatch,
/turf/open/floor/plating,
/area/maintenance/fore)
+"ufI" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ pixel_x = -1;
+ pixel_y = 1
+ },
+/obj/item/assembly/flash/handheld{
+ pixel_x = 4;
+ pixel_y = 5
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"ugv" = (
/obj/item/radio/intercom{
pixel_x = 30
@@ -59795,6 +59834,13 @@
/obj/structure/transit_tube/curved,
/turf/open/floor/plasteel/dark,
/area/engine/engineering)
+"uKO" = (
+/obj/structure/extinguisher_cabinet{
+ pixel_x = 5;
+ pixel_y = -32
+ },
+/turf/open/floor/plasteel/dark,
+/area/maintenance/department/tcoms)
"uLA" = (
/obj/effect/turf_decal/tile/blue{
dir = 4
@@ -61775,6 +61821,15 @@
/obj/effect/spawner/structure/window,
/turf/open/floor/plating,
/area/science/robotics/lab)
+"wcw" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"wdb" = (
/obj/structure/cable{
icon_state = "2-8"
@@ -62575,6 +62630,14 @@
/obj/effect/turf_decal/delivery,
/turf/open/floor/engine,
/area/science/xenobiology)
+"wEd" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/supply/hidden/layer2,
+/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden/layer4,
+/turf/open/floor/plasteel,
+/area/security/brig)
"wEf" = (
/obj/machinery/door/firedoor/border_only{
dir = 4
@@ -63224,6 +63287,19 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plating,
/area/engine/engineering)
+"xit" = (
+/obj/machinery/door/window/westleft{
+ dir = 4;
+ name = "Brig Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"xjm" = (
/obj/effect/turf_decal/trimline/blue/filled/line{
dir = 1
@@ -63349,6 +63425,27 @@
},
/turf/open/floor/plasteel,
/area/hallway/primary/aft)
+"xng" = (
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ dir = 4;
+ icon_state = "right";
+ name = "Brig Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"xnF" = (
/obj/structure/grille,
/turf/open/floor/plating/airless,
@@ -93213,11 +93310,11 @@ aen
afy
afH
agj
-agM
+gCK
ahu
ahW
aiD
-agj
+aaC
ajg
akl
akO
@@ -93471,8 +93568,8 @@ afy
afH
agj
agN
-aht
-ain
+ahP
+wcw
aid
agj
auA
@@ -93728,10 +93825,10 @@ afr
afH
agj
ahs
-ahP
-ahP
-aiF
-aaC
+imy
+ewO
+rVu
+agj
ajA
ajG
akQ
@@ -93985,8 +94082,8 @@ aiB
acd
agj
ahm
-ahD
-aiw
+xit
+xng
aiO
agj
ajA
@@ -94243,10 +94340,10 @@ agk
agF
agP
agP
-agP
-agP
-aiz
-ajI
+sag
+gmi
+tVV
+wEd
akl
akR
amu
@@ -95324,7 +95421,7 @@ lhU
yeb
pOT
ogk
-eyT
+uKO
bVJ
pCZ
qHe
@@ -98866,7 +98963,7 @@ ajK
akY
afg
afV
-agB
+ufI
ahd
ahI
clS
@@ -99895,7 +99992,7 @@ akY
afg
afZ
agE
-ahh
+kCI
aic
uQE
adR
diff --git a/_maps/map_files/YogsDelta/YogsDelta.dmm b/_maps/map_files/YogsDelta/YogsDelta.dmm
index a64517ecb6b2..3f2354ed0d23 100644
--- a/_maps/map_files/YogsDelta/YogsDelta.dmm
+++ b/_maps/map_files/YogsDelta/YogsDelta.dmm
@@ -18562,6 +18562,7 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/effect/landmark/start/yogs/brigphsyician,
/turf/open/floor/plasteel/white,
/area/security/prison)
"aFF" = (
@@ -23695,17 +23696,9 @@
/turf/open/floor/plasteel,
/area/quartermaster/storage)
"aNx" = (
-/obj/structure/sink{
- pixel_y = 22
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
+/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"aNy" = (
/obj/machinery/button/door{
id = "hosroom";
@@ -24074,26 +24067,16 @@
/area/hallway/primary/central)
"aOc" = (
/obj/structure/bed,
-/obj/machinery/iv_drip,
/obj/item/bedsheet/medical,
-/obj/machinery/vending/wallmed{
- name = "Emergency NanoMed";
- pixel_y = 26;
- use_power = 0
- },
-/obj/machinery/camera{
- c_tag = "Security - Medbay";
- dir = 2
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
+/obj/structure/cable/white{
+ icon_state = "1-2"
+ },
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"aOd" = (
/obj/item/radio/intercom{
pixel_y = 26
@@ -31299,11 +31282,10 @@
icon_state = "4-8"
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
- dir = 4;
- icon_state = "vent_map_on-1"
+ dir = 4
},
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"aYT" = (
/obj/machinery/light{
dir = 4
@@ -31323,36 +31305,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 5
},
-/turf/open/floor/plasteel/white,
-/area/security/brig)
-"aYV" = (
-/obj/structure/cable/white{
- icon_state = "4-8"
- },
/obj/structure/cable/white{
- icon_state = "1-8"
- },
-/obj/machinery/door/airlock/medical/glass{
- name = "Infirmary"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
+ icon_state = "1-4"
},
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"aYW" = (
/obj/machinery/holopad,
/obj/effect/decal/cleanable/dirt,
@@ -37818,26 +37775,17 @@
/turf/open/floor/plating,
/area/security/brig)
"biz" = (
-/obj/structure/table/glass,
-/obj/machinery/computer/med_data/laptop{
- dir = 4;
- pixel_x = 3;
- pixel_y = 2
- },
-/obj/structure/sign/poster/official/cleanliness{
- pixel_y = 32
- },
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/sleeper{
+ dir = 4
+ },
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"biA" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -39098,28 +39046,22 @@
/turf/open/floor/plating,
/area/quartermaster/miningoffice)
"bkk" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
/obj/structure/table/glass,
/obj/structure/cable/white{
icon_state = "4-8"
},
-/obj/item/clothing/gloves/color/latex,
-/obj/item/healthanalyzer,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -3;
pixel_y = 2
},
-/obj/item/reagent_containers/spray/cleaner{
- pixel_x = 5;
- pixel_y = -1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"bkl" = (
/obj/machinery/atmospherics/pipe/manifold/green/visible,
/obj/machinery/meter,
@@ -40238,31 +40180,34 @@
/turf/open/floor/plating,
/area/security/brig)
"bmd" = (
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/charcoal,
-/obj/item/reagent_containers/syringe,
/obj/effect/turf_decal/tile/red{
dir = 1
},
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/effect/turf_decal/tile/red,
+/obj/structure/table/glass,
+/obj/machinery/computer/med_data/laptop{
+ dir = 4;
+ pixel_x = 3;
+ pixel_y = 2
+ },
+/obj/machinery/camera{
+ c_tag = "Security - Medbay";
+ dir = 1
+ },
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"bme" = (
-/obj/machinery/light/small,
-/obj/machinery/holopad,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/light,
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"bmf" = (
-/obj/structure/bed/roller,
/obj/item/radio/intercom{
pixel_y = -26
},
@@ -40270,8 +40215,10 @@
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/structure/closet/crate/freezer/blood,
+/obj/machinery/iv_drip,
/turf/open/floor/plasteel/white,
-/area/security/brig)
+/area/security/brig/infirmary)
"bmg" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/red{
@@ -40383,21 +40330,6 @@
},
/turf/open/floor/plasteel,
/area/security/main)
-"bmo" = (
-/obj/structure/table/reinforced,
-/obj/item/storage/box/fancy/donut_box,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
-/turf/open/floor/plasteel,
-/area/security/main)
"bmp" = (
/obj/effect/turf_decal/tile/red{
dir = 1
@@ -41165,7 +41097,7 @@
},
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/brig/infirmary)
"bnE" = (
/obj/structure/cable/white{
icon_state = "0-4"
@@ -44451,7 +44383,7 @@
},
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/brig/infirmary)
"bsu" = (
/obj/structure/disposalpipe/segment{
dir = 5
@@ -44841,7 +44773,7 @@
/obj/structure/cable/white,
/obj/effect/spawner/structure/window/reinforced/shutter,
/turf/open/floor/plating,
-/area/security/brig)
+/area/security/brig/infirmary)
"btb" = (
/obj/machinery/atmospherics/pipe/simple/orange/visible{
dir = 4
@@ -124268,6 +124200,11 @@
name = "Holodeck Projector Floor"
},
/area/holodeck/rec_center)
+"gjT" = (
+/obj/structure/cable/white,
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig/infirmary)
"gnJ" = (
/turf/open/floor/plasteel/dark/corner,
/area/maintenance/disposal/incinerator)
@@ -124865,6 +124802,27 @@
/obj/effect/turf_decal/stripes/line,
/turf/open/floor/plating,
/area/maintenance/disposal)
+"jhI" = (
+/obj/structure/table/reinforced,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/item/storage/firstaid/regular{
+ pixel_x = -3;
+ pixel_y = 4
+ },
+/obj/item/storage/box/fancy/donut_box{
+ pixel_y = -1
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"jmc" = (
/obj/machinery/disposal/bin,
/obj/effect/turf_decal/tile/neutral{
@@ -125007,6 +124965,36 @@
},
/turf/open/floor/plating,
/area/security/prison)
+"jSK" = (
+/obj/structure/cable/white{
+ icon_state = "4-8"
+ },
+/obj/structure/cable/white{
+ icon_state = "1-8"
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"jYa" = (
/obj/effect/turf_decal/tile/neutral{
dir = 1
@@ -125711,6 +125699,26 @@
/obj/machinery/computer/atmos_sim,
/turf/open/floor/plasteel/dark,
/area/science/mixing/chamber)
+"mzR" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/structure/table/optable,
+/obj/machinery/vending/wallmed{
+ pixel_x = -26
+ },
+/obj/machinery/firealarm{
+ pixel_y = 26
+ },
+/obj/item/storage/backpack/duffelbag/sec/surgery,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"mBX" = (
/obj/machinery/atmospherics/components/binary/pump,
/obj/machinery/light/small{
@@ -126191,6 +126199,9 @@
/obj/machinery/atmospherics/pipe/simple/orange/visible,
/turf/closed/wall/r_wall,
/area/engine/atmospherics_engine)
+"oFI" = (
+/turf/closed/wall/r_wall,
+/area/security/brig/infirmary)
"oyv" = (
/obj/machinery/shower{
dir = 8;
@@ -126578,6 +126589,13 @@
"pKo" = (
/turf/closed/wall,
/area/aisat)
+"pKS" = (
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/effect/spawner/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/security/brig/infirmary)
"pNX" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
@@ -127523,6 +127541,10 @@
/obj/effect/mapping_helpers/teleport_anchor,
/turf/open/floor/plasteel,
/area/engine/atmos)
+"uCX" = (
+/obj/effect/landmark/start/yogs/brigphsyician,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"uFj" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/turf_decal/delivery,
@@ -128080,6 +128102,30 @@
/obj/machinery/door/firedoor/border_only,
/turf/open/floor/plating,
/area/bridge/showroom/corporate)
+"wtC" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/sink{
+ dir = 4;
+ pixel_x = 11
+ },
+/obj/machinery/power/apc{
+ areastring = "/area/security/brig/infirmary";
+ dir = 4;
+ name = "Brig Infirmary APC";
+ pixel_x = 24
+ },
+/obj/structure/cable/white{
+ icon_state = "0-2"
+ },
+/obj/machinery/light_switch{
+ pixel_x = 26;
+ pixel_y = 10
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"wuh" = (
/obj/structure/cable/white{
icon_state = "4-8"
@@ -128120,6 +128166,15 @@
/obj/effect/turf_decal/bot,
/turf/open/floor/plasteel,
/area/engine/storage_shared)
+"wGN" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"wJG" = (
/obj/structure/cable/white{
icon_state = "0-2"
@@ -128170,6 +128225,17 @@
},
/turf/open/floor/carpet,
/area/medical/psych)
+"wRf" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/structure/closet/secure_closet/physician,
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"wTa" = (
/obj/machinery/computer/nanite_cloud_controller,
/obj/effect/turf_decal/bot,
@@ -128276,6 +128342,22 @@
/obj/effect/mapping_helpers/teleport_anchor,
/turf/open/floor/plasteel,
/area/engine/atmospherics_engine)
+"xtf" = (
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/machinery/airalarm/directional/north{
+ pixel_y = 24
+ },
+/obj/machinery/computer/operating,
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig/infirmary)
"xzs" = (
/obj/effect/turf_decal/tile/purple,
/obj/effect/turf_decal/tile/purple{
@@ -178211,9 +178293,9 @@ aad
aaa
aaa
aaa
-aad
-aaa
-bgZ
+oFI
+oFI
+oFI
bnD
bst
bta
@@ -178468,9 +178550,9 @@ aFm
aIc
aIc
aFm
-aFm
-aaa
-bgZ
+oFI
+mzR
+wGN
biz
bkk
bmd
@@ -178725,9 +178807,9 @@ aFm
aZk
baZ
bcJ
-aFm
-aad
-bgZ
+oFI
+xtf
+uCX
aNx
aYS
bme
@@ -178982,9 +179064,9 @@ aFm
aHJ
aSd
bcK
-aFm
-aaa
-bgZ
+oFI
+wRf
+wtC
aOc
aYU
bmf
@@ -179239,12 +179321,12 @@ aFm
aZm
aSo
aFm
-aFm
-aFm
-bgZ
-biy
-aYV
-bmc
+oFI
+oFI
+oFI
+pKS
+jSK
+gjT
aJS
bpj
aMb
@@ -181300,7 +181382,7 @@ aaa
bhd
biJ
bkt
-bmo
+jhI
bjU
bbo
aVU
diff --git a/_maps/map_files/Yogsmeta/Yogsmeta.dmm b/_maps/map_files/Yogsmeta/Yogsmeta.dmm
index 534c26468109..2ce9195ae46b 100644
--- a/_maps/map_files/Yogsmeta/Yogsmeta.dmm
+++ b/_maps/map_files/Yogsmeta/Yogsmeta.dmm
@@ -1930,11 +1930,28 @@
/turf/open/floor/plasteel,
/area/security/prison)
"adS" = (
-/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2,
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/item/tank/internals/air,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/machinery/computer/security,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-2"
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/obj/machinery/firealarm{
+ dir = 4;
+ pixel_x = -26
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"adT" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -2550,10 +2567,25 @@
/turf/open/floor/carpet,
/area/crew_quarters/heads/hos)
"afc" = (
-/obj/effect/spawner/structure/window/reinforced,
/obj/structure/cable/yellow,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/power/apc/highcap/ten_k{
+ areastring = "/area/security/physician";
+ dir = 8;
+ name = "Brig Physicians Office APC";
+ pixel_x = -25
+ },
+/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"afe" = (
/obj/structure/table/wood,
/obj/machinery/requests_console{
@@ -4887,9 +4919,6 @@
icon_state = "4-8"
},
/obj/machinery/light/small,
-/obj/effect/turf_decal/tile/red{
- dir = 1
- },
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -4900,6 +4929,9 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
+/obj/structure/extinguisher_cabinet{
+ pixel_y = -28
+ },
/turf/open/floor/plasteel/white,
/area/security/brig)
"ajZ" = (
@@ -5001,9 +5033,6 @@
/turf/open/floor/plasteel,
/area/security/brig)
"akm" = (
-/obj/effect/turf_decal/tile/red{
- dir = 8
- },
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
@@ -5057,57 +5086,56 @@
/turf/open/floor/plasteel/dark,
/area/security/warden)
"akt" = (
-/obj/structure/table,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/clothing/mask/surgical,
-/obj/item/reagent_containers/spray/cleaner,
/obj/effect/turf_decal/tile/red{
- dir = 1
+ dir = 8
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
/obj/effect/turf_decal/tile/red{
- dir = 8
+ dir = 1
},
+/obj/structure/table/optable,
+/obj/item/storage/backpack/duffelbag/sec/surgery,
/turf/open/floor/plasteel/white,
/area/security/brig)
"aku" = (
-/obj/structure/table,
/obj/item/radio/intercom{
pixel_y = 26
},
/obj/machinery/light/small{
dir = 1
},
-/obj/item/folder/red{
- pixel_x = 3
- },
-/obj/item/folder/white{
- pixel_x = -4;
- pixel_y = 2
- },
-/obj/item/healthanalyzer,
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/computer/operating,
/turf/open/floor/plasteel/white,
/area/security/brig)
"akv" = (
-/obj/structure/table,
/obj/machinery/airalarm{
pixel_y = 24
},
-/obj/machinery/computer/med_data/laptop,
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/structure/table,
+/obj/item/folder/white{
+ pixel_x = 4;
+ pixel_y = 3
+ },
+/obj/item/folder/red{
+ pixel_x = -3
+ },
+/obj/item/healthanalyzer{
+ pixel_y = -2
+ },
/turf/open/floor/plasteel/white,
/area/security/brig)
"akw" = (
@@ -5127,6 +5155,9 @@
/obj/effect/turf_decal/tile/red{
dir = 4
},
+/obj/machinery/vending/wallmed{
+ pixel_y = 27
+ },
/turf/open/floor/plasteel/white,
/area/security/brig)
"akx" = (
@@ -5462,7 +5493,6 @@
},
/area/library)
"alp" = (
-/obj/structure/bed/roller,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
@@ -5588,23 +5618,7 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
-/turf/open/floor/plasteel/white,
-/area/security/brig)
-"alF" = (
-/obj/machinery/door/window/westleft{
- dir = 4;
- name = "Infirmary"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
+/obj/machinery/holopad,
/turf/open/floor/plasteel/white,
/area/security/brig)
"alG" = (
@@ -5625,25 +5639,21 @@
/turf/closed/wall,
/area/maintenance/port)
"alL" = (
-/obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+/obj/structure/closet/secure_closet/physician,
+/obj/machinery/airalarm{
+ dir = 1;
+ pixel_y = -24
+ },
/turf/open/floor/plasteel/dark,
-/area/maintenance/port/fore)
+/area/security/physician)
"alM" = (
-/obj/structure/table,
-/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/glass/bottle/epinephrine,
-/obj/item/reagent_containers/glass/bottle/charcoal,
-/obj/item/reagent_containers/syringe,
-/obj/structure/extinguisher_cabinet{
- pixel_x = -27
- },
/obj/effect/turf_decal/tile/red{
- dir = 1
+ dir = 8
},
-/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
- dir = 8
+ dir = 1
},
+/obj/effect/landmark/start/yogs/brigphsyician,
/turf/open/floor/plasteel/white,
/area/security/brig)
"alN" = (
@@ -6208,31 +6218,40 @@
/turf/open/floor/plating,
/area/maintenance/aft)
"anc" = (
-/obj/machinery/door/airlock/security/glass{
- name = "N2O Storage";
- req_access_txt = "3"
+/obj/effect/turf_decal/tile/red{
+ dir = 4
},
-/obj/machinery/door/firedoor/border_only{
- dir = 1
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
},
-/obj/machinery/door/firedoor/border_only,
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port/fore)
-"and" = (
-/obj/structure/window/reinforced{
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{
dir = 1
},
-/obj/structure/bodycontainer/morgue,
-/turf/open/floor/plasteel/dark,
-/area/security/brig)
-"ane" = (
-/obj/effect/landmark/event_spawn,
+/obj/item/radio/intercom{
+ pixel_x = 27;
+ pixel_y = 5
+ },
+/obj/machinery/light_switch{
+ pixel_x = 28;
+ pixel_y = -5
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
+"and" = (
/obj/effect/turf_decal/tile/red{
dir = 1
},
/obj/effect/turf_decal/tile/red{
dir = 8
},
+/obj/machinery/sleeper{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
+"ane" = (
+/obj/effect/landmark/event_spawn,
/turf/open/floor/plasteel/white,
/area/security/brig)
"anf" = (
@@ -6380,14 +6399,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plasteel,
/area/security/warden)
-"anB" = (
-/obj/structure/table,
-/obj/item/paper_bin{
- pixel_x = -3;
- pixel_y = 7
- },
-/turf/open/floor/plasteel,
-/area/security/main)
"anC" = (
/obj/machinery/power/apc/highcap/five_k{
areastring = "/area/security/main";
@@ -7702,14 +7713,6 @@
},
/turf/open/floor/plasteel/dark,
/area/science/nanite)
-"aqX" = (
-/obj/structure/chair,
-/obj/item/restraints/handcuffs,
-/obj/effect/decal/remains/human,
-/obj/item/clothing/under/soviet,
-/obj/effect/decal/cleanable/blood/old,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
"aqY" = (
/obj/machinery/computer/security/labor,
/turf/open/floor/plasteel/dark,
@@ -72840,6 +72843,26 @@
},
/turf/open/space/basic,
/area/space)
+"dKb" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{
+ dir = 1
+ },
+/obj/effect/landmark/start/yogs/brigphsyician,
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"dKl" = (
/obj/structure/cable/yellow{
icon_state = "1-8"
@@ -72903,6 +72926,27 @@
/obj/effect/decal/cleanable/oil,
/turf/open/floor/plating,
/area/maintenance/disposal)
+"dNs" = (
+/obj/machinery/door/window/westleft{
+ base_state = "right";
+ dir = 4;
+ icon_state = "right";
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 6
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"dPt" = (
/obj/machinery/atmospherics/pipe/simple/dark/visible,
/obj/effect/mapping_helpers/teleport_anchor,
@@ -73844,6 +73888,18 @@
},
/turf/open/floor/plasteel/cafeteria,
/area/crew_quarters/heads/cmo)
+"fuH" = (
+/obj/structure/table,
+/obj/machinery/computer/med_data/laptop,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"fvG" = (
/obj/machinery/vending/games,
/obj/effect/decal/cleanable/cobweb/cobweb2,
@@ -74933,6 +74989,31 @@
/obj/effect/landmark/xeno_spawn,
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"hkb" = (
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/machinery/door/airlock/maintenance{
+ name = "Brig Infirmary Maintenance";
+ req_access_txt = "63"
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"hkc" = (
/obj/structure/chair/comfy/black,
/turf/open/floor/plasteel,
@@ -74968,18 +75049,10 @@
/obj/structure/window/reinforced{
dir = 4
},
-/obj/structure/rack,
-/obj/item/storage/firstaid/regular,
-/obj/item/healthanalyzer{
- pixel_y = -2
- },
/obj/machinery/camera{
c_tag = "Brig - Infirmary";
dir = 1
},
-/obj/item/clothing/under/rank/medical/purple{
- pixel_y = -4
- },
/obj/structure/disposalpipe/segment{
dir = 4
},
@@ -74999,6 +75072,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 9
},
+/obj/structure/rack,
+/obj/item/reagent_containers/spray/cleaner,
+/obj/item/reagent_containers/glass/bottle/charcoal,
+/obj/item/reagent_containers/glass/bottle/epinephrine,
+/obj/item/reagent_containers/syringe,
/turf/open/floor/plasteel/white,
/area/security/brig)
"hqG" = (
@@ -75675,6 +75753,34 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/fore)
+"iAX" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 4
+ },
+/obj/machinery/door/firedoor/border_only{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/door/airlock/medical/glass{
+ name = "Brig Physician's Office";
+ req_access_txt = "74"
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"iBW" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -75947,7 +76053,14 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/turf/open/floor/plasteel/dark,
+/obj/effect/turf_decal/tile/red{
+ dir = 8
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
/area/security/brig)
"jaV" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
@@ -76989,25 +77102,6 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/maintenance/port)
-"kYI" = (
-/obj/machinery/door/window/westleft{
- base_state = "right";
- dir = 4;
- icon_state = "right";
- name = "Infirmary"
- },
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 6
- },
-/turf/open/floor/plasteel/white,
-/area/security/brig)
"laa" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -77091,6 +77185,18 @@
},
/turf/open/floor/plasteel/white,
/area/crew_quarters/heads/captain/private)
+"lmm" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular{
+ pixel_x = -1;
+ pixel_y = 4
+ },
+/obj/item/paper_bin{
+ pixel_x = 2;
+ pixel_y = 3
+ },
+/turf/open/floor/plasteel,
+/area/security/main)
"lmt" = (
/obj/effect/turf_decal/stripes/line{
dir = 8
@@ -77106,6 +77212,9 @@
},
/turf/open/floor/plating,
/area/maintenance/port/aft)
+"lnX" = (
+/turf/closed/wall/r_wall,
+/area/security/physician)
"lob" = (
/turf/closed/wall,
/area/maintenance/department/science/central)
@@ -77211,6 +77320,13 @@
},
/turf/open/floor/plasteel/dark,
/area/hallway/secondary/exit/departure_lounge)
+"lxH" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/brig)
"lxM" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -78053,6 +78169,16 @@
},
/turf/open/floor/plasteel,
/area/engine/atmos)
+"nwq" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable/yellow{
+ icon_state = "0-4"
+ },
+/obj/structure/cable/yellow{
+ icon_state = "0-2"
+ },
+/turf/open/floor/plating,
+/area/security/physician)
"nwS" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 8
@@ -78436,6 +78562,13 @@
},
/turf/open/floor/plasteel,
/area/hallway/secondary/entry)
+"ogP" = (
+/obj/effect/spawner/structure/window/reinforced,
+/obj/structure/cable/yellow{
+ icon_state = "0-8"
+ },
+/turf/open/floor/plating,
+/area/security/physician)
"ogZ" = (
/obj/effect/mapping_helpers/airlock/abandoned,
/obj/machinery/door/firedoor/border_only{
@@ -78566,31 +78699,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel,
/area/hallway/secondary/exit/departure_lounge)
-"oum" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/structure/cable/yellow{
- icon_state = "4-8"
- },
-/obj/machinery/door/airlock/maintenance{
- name = "Brig Infirmary Maintenance";
- req_access_txt = "63"
- },
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 8
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 4
- },
-/obj/machinery/door/firedoor/border_only{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
- dir = 4
- },
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
"ouT" = (
/obj/machinery/atmospherics/pipe/simple/cyan/visible,
/obj/effect/mapping_helpers/teleport_anchor,
@@ -79176,6 +79284,14 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/turf/open/floor/plasteel,
/area/maintenance/disposal/incinerator)
+"pLD" = (
+/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{
+ dir = 4
+ },
+/obj/machinery/portable_atmospherics/canister/air,
+/obj/item/tank/internals/air,
+/turf/open/floor/plating,
+/area/maintenance/port/fore)
"pMb" = (
/obj/structure/cable/yellow{
icon_state = "2-4"
@@ -79507,13 +79623,23 @@
/obj/structure/cable/yellow{
icon_state = "2-4"
},
-/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 4
},
-/obj/effect/mapping_helpers/teleport_anchor,
-/turf/open/floor/plating,
-/area/maintenance/port/fore)
+/obj/effect/turf_decal/stripes/line{
+ dir = 8
+ },
+/obj/structure/cable/yellow{
+ icon_state = "1-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/structure/chair/office/dark{
+ dir = 1
+ },
+/turf/open/floor/plasteel/white,
+/area/security/physician)
"qtW" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -80231,6 +80357,19 @@
},
/turf/open/floor/plasteel/dark,
/area/crew_quarters/fitness/recreation)
+"rHS" = (
+/obj/machinery/camera{
+ c_tag = "Brig Physicians Office";
+ dir = 8;
+ network = list("ss13")
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/obj/structure/closet/crate/freezer/blood,
+/obj/machinery/iv_drip,
+/turf/open/floor/plasteel/dark,
+/area/security/physician)
"rHW" = (
/obj/structure/cable/yellow{
icon_state = "4-8"
@@ -81992,12 +82131,15 @@
/obj/structure/disposalpipe/segment{
dir = 6
},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
- dir = 6
- },
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 6
},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{
+ dir = 1
+ },
+/obj/effect/turf_decal/stripes/line{
+ dir = 4
+ },
/turf/open/floor/plating,
/area/maintenance/port/fore)
"uRM" = (
@@ -82561,6 +82703,25 @@
},
/turf/open/floor/plating,
/area/maintenance/starboard/aft)
+"vMZ" = (
+/obj/machinery/door/window/westleft{
+ dir = 4;
+ name = "Infirmary";
+ red_alert_access = 1;
+ req_access_txt = "5"
+ },
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
+ dir = 4
+ },
+/turf/open/floor/plasteel/white,
+/area/security/brig)
"vNW" = (
/turf/closed/wall,
/area/science/misc_lab/range)
@@ -82895,7 +83056,6 @@
/obj/structure/cable/yellow{
icon_state = "4-8"
},
-/obj/machinery/iv_drip,
/obj/effect/turf_decal/tile/red,
/obj/effect/turf_decal/tile/red{
dir = 8
@@ -83155,6 +83315,13 @@
},
/turf/open/floor/plating,
/area/maintenance/disposal)
+"wTc" = (
+/obj/effect/decal/cleanable/blood/old,
+/obj/structure/bodycontainer/morgue{
+ dir = 1
+ },
+/turf/open/floor/plasteel/dark,
+/area/security/brig)
"wXB" = (
/obj/machinery/camera{
c_tag = "Departure Lounge - Port Aft";
@@ -105859,7 +106026,7 @@ aax
aaa
fQm
dne
-dnu
+pLD
hWi
dzn
wHp
@@ -106371,12 +106538,12 @@ aax
aax
aax
aaf
-dne
-dne
-ucV
-dne
-dne
-dne
+lnX
+lnX
+hkb
+lnX
+lnX
+lnX
aaa
aaa
aaa
@@ -106628,12 +106795,12 @@ afW
aaf
aaa
aaa
-dne
+nwq
adS
qsm
afc
alL
-dne
+lnX
aaa
aaa
aaa
@@ -106885,12 +107052,12 @@ aax
aaf
aaf
aaa
-dne
-dnk
-qqD
+ogP
+fuH
+dKb
anc
-alL
-dne
+rHS
+lnX
aaa
aaa
aaa
@@ -107143,11 +107310,11 @@ auO
ajm
ajm
ajm
+lxH
+iAX
+ahx
+ahx
ajm
-oum
-ajm
-dne
-dne
aaa
aaa
aaa
@@ -107402,9 +107569,9 @@ akt
alM
and
jax
+avk
+wTc
ajm
-aqX
-dne
aaa
aaa
aaa
@@ -107659,8 +107826,8 @@ aku
akm
ane
ajT
-ajm
-ajm
+ahx
+ahx
ajm
axF
axF
@@ -108170,8 +108337,8 @@ ahx
ait
ahx
akw
-alF
-kYI
+vMZ
+dNs
hnY
ahx
aqZ
@@ -114853,7 +115020,7 @@ adZ
ajD
akF
ajS
-anB
+lmm
aoH
apY
asK
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 0d5496280633..b5b0815edbea 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -86,6 +86,8 @@
#define ACCESS_FREEMINER 71
#define ACCESS_FREEMINER_CAPTAIN 72
#define ACCESS_FREEMINER_ENGINEER 73
+//Yogs: Brig Physician access, used for their locker and offices if one is added
+#define ACCESS_BRIG_PHYS 74
//BEGIN CENTCOM ACCESS
/*Should leave plenty of room if we need to add more access levels.
diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 852f07c96bd1..13334e3c28fb 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -23,6 +23,7 @@
#define DOCTOR (1<<4)
#define GENETICIST (1<<5)
#define VIROLOGIST (1<<6)
+#define BRIGPHYS (1<<7)
#define CIVILIAN (1<<2)
@@ -81,19 +82,20 @@
#define JOB_DISPLAY_ORDER_MINING_MEDIC 24
#define JOB_DISPLAY_ORDER_PARAMEDIC 25
#define JOB_DISPLAY_ORDER_PSYCHIATRIST 26
-#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 27
-#define JOB_DISPLAY_ORDER_BARTENDER 28
-#define JOB_DISPLAY_ORDER_COOK 29
-#define JOB_DISPLAY_ORDER_BOTANIST 30
-#define JOB_DISPLAY_ORDER_JANITOR 31
-#define JOB_DISPLAY_ORDER_CLOWN 32
-#define JOB_DISPLAY_ORDER_MIME 33
-#define JOB_DISPLAY_ORDER_CURATOR 34
-#define JOB_DISPLAY_ORDER_LAWYER 35
-#define JOB_DISPLAY_ORDER_ARTIST 36
-#define JOB_DISPLAY_ORDER_TOURIST 37
-#define JOB_DISPLAY_ORDER_CLERK 38
-#define JOB_DISPLAY_ORDER_CHAPLAIN 39
+#define JOB_DISPLAY_ORDER_BRIG_PHYSICIAN 27
+#define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 28
+#define JOB_DISPLAY_ORDER_BARTENDER 29
+#define JOB_DISPLAY_ORDER_COOK 30
+#define JOB_DISPLAY_ORDER_BOTANIST 31
+#define JOB_DISPLAY_ORDER_JANITOR 32
+#define JOB_DISPLAY_ORDER_CLOWN 33
+#define JOB_DISPLAY_ORDER_MIME 34
+#define JOB_DISPLAY_ORDER_CURATOR 35
+#define JOB_DISPLAY_ORDER_LAWYER 36
+#define JOB_DISPLAY_ORDER_ARTIST 37
+#define JOB_DISPLAY_ORDER_TOURIST 38
+#define JOB_DISPLAY_ORDER_CLERK 39
+#define JOB_DISPLAY_ORDER_CHAPLAIN 40
/proc/find_job(target)
@@ -120,4 +122,4 @@
#define IS_MEDICAL(target) (find_job(target) in GLOB.medical_positions)
#define IS_SCIENCE(target) (find_job(target) in GLOB.science_positions)
#define IS_CARGO(target) (find_job(target) in GLOB.supply_positions)
-#define IS_SECURITY(target) (find_job(target) in GLOB.security_positions)
\ No newline at end of file
+#define IS_SECURITY(target) (find_job(target) in GLOB.security_positions)
diff --git a/code/game/gamemodes/changeling/changeling.dm b/code/game/gamemodes/changeling/changeling.dm
index 10373c1108f7..13742025ca49 100644
--- a/code/game/gamemodes/changeling/changeling.dm
+++ b/code/game/gamemodes/changeling/changeling.dm
@@ -12,7 +12,7 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
antag_flag = ROLE_CHANGELING
false_report_weight = 10
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel") //YOGS - added hop
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Brig Physician") //YOGS - added hop and brig physician
required_players = 15
required_enemies = 1
recommended_enemies = 4
@@ -162,4 +162,4 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
round_credits += "
"
round_credits += ..()
- return round_credits
\ No newline at end of file
+ return round_credits
diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm
index 029cdb8f51ec..a96b293153d6 100644
--- a/code/game/gamemodes/clock_cult/clock_cult.dm
+++ b/code/game/gamemodes/clock_cult/clock_cult.dm
@@ -140,7 +140,7 @@ Credit where due:
required_enemies = 4
recommended_enemies = 4
enemy_minimum_age = 14
- protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain") //Silicons can eventually be converted
+ protected_jobs = list("AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") //Silicons can eventually be converted //Yogs: Added Brig Physician
restricted_jobs = list("Chaplain", "Captain")
announce_span = "brass"
announce_text = "Servants of Ratvar are trying to summon the Justiciar!\n\
@@ -383,4 +383,4 @@ Credit where due:
round_credits += "
"
round_credits += ..()
- return round_credits
\ No newline at end of file
+ return round_credits
diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm
index 27ee75a5bcd2..ac524ff7f263 100644
--- a/code/game/gamemodes/cult/cult.dm
+++ b/code/game/gamemodes/cult/cult.dm
@@ -42,7 +42,7 @@
report_type = "cult"
antag_flag = ROLE_CULTIST
false_report_weight = 10
- restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer")
+ restricted_jobs = list("Chaplain","AI", "Cyborg", "Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician
protected_jobs = list()
required_players = 29
required_enemies = 4
diff --git a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
index d56655d0030b..4418ebe22ed6 100644
--- a/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
+++ b/code/game/gamemodes/eldritch_cult/eldritch_cult.dm
@@ -4,7 +4,7 @@
report_type = "heresy"
antag_flag = ROLE_HERETIC
false_report_weight = 5
- protected_jobs = list("Chaplain","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer")
+ protected_jobs = list("Chaplain","Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician
restricted_jobs = list("AI", "Cyborg")
required_players = 20
required_enemies = 1
diff --git a/code/game/gamemodes/hivemind/hivemind.dm b/code/game/gamemodes/hivemind/hivemind.dm
index 3df6ea0d5aac..28838d59675e 100644
--- a/code/game/gamemodes/hivemind/hivemind.dm
+++ b/code/game/gamemodes/hivemind/hivemind.dm
@@ -4,7 +4,7 @@
report_type = "hivemind"
antag_flag = ROLE_HIVE
false_report_weight = 5
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Brig Physician") //Yogs: Added "Brig Physician
restricted_jobs = list("Cyborg","AI")
required_players = 24
required_enemies = 2
diff --git a/code/game/gamemodes/overthrow/overthrow.dm b/code/game/gamemodes/overthrow/overthrow.dm
index c3a86b9f2bbe..e622d1b2b506 100644
--- a/code/game/gamemodes/overthrow/overthrow.dm
+++ b/code/game/gamemodes/overthrow/overthrow.dm
@@ -4,7 +4,7 @@
config_tag = "overthrow"
report_type = "overthrow"
antag_flag = ROLE_OVERTHROW
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician
required_players = 20 // the core idea is of a swift, bloodless coup, so it shouldn't be as chaotic as revs.
required_enemies = 2 // minimum two teams, otherwise it's just nerfed revs.
recommended_enemies = 4
diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm
index ca0c9782d563..8416683fe495 100644
--- a/code/game/gamemodes/revolution/revolution.dm
+++ b/code/game/gamemodes/revolution/revolution.dm
@@ -15,7 +15,7 @@
report_type = "revolution"
antag_flag = ROLE_REV
false_report_weight = 10
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg", "Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Shaft Miner", "Mining Medic")
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg", "Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Shaft Miner", "Mining Medic", "Brig Physician") //Yogs: Added Brig Physician
required_jobs = list(list("Captain"=1),list("Head of Personnel"=1),list("Head of Security"=1),list("Chief Engineer"=1),list("Research Director"=1),list("Chief Medical Officer"=1)) //Any head present
required_players = 30
required_enemies = 2
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 11465204739e..ea401639fd7b 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -12,7 +12,7 @@
antag_flag = ROLE_TRAITOR
false_report_weight = 20 //Reports of traitors are pretty common.
restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director") //YOGS - added the hop
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Brig Physician") //YOGS - added the hop and brig physician
required_players = 0
required_enemies = 1
recommended_enemies = 4
diff --git a/code/game/gamemodes/zombie/zombie.dm b/code/game/gamemodes/zombie/zombie.dm
index 04fa8552b18b..9f5f5a9de68a 100644
--- a/code/game/gamemodes/zombie/zombie.dm
+++ b/code/game/gamemodes/zombie/zombie.dm
@@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(zombies)
antag_flag = ROLE_ZOMBIE
false_report_weight = 10
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Medical Officer")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Medical Officer", "Brig Physician") //Yogs: Added Brig Physician
required_players = 40
required_enemies = 3
recommended_enemies = 3
@@ -123,4 +123,4 @@ GLOBAL_LIST_EMPTY(zombies)
People seem to 'turn' when attacked by these... Creatures.. We currently estimate their threat level to be VERY HIGH. If the virus somehow makes it onboard your station, send a report to Central Command immediately.\
The only way to truly kill them is to chop their heads off. We have spotted abnormal evolutions amongst the creatures, suggesting that they have the ability to adapt to the people fighting them. Keep your guard up crew."
-#undef ZOMBIE_SCALING_COEFFICIENT
\ No newline at end of file
+#undef ZOMBIE_SCALING_COEFFICIENT
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 815286da7395..c01926321b45 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -45,6 +45,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
jobs["Paramedic"] = 25 //Yogs: Added IDs for this job
jobs["Psychiatrist"] = 26 //Yogs: Added IDs for this job
jobs["Mining Medic"] = 27 //Yogs: Added IDs for this job
+ jobs["Brig Physician"] = 28 //Yogs: Added IDs for this job
jobs["Research Director"] = 30
jobs["Scientist"] = 31
jobs["Roboticist"] = 32
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 7808d96828bf..d6a2652bc96f 100755
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -290,3 +290,25 @@
..()
for(var/i in 1 to 3)
new /obj/item/storage/box/lethalshot(src)
+
+//Yogs Start: Brig Pysh Closet
+/obj/structure/closet/secure_closet/physician
+ name = "\improper brig physician's cabinet"
+ req_access = list(ACCESS_BRIG_PHYS)
+ icon = 'yogstation/icons/obj/closet.dmi'
+ icon_state = "physician"
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ door_anim_time = 0
+
+/obj/structure/closet/secure_closet/physician/PopulateContents()
+ ..()
+ new /obj/item/storage/backpack/duffelbag/sec/physician/clothing(src)
+ new /obj/item/cartridge/medical(src)
+ new /obj/item/radio/headset/headset_medsec(src)
+ new /obj/item/storage/belt/medical(src)
+ new /obj/item/pinpointer/crew(src)
+ new /obj/item/sensor_device(src)
+ new /obj/item/storage/box/bodybags(src)
+ new /obj/item/tank/internals/anesthetic(src)
+ new /obj/item/clothing/mask/breath/medical(src)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 87915bee5f81..4a4f06ce10da 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1729,7 +1729,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
selectablecapes += A
else
max_eligable = FALSE
-
if(max_eligable)
selectablecapes += GLOB.skillcapes["max"]
diff --git a/code/modules/clothing/neck/skillcapes/skillcape_datums.dm b/code/modules/clothing/neck/skillcapes/skillcape_datums.dm
index 8592af275cf5..a2cfb273e787 100644
--- a/code/modules/clothing/neck/skillcapes/skillcape_datums.dm
+++ b/code/modules/clothing/neck/skillcapes/skillcape_datums.dm
@@ -128,6 +128,16 @@
path = /obj/item/clothing/neck/skillcape/trimmed/detective
id = "detective_trimmed"
+/datum/skillcape/physician
+ name = "cape of the brig physician"
+ job = "Brig Physician"
+ path = /obj/item/clothing/neck/skillcape/physician
+
+/datum/skillcape/trimmed/physician
+ name = "cape of the grand brig physician"
+ job = "Brig Physician"
+ path = /obj/item/clothing/neck/skillcape/trimmed/physician
+
/datum/skillcape/signaltech
name = "cape of the signal technician"
job = "Signal Technician"
diff --git a/code/modules/clothing/neck/skillcapes/skillcapes.dm b/code/modules/clothing/neck/skillcapes/skillcapes.dm
index 073d49604d3b..7fb2e0f6a92b 100644
--- a/code/modules/clothing/neck/skillcapes/skillcapes.dm
+++ b/code/modules/clothing/neck/skillcapes/skillcapes.dm
@@ -164,6 +164,16 @@
icon_state = "det-trimmed"
item_state = "det-trimmed"
+/obj/item/clothing/neck/skillcape/physician
+ name = "cape of the brig physician"
+ icon_state = "brigphys-skillcape"
+ item_state = "brigphys-skillcape"
+
+/obj/item/clothing/neck/skillcape/trimmed/physician
+ name = "cape of the grand brig physician"
+ icon_state = "brigphys-trimmed"
+ item_state = "brigphys-trimmed"
+
/obj/item/clothing/neck/skillcape/signaltech
name = "cape of the signal technician"
icon_state = "signal-skillcape"
@@ -280,7 +290,7 @@
item_state = "minemed-skillcape"
/obj/item/clothing/neck/skillcape/trimmed/minemedic
- name = "cape of the grand minic medic"
+ name = "cape of the grand mining medic"
icon_state = "minemed-trimmed"
item_state = "minemed-trimmed"
@@ -434,4 +444,4 @@
icon_state = "botany-trimmed"
item_state = "botany-trimmed"
-GLOBAL_LIST_EMPTY(skillcapes)
\ No newline at end of file
+GLOBAL_LIST_EMPTY(skillcapes)
diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm
index 38e6094fbb74..bf48b076c36a 100644
--- a/code/modules/clothing/outfits/plasmaman.dm
+++ b/code/modules/clothing/outfits/plasmaman.dm
@@ -496,6 +496,28 @@
ears = /obj/item/radio/headset/headset_med
backpack_contents = list(/obj/item/storage/box/plasmaman = 1)
+/datum/outfit/job/plasmaman/brigphysician
+ name = "Plasmaman Brig Physician"
+
+ jobtype = /datum/job/brigphysician
+
+ head = /obj/item/clothing/head/helmet/space/plasmaman/blue
+ r_hand= /obj/item/tank/internals/plasmaman/belt/full
+ mask = /obj/item/clothing/mask/breath
+ backpack_contents = list(/obj/item/roller = 1,\
+ /obj/item/storage/box/plasmaman = 1)
+ belt = /obj/item/pda/physician
+ ears = /obj/item/radio/headset/headset_medsec
+ glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ shoes = /obj/item/clothing/shoes/jackboots
+ uniform = /obj/item/clothing/under/plasmaman/medical
+ suit = /obj/item/clothing/suit/toggle/labcoat/emt/physician
+ l_hand = /obj/item/storage/firstaid/regular
+ gloves = /obj/item/clothing/gloves/color/latex
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+
/datum/outfit/job/plasmaman/clerk
name = "Plasmaman Clerk"
diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm
index 9f06df53b858..0d2402d9eaa8 100644
--- a/code/modules/jobs/access.dm
+++ b/code/modules/jobs/access.dm
@@ -143,7 +143,7 @@
ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS,
ACCESS_MECH_MINING, ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_SECURITY, ACCESS_MECH_MEDICAL,
ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE,
- ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING) //YOGS - yogs jobs
+ ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK, ACCESS_CLONING, ACCESS_TCOM_ADMIN, ACCESS_PARAMEDIC, ACCESS_MANUFACTURING, ACCESS_BRIG_PHYS) //YOGS - yogs jobs
/// Gets all centcom accesses
/proc/get_all_centcom_access()
@@ -181,7 +181,7 @@
if(2) //security
return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_MECH_SECURITY, ACCESS_HOS)
if(3) //medbay
- return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PARAMEDIC) // yogs - Yog jobs
+ return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_MECH_MEDICAL, ACCESS_CMO, ACCESS_PARAMEDIC, ACCESS_BRIG_PHYS) // yogs - Yog jobs
if(4) //research
return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_MECH_SCIENCE, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK, ACCESS_AI_UPLOAD)
if(5) //engineering and maintenance
@@ -351,6 +351,8 @@
return "Tcomms Admin"
if(ACCESS_MANUFACTURING)
return "Clerk"
+ if(ACCESS_BRIG_PHYS)
+ return "Brig Physician"
// yogs end
/// Get descriptions for centcom accesses
@@ -382,7 +384,7 @@
"Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist",
// yogs start - Yog jobs
"Research Director", "Scientist", "Roboticist", "Head of Security", "Warden", "Detective", "Security Officer",
- "Signal Technician", "Mining Medic", "Paramedic", "Psychiatrist", "Clerk", "Tourist", "Space Bartender", "Artist")
+ "Signal Technician", "Mining Medic", "Paramedic", "Psychiatrist", "Clerk", "Tourist", "Space Bartender", "Artist", "Brig Physician")
// yogs end
/// Gets all jobs with hud icons
diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm
index adfb74511cc9..8e1de5a59955 100644
--- a/code/modules/jobs/job_types/chief_medical_officer.dm
+++ b/code/modules/jobs/job_types/chief_medical_officer.dm
@@ -21,10 +21,10 @@
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+ ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS) //Yogs: Gives CMO access to the brig physicians locker
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_HEADS, ACCESS_MINERAL_STOREROOM,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, ACCESS_MECH_MEDICAL,
- ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS)
+ ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_BRIG_PHYS) //Yogs: Gives CMO access to the brig physicians locker
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_MED
diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm
index 17a89caded8b..ce3922f03431 100644
--- a/code/modules/jobs/job_types/head_of_security.dm
+++ b/code/modules/jobs/job_types/head_of_security.dm
@@ -23,11 +23,11 @@
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY,
ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
- ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY,
ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_ATMOSPHERICS, // yogs - HoS needs same access as engineering armband
ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING,
- ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM)
+ ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_BRIG_PHYS) //Yogs: Gives HoS access to the brig physicians locker
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_SEC
diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm
index 687d1aa2eeea..0851706f1df9 100644
--- a/code/modules/jobs/jobs.dm
+++ b/code/modules/jobs/jobs.dm
@@ -20,7 +20,8 @@ GLOBAL_LIST_INIT(original_medical_positions, list(
"Chemist",
"Paramedic",
"Psychiatrist",
- "Mining Medic"))
+ "Mining Medic",
+ "Brig Physician"))
GLOBAL_LIST_INIT(original_science_positions, list(
"Research Director",
@@ -82,7 +83,8 @@ GLOBAL_LIST_INIT(alt_medical_positions, list(
"Pharmacist", "Chemical Analyst", "Chemistry Lab Technician", "Chemical Specialist",
"EMT", "Paramedic Trainee", "Rapid Response Medic",
"Councilor", "Therapist", "Mentalist",
- "Mining Medical Support", "Lavaland Medical Care Unit", "Junior Mining Medic", "Planetside Health Officer"))
+ "Mining Medical Support", "Lavaland Medical Care Unit", "Junior Mining Medic", "Planetside Health Officer",
+ "Security Medic", "Security Medical Support", "Penitentiary Medical Care Unit", "Junior Brig Physician", "Detention Center Health Officer",))
GLOBAL_LIST_INIT(alt_science_positions, list(
"Chief Science Officer", "Head of Research",
@@ -189,6 +191,7 @@ GLOBAL_PROTECT(exp_specialmap)
var/static/regex/psych_expand = new("psychiatrist")
var/static/regex/clerk_expand = new("clerk")
var/static/regex/para_expand = new("paramedic")
+ var/static/regex/phys_expand = new("brig physician")
// yogs end
job = lowertext(job)
@@ -212,6 +215,7 @@ GLOBAL_PROTECT(exp_specialmap)
job = psych_expand.Replace(job, "psychiatrist")
job = clerk_expand.Replace(job, "clerk")
job = para_expand.Replace(job, "paramedic")
+ job = phys_expand.Replace(job, "brig physician")
// yogs end
return job
diff --git a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
index 05ebf4f3ffbb..dbe2d0b2a20e 100644
--- a/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+++ b/code/modules/mob/living/carbon/human/species_types/plasmamen.dm
@@ -139,6 +139,9 @@
if("Psychiatrist")
O = new /datum/outfit/job/plasmaman/psych
+ if("Brig Physician")
+ O = new /datum/outfit/job/plasmaman/brigphysician
+
if("Clerk")
O = new /datum/outfit/job/plasmaman/clerk
diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi
index c405bc41b690..1075abd28725 100644
Binary files a/icons/mob/landmarks.dmi and b/icons/mob/landmarks.dmi differ
diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi
index 325b32975bbd..e8a713f063c1 100644
Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ
diff --git a/icons/obj/clothing/skillcapes.dmi b/icons/obj/clothing/skillcapes.dmi
index 7c700375f76d..4bd610fbd68a 100644
Binary files a/icons/obj/clothing/skillcapes.dmi and b/icons/obj/clothing/skillcapes.dmi differ
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi
index 4952d0432346..6d12af0bd357 100644
Binary files a/icons/obj/pda.dmi and b/icons/obj/pda.dmi differ
diff --git a/icons/turf/areas.dmi b/icons/turf/areas.dmi
index 69d997b788f7..434452e366f7 100644
Binary files a/icons/turf/areas.dmi and b/icons/turf/areas.dmi differ
diff --git a/yogstation.dme b/yogstation.dme
index 2340219bf262..aab6062c7c55 100644
--- a/yogstation.dme
+++ b/yogstation.dme
@@ -3431,6 +3431,7 @@
#include "yogstation\code\modules\hydroponics\grown\misc.dm"
#include "yogstation\code\modules\jobs\job_types\_job.dm"
#include "yogstation\code\modules\jobs\job_types\atmospheric_technician.dm"
+#include "yogstation\code\modules\jobs\job_types\brig_physician.dm"
#include "yogstation\code\modules\jobs\job_types\captain.dm"
#include "yogstation\code\modules\jobs\job_types\chief_engineer.dm"
#include "yogstation\code\modules\jobs\job_types\chief_medical_officer.dm"
diff --git a/yogstation/code/game/area/Space_Station_13_areas.dm b/yogstation/code/game/area/Space_Station_13_areas.dm
index edbd42f2f93e..eeba3b96b418 100644
--- a/yogstation/code/game/area/Space_Station_13_areas.dm
+++ b/yogstation/code/game/area/Space_Station_13_areas.dm
@@ -20,6 +20,14 @@
name = "Clerks office"
icon_state = "cafeteria"
+/area/security/brig/infirmary
+ name = "Brig Infirmary"
+ icon_state = "brig_infirmary"
+
+/area/security/physician
+ name = "Brig Physician's Office"
+ icon_state = "physician"
+
/area/maintenance
ambientsounds = list('sound/ambience/ambimaint1.ogg',
'sound/ambience/ambimaint2.ogg',
diff --git a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
index 90aaf8a4ff04..135f7b3873b1 100644
--- a/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
+++ b/yogstation/code/game/gamemodes/darkspawn/darkspawn.dm
@@ -14,7 +14,7 @@
recommended_enemies = 3
enemy_minimum_age = 15
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician") //Added Brig Physician
title_icon = "ss13"
/datum/game_mode/darkspawn/announce()
diff --git a/yogstation/code/game/gamemodes/gangs/gangs.dm b/yogstation/code/game/gamemodes/gangs/gangs.dm
index 5a64e4cbff8e..b3dfb24be80f 100644
--- a/yogstation/code/game/gamemodes/gangs/gangs.dm
+++ b/yogstation/code/game/gamemodes/gangs/gangs.dm
@@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(gangs)
name = "gang war"
config_tag = "gang"
antag_flag = ROLE_GANG
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer")
+ restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Brig Physician") //Added Brig Physician
required_players = 35
required_enemies = 1
recommended_enemies = 2
diff --git a/yogstation/code/game/gamemodes/shadowling/shadowling.dm b/yogstation/code/game/gamemodes/shadowling/shadowling.dm
index 6765c5a5bfe0..d05f38304360 100644
--- a/yogstation/code/game/gamemodes/shadowling/shadowling.dm
+++ b/yogstation/code/game/gamemodes/shadowling/shadowling.dm
@@ -56,7 +56,7 @@ Made by Xhuis
recommended_enemies = 3
enemy_minimum_age = 14
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer")
+ protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Brig Physician")
title_icon = "ss13"
/datum/game_mode/shadowling/announce()
diff --git a/yogstation/code/game/gamemodes/vampire/vampire.dm b/yogstation/code/game/gamemodes/vampire/vampire.dm
index a42dba95b5ae..6623d80ff561 100644
--- a/yogstation/code/game/gamemodes/vampire/vampire.dm
+++ b/yogstation/code/game/gamemodes/vampire/vampire.dm
@@ -21,7 +21,7 @@
antag_flag = ROLE_VAMPIRE
false_report_weight = 1
restricted_jobs = list("AI", "Cyborg")
- protected_jobs = list("Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Security Officer", "Chaplain", "Detective", "Warden")
+ protected_jobs = list("Head of Security", "Captain", "Head of Personnel", "Research Director", "Chief Engineer", "Chief Medical Officer", "Security Officer", "Chaplain", "Detective", "Warden", "Brig Physician") //Added Brig Physician
required_players = 15
required_enemies = 1
recommended_enemies = 3
diff --git a/yogstation/code/game/objects/effects/landmarks.dm b/yogstation/code/game/objects/effects/landmarks.dm
index 076695e07eec..0c363a8b260c 100644
--- a/yogstation/code/game/objects/effects/landmarks.dm
+++ b/yogstation/code/game/objects/effects/landmarks.dm
@@ -27,6 +27,10 @@ GLOBAL_LIST_EMPTY(chosen_station_templates)
name = "Tourist"
icon_state = "Tourist"
+/obj/effect/landmark/start/yogs/brigphsyician
+ name = "Brig Physician"
+ icon_state = "Brig Physician"
+
/obj/effect/landmark/stationroom
var/list/template_names = list()
/// Whether or not we can choose templates that have already been chosen
diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm
index 24e5b02e1fcc..5bc330b8f592 100644
--- a/yogstation/code/game/objects/items/cards_ids.dm
+++ b/yogstation/code/game/objects/items/cards_ids.dm
@@ -45,6 +45,7 @@
"Warden" = list("security","black"),
"Security Officer" = list("security","red"),
"Detective" = list("security","brown"),
+ "Brig Physician" = list("security","blue"),
"Lawyer" = list("security","purple")
)
if(job in idfluff)
diff --git a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm b/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm
index 9fd03c363412..1a131da19732 100644
--- a/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm
+++ b/yogstation/code/game/objects/items/devices/PDA/PDA_types.dm
@@ -10,6 +10,18 @@
icon_state = "pda-medical"
light_color = LIGHT_COLOR_LIGHT_CYAN
+/obj/item/pda/miningmed
+ name = "mining medic PDA"
+ default_cartridge = /obj/item/cartridge/medical
+ icon_state = "pda-miningmed"
+ light_color = LIGHT_COLOR_LIGHT_CYAN
+
+/obj/item/pda/physician
+ name = "brig physician PDA"
+ default_cartridge = /obj/item/cartridge/medical
+ icon_state = "pda-physician"
+ light_color = LIGHT_COLOR_RED
+
/obj/item/pda/clown
light_color = LIGHT_COLOR_PINK
@@ -92,4 +104,4 @@
light_color = LIGHT_COLOR_LIGHT_CYAN
/obj/item/pda/geneticist
- light_color = LIGHT_COLOR_LIGHT_CYAN
\ No newline at end of file
+ light_color = LIGHT_COLOR_LIGHT_CYAN
diff --git a/yogstation/code/game/objects/items/devices/radio/encryptionkey.dm b/yogstation/code/game/objects/items/devices/radio/encryptionkey.dm
index a59239daaa75..10c72f43c991 100644
--- a/yogstation/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/yogstation/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -2,4 +2,10 @@
name = "medical supply radio encryption key"
desc = "An encryption key for mining medic headsets. To access the medical channel, use :m. For cargo, use :u."
icon_state = "cargo_cypherkey"
- channels = list("Supply" = 1, "Medical" = 1)
\ No newline at end of file
+ channels = list("Supply" = 1, "Medical" = 1)
+
+/obj/item/encryptionkey/headset_medsec
+ name = "medical security radio encryption key"
+ desc = "An encryption key for brig physician headsets. To access the medical channel, use :m. For security, use :s."
+ icon_state = "sec_cypherkey"
+ channels = list("Security" = 1, "Medical" = 1)
diff --git a/yogstation/code/game/objects/items/devices/radio/headset.dm b/yogstation/code/game/objects/items/devices/radio/headset.dm
index 6a1e0e1979f1..1c51fed6c94c 100644
--- a/yogstation/code/game/objects/items/devices/radio/headset.dm
+++ b/yogstation/code/game/objects/items/devices/radio/headset.dm
@@ -3,4 +3,11 @@
desc = "A headset that is a result of the mating between medical and cargo. \nTo access the medical channel, use :m. For cargo, use :u."
icon_state = "med_headset"
item_state = "headset"
- keyslot = new /obj/item/encryptionkey/headset_medsup
\ No newline at end of file
+ keyslot = new /obj/item/encryptionkey/headset_medsup
+
+/obj/item/radio/headset/headset_medsec
+ name = "brig physician radio headset"
+ desc = "A headset that is a result of the mating between medical and security. \nTo access the medical channel, use :m. For sec, use :s."
+ icon_state = "med_headset"
+ item_state = "headset"
+ keyslot = new /obj/item/encryptionkey/headset_medsec
diff --git a/yogstation/code/game/objects/items/storage/backpack.dm b/yogstation/code/game/objects/items/storage/backpack.dm
index a9e4a20dc24c..fe2ea8b14ab3 100644
--- a/yogstation/code/game/objects/items/storage/backpack.dm
+++ b/yogstation/code/game/objects/items/storage/backpack.dm
@@ -210,3 +210,19 @@
alternate_worn_icon = 'yogstation/icons/mob/back.dmi'
icon_state = "clownfacebackpack"
item_state = "clownfacebackpack"
+
+//Clothing Bags
+/obj/item/storage/backpack/duffelbag/sec/physician/clothing
+ name = "Brig Physician's clothing duffelbag"
+ desc = "A large duffel bag filled with clothing."
+
+/obj/item/storage/backpack/duffelbag/sec/physician/clothing/PopulateContents()
+ new /obj/item/clothing/under/yogs/rank/physician(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt/physician(src)
+ new /obj/item/clothing/head/soft/emt/phys(src)
+ new /obj/item/clothing/under/rank/medical/purple(src)
+ new /obj/item/clothing/under/yogs/rank/physician/white(src)
+ new /obj/item/clothing/under/yogs/rank/physician/white/skirt(src)
+ new /obj/item/clothing/suit/toggle/labcoat/physician(src)
+ new /obj/item/clothing/head/beret/med/phys(src)
+ new /obj/item/clothing/head/beret/corpsec/phys(src)
diff --git a/yogstation/code/modules/clothing/head/jobs.dm b/yogstation/code/modules/clothing/head/jobs.dm
index 9c4a34314879..bbe15e1167f0 100644
--- a/yogstation/code/modules/clothing/head/jobs.dm
+++ b/yogstation/code/modules/clothing/head/jobs.dm
@@ -3,4 +3,33 @@
name = "clerk's hat"
desc = "It's a hat used by clerk's to help keep dust out of their eyes."
icon_state = "clerkcap"
- item_state = "clerkcap"
\ No newline at end of file
+ item_state = "clerkcap"
+
+//Mining Medic
+/obj/item/clothing/head/soft/emt/mining
+ name = "Mining Medic's cap"
+ desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."
+ icon = 'yogstation/icons/obj/clothing/hats.dmi'
+ alternate_worn_icon = 'yogstation/icons/mob/head.dmi'
+
+//Brig Physician
+/obj/item/clothing/head/soft/emt/phys
+ name = "Brig Physician's cap"
+ desc = "It's a baseball hat with a dark brown color and a reflective cross on the top. On the back are "
+ icon = 'yogstation/icons/obj/clothing/hats.dmi'
+ alternate_worn_icon = 'yogstation/icons/mob/head.dmi'
+ icon_state = "emtsecsoft"
+ item_color = "emtsec"
+
+/obj/item/clothing/head/beret/med/phys
+ name = "Brig Physician's beret"
+ desc = "A white beret with a red cross finely threaded into it. It has that sterile smell about it."
+ icon_state = "beret_phys"
+
+/obj/item/clothing/head/beret/corpsec/phys
+ name = "corporate physician beret"
+ desc = "A special black beret for the mundane life of a corporate brig physician."
+ icon = 'yogstation/icons/obj/clothing/hats.dmi'
+ alternate_worn_icon = 'yogstation/icons/mob/head.dmi'
+ icon_state = "beret_corporate_phys"
+ armor = list("bio" = 20) //So it isnt a direct upgrade over the normal berret
diff --git a/yogstation/code/modules/clothing/suits/labcoat.dm b/yogstation/code/modules/clothing/suits/labcoat.dm
index a5a9fb20a149..ad5ce6b5b8c1 100644
--- a/yogstation/code/modules/clothing/suits/labcoat.dm
+++ b/yogstation/code/modules/clothing/suits/labcoat.dm
@@ -1,5 +1,23 @@
+//Mining Medic
/obj/item/clothing/suit/toggle/labcoat/emt/explorer
name = "mining medics jacket"
desc = "A protective jacket for medical emergencies on off-world planets. Has MM embrossed into it."
armor = list(melee = 10, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 0, fire = 50, acid = 50)
- allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals)
\ No newline at end of file
+ allowed = list(/obj/item/analyzer,/obj/item/stack/medical,/obj/item/dnainjector,/obj/item/reagent_containers/dropper,/obj/item/reagent_containers/syringe,/obj/item/reagent_containers/hypospray,/obj/item/healthanalyzer,/obj/item/flashlight/pen,/obj/item/reagent_containers/glass/bottle,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle,/obj/item/paper,/obj/item/melee/classic_baton/telescopic,/obj/item/soap,/obj/item/sensor_device,/obj/item/tank/internals)
+
+//Brig Physician
+/obj/item/clothing/suit/toggle/labcoat/emt/physician
+ name = "brig physicians jacket"
+ desc = "A protective jacket for medical emergencies on off-world planets. Has BP embrossed into it."
+ alternate_worn_icon = 'yogstation/icons/mob/suit.dmi'
+ icon = 'yogstation/icons/obj/clothing/suits.dmi'
+ icon_state = "labcoat_emtsec"
+ item_color = "labcoat_emtsec"
+
+/obj/item/clothing/suit/toggle/labcoat/physician
+ name = "brig physician's labcoat"
+ desc = "A white labcoat with red medical crosses. Has BP embrossed into it."
+ alternate_worn_icon = 'yogstation/icons/mob/suit.dmi'
+ icon = 'yogstation/icons/obj/clothing/suits.dmi'
+ icon_state = "labcoat_sec"
+ item_state = "labcoat_sec"
diff --git a/yogstation/code/modules/clothing/under/jobs/security.dm b/yogstation/code/modules/clothing/under/jobs/security.dm
index 8ca47839016c..40e680ae5b37 100644
--- a/yogstation/code/modules/clothing/under/jobs/security.dm
+++ b/yogstation/code/modules/clothing/under/jobs/security.dm
@@ -9,4 +9,36 @@
alt_covers_chest = TRUE
sensor_mode = 3
random_sensor = FALSE
- can_adjust = FALSE
\ No newline at end of file
+ can_adjust = FALSE
+
+//Brig Physician
+/obj/item/clothing/under/yogs/rank/physician
+ name = "brig physician's jumpsuit"
+ desc = "A verstile blue and white uniform honored to hard working brig physicians who help with injured prisoners and security personel."
+ icon_state = "recovery"
+ item_state = "recovery"
+ item_color = "recovery"
+ alt_covers_chest = TRUE
+ sensor_mode = 3
+ random_sensor = FALSE
+ mutantrace_variation = MUTANTRACE_VARIATION
+
+/obj/item/clothing/under/yogs/rank/physician/white
+ name = "white brig physician's jumpsuit"
+ desc = "A classic jumpsuit that connects you to your medsci brothers and sisters."
+ icon_state = "secwhite"
+ item_state = "secwhite"
+ item_color = "secwhite"
+ alt_covers_chest = FALSE
+ random_sensor = TRUE
+
+/obj/item/clothing/under/yogs/rank/physician/white/skirt
+ name = "white brig physician's jumpskirt"
+ desc = "A classic jumpskirt that connects you to your medsci brothers and sisters."
+ icon_state = "secwhite_skirt"
+ item_state = "secwhite_skirt"
+ item_color = "secwhite_skirt"
+ can_adjust = FALSE
+ body_parts_covered = CHEST|GROIN|ARMS
+ fitted = FEMALE_UNIFORM_TOP
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
\ No newline at end of file
diff --git a/yogstation/code/modules/jobs/job_types/brig_physician.dm b/yogstation/code/modules/jobs/job_types/brig_physician.dm
new file mode 100644
index 000000000000..a9411ab3d760
--- /dev/null
+++ b/yogstation/code/modules/jobs/job_types/brig_physician.dm
@@ -0,0 +1,49 @@
+/datum/job/brigphysician
+ title = "Brig Physician"
+ flag = BRIGPHYS
+ department_head = list("Chief Medical Officer")
+ department_flag = MEDSCI
+ faction = "Station"
+ total_positions = 1
+ spawn_positions = 1
+ supervisors = "the chief medical officer"
+ selection_color = "#d4ebf2"
+
+ outfit = /datum/outfit/job/brigphysician
+
+ alt_titles = list("Security Medic", "Security Medical Support", "Penitentiary Medical Care Unit", "Junior Brig Physician", "Detention Center Health Officer")
+
+ minimal_character_age = 24 // "According to age statistics published by the Association of American Medical Colleges, the average age among medical students who matriculated at U.S. medical schools in the 2017-2018 school year was 24"
+
+ access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS)
+ minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MECH_MEDICAL, ACCESS_BRIG_PHYS)
+ paycheck = PAYCHECK_MEDIUM
+ paycheck_department = ACCOUNT_MED
+ display_order = JOB_DISPLAY_ORDER_BRIG_PHYSICIAN
+
+ changed_maps = list("EclipseStation")
+
+/datum/job/brigphysician/proc/EclipseStationChanges()
+ total_positions = 2
+ spawn_positions = 1
+
+/datum/outfit/job/brigphysician
+ name = "Brig Physician"
+ jobtype = /datum/job/brigphysician
+
+ backpack_contents = list(/obj/item/roller = 1)
+ belt = /obj/item/pda/physician
+ ears = /obj/item/radio/headset/headset_medsec
+ glasses = /obj/item/clothing/glasses/hud/health/sunglasses
+ shoes = /obj/item/clothing/shoes/jackboots
+ uniform = /obj/item/clothing/under/yogs/rank/miner/medic
+ suit = /obj/item/clothing/suit/toggle/labcoat/emt/physician
+ l_hand = /obj/item/storage/firstaid/regular
+ gloves = /obj/item/clothing/gloves/color/latex
+ head = /obj/item/clothing/head/soft/emt/phys
+ backpack = /obj/item/storage/backpack/medic
+ satchel = /obj/item/storage/backpack/satchel/med
+ duffelbag = /obj/item/storage/backpack/duffelbag/med
+ box = /obj/item/storage/box/survival
+
+ implants = list(/obj/item/implant/mindshield)
diff --git a/yogstation/code/modules/jobs/job_types/mining_medic.dm b/yogstation/code/modules/jobs/job_types/mining_medic.dm
index 57538d9c0d39..dd52edcbac45 100644
--- a/yogstation/code/modules/jobs/job_types/mining_medic.dm
+++ b/yogstation/code/modules/jobs/job_types/mining_medic.dm
@@ -38,10 +38,12 @@
ears = /obj/item/radio/headset/headset_medcargo
glasses = /obj/item/clothing/glasses/hud/health/meson
shoes = /obj/item/clothing/shoes/workboots/mining
+ suit = /obj/item/clothing/suit/toggle/labcoat/emt/explorer
uniform = /obj/item/clothing/under/yogs/rank/miner/medic
l_hand = /obj/item/storage/firstaid/regular
- l_pocket = /obj/item/pda/medical
+ l_pocket = /obj/item/pda/miningmed
gloves = /obj/item/clothing/gloves/color/latex
+ head = /obj/item/clothing/head/soft/emt/mining
backpack = /obj/item/storage/backpack/medic
satchel = /obj/item/storage/backpack/satchel/med
duffelbag = /obj/item/storage/backpack/duffelbag/med
diff --git a/yogstation/icons/mob/head.dmi b/yogstation/icons/mob/head.dmi
index 1bbedc3b84a0..1231068674e9 100644
Binary files a/yogstation/icons/mob/head.dmi and b/yogstation/icons/mob/head.dmi differ
diff --git a/yogstation/icons/mob/hud.dmi b/yogstation/icons/mob/hud.dmi
index 91fab0be8113..f828bb621d86 100644
Binary files a/yogstation/icons/mob/hud.dmi and b/yogstation/icons/mob/hud.dmi differ
diff --git a/yogstation/icons/mob/landmarks.dmi b/yogstation/icons/mob/landmarks.dmi
index 182ea505ca75..38dc6a869ad4 100644
Binary files a/yogstation/icons/mob/landmarks.dmi and b/yogstation/icons/mob/landmarks.dmi differ
diff --git a/yogstation/icons/mob/suit.dmi b/yogstation/icons/mob/suit.dmi
index d10b0daf7dbc..861ea59e88f8 100644
Binary files a/yogstation/icons/mob/suit.dmi and b/yogstation/icons/mob/suit.dmi differ
diff --git a/yogstation/icons/mob/uniform.dmi b/yogstation/icons/mob/uniform.dmi
index e8d8bca391ec..0ef3ba9bd1a5 100644
Binary files a/yogstation/icons/mob/uniform.dmi and b/yogstation/icons/mob/uniform.dmi differ
diff --git a/yogstation/icons/obj/closet.dmi b/yogstation/icons/obj/closet.dmi
index c2312d010aba..09c275db35b2 100644
Binary files a/yogstation/icons/obj/closet.dmi and b/yogstation/icons/obj/closet.dmi differ
diff --git a/yogstation/icons/obj/clothing/hats.dmi b/yogstation/icons/obj/clothing/hats.dmi
index 8642d6386f59..b0fb99384c56 100644
Binary files a/yogstation/icons/obj/clothing/hats.dmi and b/yogstation/icons/obj/clothing/hats.dmi differ
diff --git a/yogstation/icons/obj/clothing/suits.dmi b/yogstation/icons/obj/clothing/suits.dmi
index 7e44d346c867..8e97be330a3c 100644
Binary files a/yogstation/icons/obj/clothing/suits.dmi and b/yogstation/icons/obj/clothing/suits.dmi differ
diff --git a/yogstation/icons/obj/clothing/uniforms.dmi b/yogstation/icons/obj/clothing/uniforms.dmi
index 7acea63a0ee9..66fd8c5f8b61 100644
Binary files a/yogstation/icons/obj/clothing/uniforms.dmi and b/yogstation/icons/obj/clothing/uniforms.dmi differ