diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 525063c240cd4..03b17c286750f 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -17382,6 +17382,9 @@
 /obj/structure/window/reinforced{
 	dir = 8
 	},
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white,
 /area/security/brig)
 "dHD" = (
diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm
index 429be5061eea2..971e9078ca558 100644
--- a/_maps/map_files/CorgStation/CorgStation.dmm
+++ b/_maps/map_files/CorgStation/CorgStation.dmm
@@ -10826,6 +10826,9 @@
 /obj/effect/turf_decal/tile/blue/anticorner/contrasted{
 	dir = 4
 	},
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white,
 /area/security/brig/medbay)
 "dqj" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 8588a516f44f5..c58b4878d5801 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -33760,6 +33760,9 @@
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/red/opposingcorners,
 /obj/item/storage/firstaid/regular,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white,
 /area/security/brig/medbay)
 "eUW" = (
@@ -80332,10 +80335,10 @@
 /turf/open/floor/plating,
 /area/crew_quarters/heads/hor)
 "tDm" = (
-/obj/structure/table,
-/obj/item/storage/box/bodybags,
-/obj/item/clothing/gloves/color/latex,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/machinery/vending/medical{
+	pixel_x = -2
+	},
 /turf/open/floor/iron/dark,
 /area/security/brig/medbay)
 "tDJ" = (
@@ -94983,6 +94986,8 @@
 "yfc" = (
 /obj/structure/bodycontainer/morgue,
 /obj/effect/turf_decal/bot,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/storage/box/bodybags,
 /turf/open/floor/iron/tech,
 /area/security/brig/medbay)
 "yfd" = (
diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm
index 0187cebdd81a4..3dc4ee0e86670 100644
--- a/_maps/map_files/FlandStation/FlandStation.dmm
+++ b/_maps/map_files/FlandStation/FlandStation.dmm
@@ -34494,14 +34494,9 @@
 "iNl" = (
 /obj/effect/turf_decal/bot,
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
-/obj/structure/closet/crate,
-/obj/item/reagent_containers/spray/cleaner{
-	pixel_x = -3;
-	pixel_y = 2
+/obj/machinery/vending/medical{
+	pixel_x = -2
 	},
-/obj/item/clothing/mask/surgical,
-/obj/item/clothing/gloves/color/latex,
-/obj/item/reagent_containers/blood/OPlus,
 /turf/open/floor/iron/techmaint,
 /area/security/main)
 "iNo" = (
@@ -42237,6 +42232,9 @@
 /obj/structure/cable/yellow{
 	icon_state = "2-4"
 	},
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white,
 /area/security/main)
 "kKQ" = (
@@ -47529,6 +47527,13 @@
 	c_tag = "Security - Medbay"
 	},
 /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted,
+/obj/item/reagent_containers/blood/OPlus,
+/obj/item/clothing/gloves/color/latex,
+/obj/item/clothing/mask/surgical,
+/obj/item/reagent_containers/spray/cleaner{
+	pixel_x = -3;
+	pixel_y = 2
+	},
 /turf/open/floor/iron/techmaint,
 /area/security/main)
 "lZt" = (
diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm
index 658c7ec3a4185..2434aa7bd181c 100644
--- a/_maps/map_files/KiloStation/KiloStation.dmm
+++ b/_maps/map_files/KiloStation/KiloStation.dmm
@@ -66328,11 +66328,11 @@
 /obj/effect/turf_decal/tile/red/anticorner/contrasted{
 	dir = 1
 	},
-/obj/structure/table/glass,
-/obj/item/storage/firstaid/regular,
-/obj/item/reagent_containers/syringe,
 /obj/machinery/firealarm/directional/west,
 /obj/machinery/airalarm/directional/north,
+/obj/machinery/vending/medical{
+	pixel_x = -2
+	},
 /turf/open/floor/iron/showroomfloor,
 /area/security/main)
 "twq" = (
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index f76bd4670fc7f..2f6251821af00 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -20089,9 +20089,6 @@
 /turf/open/space/basic,
 /area/space)
 "cVk" = (
-/obj/item/bedsheet,
-/obj/structure/bed,
-/obj/machinery/iv_drip,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 9
 	},
@@ -20101,6 +20098,9 @@
 /obj/effect/turf_decal/tile/red/half{
 	dir = 8
 	},
+/obj/machinery/computer/operating{
+	dir = 1
+	},
 /turf/open/floor/iron/white/smooth_half,
 /area/security/brig)
 "cVw" = (
@@ -41216,6 +41216,10 @@
 	},
 /turf/open/floor/iron/white,
 /area/medical/chemistry)
+"kBJ" = (
+/obj/machinery/iv_drip,
+/turf/open/floor/iron/white/textured_large,
+/area/security/brig)
 "kBS" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
 	dir = 4
@@ -42168,6 +42172,10 @@
 /obj/effect/turf_decal/tile/red/half{
 	dir = 1
 	},
+/obj/item/stack/medical/gauze,
+/obj/item/clothing/under/rank/medical/doctor/purple{
+	pixel_y = -4
+	},
 /turf/open/floor/iron/white/smooth_half{
 	dir = 1
 	},
@@ -59829,8 +59837,8 @@
 /turf/open/floor/iron,
 /area/medical/chemistry)
 "rrR" = (
-/obj/structure/bodycontainer/morgue{
-	dir = 2
+/obj/machinery/vending/medical{
+	pixel_x = -2
 	},
 /turf/open/floor/iron/dark,
 /area/security/brig)
@@ -60842,7 +60850,6 @@
 /turf/open/floor/iron/dark/smooth_half,
 /area/security/brig)
 "rMU" = (
-/obj/structure/bed/roller,
 /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
 	dir = 4
 	},
@@ -60852,6 +60859,10 @@
 /obj/effect/turf_decal/tile/red/half{
 	dir = 8
 	},
+/obj/structure/table/optable,
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/white/smooth_half,
 /area/security/brig)
 "rMV" = (
@@ -77406,15 +77417,13 @@
 /turf/open/floor/iron/dark,
 /area/science/shuttledock)
 "xGs" = (
-/obj/structure/rack,
 /obj/machinery/camera/directional/south{
 	c_tag = "Brig - Infirmary"
 	},
-/obj/item/clothing/under/rank/medical/doctor/purple{
-	pixel_y = -4
-	},
-/obj/item/stack/medical/gauze,
 /obj/effect/turf_decal/tile/red/half,
+/obj/structure/bodycontainer/morgue{
+	dir = 1
+	},
 /turf/open/floor/iron/white/smooth_half{
 	dir = 1
 	},
@@ -105540,7 +105549,7 @@ ajm
 fIy
 xXp
 qpd
-xXp
+kBJ
 rMU
 ahx
 gTN
diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm
index 1b9c892b8135b..55e1275600a51 100644
--- a/_maps/map_files/RadStation/RadStation.dmm
+++ b/_maps/map_files/RadStation/RadStation.dmm
@@ -57069,9 +57069,6 @@
 	},
 /area/science/research)
 "scM" = (
-/obj/machinery/stasis{
-	dir = 1
-	},
 /obj/machinery/defibrillator_mount{
 	pixel_x = -32
 	},
@@ -71006,6 +71003,9 @@
 /obj/machinery/light{
 	dir = 8
 	},
+/obj/item/storage/backpack/duffelbag/med/surgery{
+	pixel_y = 7
+	},
 /turf/open/floor/iron/dark,
 /area/security/brig/medbay)
 "wId" = (
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 13c6f3439349c..bd76affaddbca 100755
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -116,8 +116,10 @@
 	new /obj/item/blood_filter(src)
 	new /obj/item/radio/headset/headset_medsec(src)
 	new	/obj/item/storage/firstaid/regular(src)
-	new /obj/item/storage/pill_bottle/charcoal(src)
-	new /obj/item/storage/pill_bottle/kelotane(src)
+	new /obj/item/storage/firstaid/toxin(src)
+	new /obj/item/storage/firstaid/o2(src)
+	new /obj/item/storage/firstaid/brute(src)
+	new /obj/item/storage/firstaid/fire(src)
 	new /obj/item/storage/belt/medical(src)
 	new /obj/item/clothing/gloves/color/latex/nitrile(src)
 	new /obj/item/clothing/under/rank/brig_physician(src)
diff --git a/code/modules/jobs/job_types/brig_physician.dm b/code/modules/jobs/job_types/brig_physician.dm
index d17d7e6a77ff0..9f1a88f19f0be 100644
--- a/code/modules/jobs/job_types/brig_physician.dm
+++ b/code/modules/jobs/job_types/brig_physician.dm
@@ -3,8 +3,8 @@
 	description = "Tend to the health of Security Officers and Prisoners, help out at Medbay if you have free time."
 	department_for_prefs = DEPT_NAME_SECURITY
 	department_head_for_prefs = JOB_NAME_HEADOFSECURITY
-	department_head = list(JOB_NAME_CHIEFMEDICALOFFICER)
-	supervisors = "chief medical officer"
+	department_head = list(JOB_NAME_HEADOFSECURITY)
+	supervisors = "head of security"
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -14,8 +14,8 @@
 	exp_type = EXP_TYPE_CREW
 	outfit = /datum/outfit/job/brig_physician
 
-	base_access = list(ACCESS_BRIGPHYS, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MECH_MEDICAL)
-	extra_access = list()
+	base_access = list(ACCESS_BRIGPHYS, ACCESS_SEC_DOORS, ACCESS_COURT,  ACCESS_MECH_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE)
+	extra_access = list(ACCESS_MEDICAL, ACCESS_SURGERY)
 
 	departments = DEPT_BITFLAG_MED | DEPT_BITFLAG_SEC
 	bank_account_department = ACCOUNT_MED_BITFLAG