Some more brig physician fixes, and tweaks (#12038)

* agh

* agh

* aaa

* shoudl be done

* empty commit

* 5,4

code/controllers/subsystem/department.dm

@@ -321,7 +321,6 @@ SUBSYSTEM_DEF(department)
 	jobs = list(JOB_NAME_CHIEFMEDICALOFFICER,
 				JOB_NAME_MEDICALDOCTOR,
 				JOB_NAME_PARAMEDIC,
-				JOB_NAME_BRIGPHYSICIAN,
 				JOB_NAME_CHEMIST,
 				JOB_NAME_GENETICIST,
 				JOB_NAME_VIROLOGIST,
@@ -349,6 +348,7 @@ SUBSYSTEM_DEF(department)
 				JOB_NAME_WARDEN,
 				JOB_NAME_DETECTIVE,
 				JOB_NAME_SECURITYOFFICER,
+				JOB_NAME_BRIGPHYSICIAN,
 				JOB_NAME_DEPUTY)
 
 	pref_category_name = DEPT_NAME_SECURITY

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -66,16 +66,16 @@
 	icon_state = "sci_cypherkey"
 	channels = list(RADIO_CHANNEL_SCIENCE = 1)
 
-/obj/item/encryptionkey/headset_medsec
-	name = "medical-security encryption key"
-	icon_state = "medsec_cypherkey"
-	channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SECURITY = 1)
-
 /obj/item/encryptionkey/headset_srvsec
 	name = "law and order radio encryption key"
 	icon_state = "srvsec_cypherkey"
 	channels = list(RADIO_CHANNEL_SERVICE = 1, RADIO_CHANNEL_SECURITY = 1)
 
+/obj/item/encryptionkey/headset_medsec
+	name = "medical-security encryption key"
+	icon_state = "medsec_cypherkey"
+	channels = list(RADIO_CHANNEL_MEDICAL = 1, RADIO_CHANNEL_SECURITY = 1)
+
 /obj/item/encryptionkey/headset_com
 	name = "command radio encryption key"
 	icon_state = "com_cypherkey"

code/game/objects/items/devices/radio/headset.dm

@@ -119,20 +119,20 @@ GLOBAL_LIST_INIT(channel_tokens, list(
 	icon_state = "sec_headset"
 	worn_icon_state = "sec_headset"
 
-/obj/item/radio/headset/headset_medsec
-	name = "medical-security radio headset"
-	desc = "Used to hear how many security officers need to be stiched back together."
-	icon_state = "medsec_headset"
-	worn_icon_state = "sec_headset"
-	keyslot = new /obj/item/encryptionkey/headset_medsec
-
 /obj/item/radio/headset/headset_sec/alt
 	name = "security bowman headset"
 	desc = "This is used by your elite security force. Protects ears from flashbangs."
 	icon_state = "sec_headset_alt"
 	worn_icon_state = "sec_headset_alt"
 	bang_protect = 1
 
+/obj/item/radio/headset/headset_medsec
+	name = "medical-security radio headset"
+	desc = "Used to hear how many security officers need to be stiched back together."
+	icon_state = "medsec_headset"
+	worn_icon_state = "sec_headset"
+	keyslot = new /obj/item/encryptionkey/headset_medsec
+
 /obj/item/radio/headset/headset_eng
 	name = "engineering radio headset"
 	desc = "When the engineers wish to chat like girls."

code/game/objects/items/storage/firstaid.dm

@@ -207,6 +207,21 @@
 		)
 	generate_items_inside(items_inside,src)
 
+/obj/item/storage/firstaid/medical/physician
+	name = "brig physicians bag"
+	desc = "A specialized doctors bag, specifically meant for healing security when they get beaten to death by a unarmed prisoner."
+
+/obj/item/storage/firstaid/medical/physician/PopulateContents()
+	var/static/items_inside = list(
+		/obj/item/stack/medical/gauze = 2,
+		/obj/item/stack/medical/bruise_pack = 2,
+		/obj/item/stack/medical/ointment = 2,
+		/obj/item/reagent_containers/hypospray/medipen/ = 2,
+		/obj/item/storage/pill_bottle/kelotane = 1,
+		/obj/item/storage/pill_bottle/bicaridine = 1,
+		/obj/item/healthanalyzer = 1,)
+	generate_items_inside(items_inside,src)
+
 //First Aid kit (ancient)
 /obj/item/storage/firstaid/ancient
 	icon_state = "firstaid-old"

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -113,7 +113,6 @@
 /obj/structure/closet/secure_closet/brig_physician/PopulateContents()
 	..()
 	new /obj/item/defibrillator/loaded(src)
-	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/firstaid/toxin(src)
@@ -125,6 +124,7 @@
 	new /obj/item/clothing/under/rank/brig_physician(src)
 	new /obj/item/clothing/under/rank/brig_physician/skirt(src)
 	new /obj/item/clothing/suit/hooded/wintercoat/brigphys(src)
+	new /obj/item/wallframe/defib_mount(src)
 
 /obj/structure/closet/secure_closet/hos
 	name = "\proper head of security's locker"

code/modules/jobs/job_types/brig_physician.dm

@@ -4,7 +4,7 @@
 	department_for_prefs = DEPT_NAME_SECURITY
 	department_head_for_prefs = JOB_NAME_HEADOFSECURITY
 	department_head = list(JOB_NAME_HEADOFSECURITY)
-	supervisors = "head of security"
+	supervisors = "the head of security"
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -17,9 +17,9 @@
 	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
-	payment_per_department = list(ACCOUNT_MED_ID = PAYCHECK_MEDIUM)
+	departments = DEPT_BITFLAG_SEC
+	bank_account_department = ACCOUNT_MED_BITFLAG | ACCOUNT_SEC_BITFLAG
+	payment_per_department = list(ACCOUNT_SEC_ID = PAYCHECK_MEDIUM)
 	mind_traits = list(TRAIT_MEDICAL_METABOLISM)
 
 	display_order = JOB_DISPLAY_ORDER_BRIG_PHYS
@@ -44,8 +44,9 @@
 	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
 	suit = /obj/item/clothing/suit/hazardvest/brig_physician
 	gloves = /obj/item/clothing/gloves/color/latex/nitrile
-	suit_store = /obj/item/storage/firstaid/medical
+	suit_store = /obj/item/storage/firstaid/medical/physician
 	l_pocket = /obj/item/flashlight/seclite
+	r_pocket = /obj/item/assembly/flash
 	head = /obj/item/clothing/head/soft/sec/brig_physician
 
 	backpack = /obj/item/storage/backpack/medic