Fixes NT Sec Skirt, Brig Phys Clothes + Modifies Brig Phys Outfits

code/modules/clothing/head/soft_caps.dm

@@ -125,10 +125,6 @@
 	strip_delay = 60
 	dog_fashion = null
 
-/obj/item/clothing/head/soft/sec/brig_phys
-	name = "security medic cap"
-	icon_state = "secmedsoft"
-
 /obj/item/clothing/head/soft/paramedic
 	name = "paramedic cap"
 	desc = "It's a baseball hat with a dark turquoise color and a reflective cross on the top."

code/modules/clothing/under/jobs/security.dm

@@ -85,26 +85,26 @@
 // Brig Physician //
 /obj/item/clothing/under/rank/security/brig_phys
 	name = "brig physician jumpsuit"
-	desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+	desc = "A lightly armored jumpsuit."
 	icon_state = "brig_phys"
 
 /obj/item/clothing/under/rank/security/brig_phys/skirt
 	name = "brig physician jumpskirt"
-	desc = "A lightly armored jumpsuit worn by Nanotrasen's Asset Protection Medical Corps."
+	desc = "A lightly armored jumpskirt."
 	icon_state = "brig_phys_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	can_adjust = FALSE
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
 /obj/item/clothing/under/rank/security/brig_phys/nt
 	name = "security medic's uniform"
-	desc = "A lightly armored uniform worn by medics ensuring the health of prisoners."
+	desc = "A lightly armored uniform worn by Nanotrasen's Asset Protection Medical Corps."
 	icon_state = "rbrig_phys"
 	item_state = "r_suit"
 
 /obj/item/clothing/under/rank/security/brig_phys/nt/skirt
 	name = "security medic's uniform"
-	desc = "A lightly armored uniform, with a skirt, worn by medics ensuring the health of prisoners."
+	desc = "A lightly armored uniform, with a skirt, worn by Nanotrasen's Asset Protection Medical Corps."
 	icon_state = "rbrig_phys_skirt"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
@@ -129,29 +129,18 @@
 
 /obj/item/clothing/under/rank/security/warden/nt
 	name = "warden's red security suit"
-	desc = "A formal security suit for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suit for wardens complete with Nanotrasen belt buckle."
 	icon_state = "rwarden"
 	item_state = "r_suit"
 
 /obj/item/clothing/under/rank/security/warden/nt/skirt
 	name = "warden's red suitskirt"
-	desc = "A formal security suitskirt for officers complete with Nanotrasen belt buckle."
+	desc = "A formal security suitskirt for wardens complete with Nanotrasen belt buckle."
 	icon_state = "rwarden_skirt"
 	item_state = "r_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
-/obj/item/clothing/under/rank/security/head_of_security/nt
-	name = "red head of security's jumpsuit"
-	icon_state = "rhos"
-	item_state = "r_suit"
-
-/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
-	name = "head of security's red jumpskirt"
-	desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
-	icon_state = "rhos_skirt"
-	body_parts_covered = CHEST|GROIN|ARMS
-	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
 // Head of Security //
 /obj/item/clothing/under/rank/security/head_of_security
@@ -172,6 +161,18 @@
 	can_adjust = FALSE
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 
+/obj/item/clothing/under/rank/security/head_of_security/nt
+	name = "red head of security's jumpsuit"
+	icon_state = "rhos"
+	item_state = "r_suit"
+
+/obj/item/clothing/under/rank/security/head_of_security/nt/skirt
+	name = "head of security's red jumpskirt"
+	desc = "A security jumpskirt decorated for those few with the dedication to achieve the position of Head of Security."
+	icon_state = "rhos_skirt"
+	body_parts_covered = CHEST|GROIN|ARMS
+	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
+
 /obj/item/clothing/under/rank/security/head_of_security/alt
 	name = "head of security's turtleneck"
 	desc = "A stylish alternative to the normal head of security jumpsuit, complete with tactical pants."
@@ -201,7 +202,7 @@
 // Prisoner //
 /obj/item/clothing/under/rank/prisoner
 	name = "prison jumpsuit"
-	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon = 'icons/obj/clothing/under/security.dmi'
 	icon_state = "prisoner"
 	item_state = "o_suit"
@@ -212,7 +213,7 @@
 
 /obj/item/clothing/under/rank/prisoner/skirt
 	name = "prison jumpskirt"
-	desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "prisoner_skirt"
 	item_state = "o_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
@@ -221,12 +222,12 @@
 
 /obj/item/clothing/under/rank/prisoner/protected_custody
 	name = "protected custody jumpsuit"
-	desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "protected_custody"
 
 /obj/item/clothing/under/rank/prisoner/protected_custody/skirt
 	name = "protected custody jumpskirt"
-	desc = "It's standardised Nanotrasen prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
+	desc = "It's standardised prisoner-wear worn by those in protected custody. Its suit sensors are stuck in the \"Fully On\" position."
 	icon_state = "protected_custody_skirt"
 	supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
 

code/modules/jobs/job_types/brig_physician.dm

@@ -12,36 +12,31 @@
 	display_order = JOB_DISPLAY_ORDER_BRIG_PHYS
 
 /datum/outfit/job/brig_phys
-	name = "Brig Physician"
+	name = "Brig Physician (Independent)"
 	job_icon = "brigphysician"
 	jobtype = /datum/job/brig_phys
 
 	belt = /obj/item/pda/brig_phys
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile
 	ears = /obj/item/radio/headset/headset_medsec/alt
 	uniform = /obj/item/clothing/under/rank/security/brig_phys
 	shoes = /obj/item/clothing/shoes/sneakers/white
-	glasses = /obj/item/clothing/glasses/hud/health/sunglasses
-	suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
-	alt_suit = /obj/item/clothing/suit/armor/vest/security/brig_phys
+	glasses = /obj/item/clothing/glasses/hud/health
+	suit = /obj/item/clothing/suit/toggle/labcoat
+	head = /obj/item/clothing/head/beret/sec/brig_phys
+	alt_suit = null
 	dcoat = /obj/item/clothing/suit/hooded/wintercoat/security
 	suit_store = /obj/item/flashlight/pen
-	l_hand = /obj/item/storage/firstaid/regular
-	head = /obj/item/clothing/head/soft/sec/brig_phys
+
 	implants = list(/obj/item/implant/mindshield)
 
 
-/datum/outfit/job/brig_phys/securitymedic
-	name = "Brig Physician (Security Medic)"
+/datum/outfit/job/brig_phys/nanotrasen
+	name = "Brig Physician (Nanotrasen)"
 
 	uniform = /obj/item/clothing/under/rank/security/brig_phys/nt
+	gloves = /obj/item/clothing/gloves/color/latex/nitrile/evil
+	head = /obj/item/clothing/head/soft/sec
+	shoes = /obj/item/clothing/shoes/jackboots
 	suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
-	suit_store = /obj/item/flashlight/pen
-	alt_suit = null
-
-/datum/outfit/job/brig_phys/executionsupervisor
-	name = "Brig Physician (Execution Supervisor)"
-
-	uniform = /obj/item/clothing/under/rank/security/brig_phys/nt
-	suit = /obj/item/clothing/suit/toggle/labcoat/brig_phys
-	l_pocket = /obj/item/reagent_containers/syringe
-	alt_suit = null
+	alt_suit = /obj/item/clothing/suit/armor/vest/security/brig_phys