Command Overhaul - By GooglyFox

.vscode/settings.json

@@ -3,7 +3,6 @@
 	"editor.autoIndent": "keep",
 	"editor.insertSpaces": false,
 	"editor.detectIndentation": false,
-	"editor.renderIndentGuides": true,
 	"editor.wrappingIndent": "indent",
 	"editor.renderWhitespace": "all",
 	"editor.trimAutoWhitespace": true,
@@ -47,5 +46,6 @@
 		"gitlens.codeLens.scopes": [
 			"document"
 		]
-	}
+	},
+	"editor.guides.indentation": true
 }

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

@@ -24,8 +24,8 @@
 	new /obj/item/clothing/suit/armor/vest/capcarapace(src)
 	new /obj/item/clothing/head/caphat(src)
 	new /obj/item/clothing/under/rank/command/captain/parade(src)
-	new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
-	new /obj/item/clothing/head/caphat/parade(src)
+	new /obj/item/clothing/suit/armor/vest/capcarapace(src)
+	new /obj/item/clothing/head/caphat/nt(src)
 	new /obj/item/clothing/suit/captunic(src)
 	new /obj/item/clothing/head/crown/fancy(src)
 	new /obj/item/cartridge/captain(src)

code/modules/clothing/head/jobs.dm

@@ -27,22 +27,33 @@
 //Captain
 /obj/item/clothing/head/caphat
 	name = "captain's peaked cap"
+	desc = "Worn only by Captains with an abundance of class."
+	icon_state = "caphat"
+	item_state = "that"
+	flags_inv = 0
+	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	strip_delay = 60
+	dog_fashion = /datum/dog_fashion/head/captain
+
+/obj/item/clothing/head/caphat
+	name = "captain's hat"
 	desc = "It's good being the king."
-	icon_state = "captain"
+	icon_state = "captain_nt"
 	item_state = "that"
 	flags_inv = 0
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60
 	dog_fashion = /datum/dog_fashion/head/captain
 
-//Captain: This is no longer space-worthy
-/obj/item/clothing/head/caphat/parade
+/obj/item/clothing/head/caphat/nt
 	name = "captain's parade cap"
 	desc = "Worn only by Captains with an abundance of class."
-	icon_state = "capcap"
-
-	dog_fashion = null
-
+	icon_state = "caphat_nt"
+	item_state = "that"
+	flags_inv = 0
+	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	strip_delay = 60
+	dog_fashion = /datum/dog_fashion/head/captain
 
 //Head of Personnel
 /obj/item/clothing/head/hopcap
@@ -52,8 +63,25 @@
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	dog_fashion = /datum/dog_fashion/head/head_of_personnel
 
+/obj/item/clothing/head/ltcap
+	name = "lieutenant's cap"
+	icon_state = "ltcap"
+	desc = "Sometimes you gotta be the underdog in something."
+	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	dog_fashion = /datum/dog_fashion/head/head_of_personnel
+
 /obj/item/clothing/head/hopcap/nt
+	name = "head of personnel's cap"
 	icon_state = "hopcap_nt"
+	desc = "The symbol of true bureaucratic micromanagement."
+	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+	dog_fashion = /datum/dog_fashion/head/head_of_personnel
+
+/obj/item/clothing/head/ltcap/nt
+	name = "lieutenant's cap"
+	icon_state = "ltcap_nt"
+	desc = "Sometimes you gotta be the underdog in something."
+	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	dog_fashion = /datum/dog_fashion/head/head_of_personnel
 
 //Chaplain

code/modules/clothing/suits/armor.dm

@@ -105,17 +105,47 @@
 	dog_fashion = null
 	resistance_flags = FIRE_PROOF
 
+/obj/item/clothing/suit/armor/vest/comcarapace
+	name = "captain's carapace"
+	desc = "A fireproof armored chestpiece reinforced with ceramic plates and plasteel pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."
+	icon_state = "comcarapace"
+	item_state = "armor"
+	body_parts_covered = CHEST|GROIN
+	armor = list("melee" = 55, "bullet" = 50, "laser" = 55, "energy" = 50, "bomb" = 30, "bio" = 10, "rad" = 10, "fire" = 100, "acid" = 100)
+	dog_fashion = null
+	resistance_flags = FIRE_PROOF
+
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate
 	name = "syndicate captain's vest"
 	desc = "A sinister looking vest of advanced armor worn over a black and red fireproof jacket. The gold collar and shoulders denote that this belongs to a high ranking syndicate officer."
 	icon_state = "syndievest"
 
-/obj/item/clothing/suit/armor/vest/capcarapace/alt
+/obj/item/clothing/suit/armor/vest/capcarapace/formal/nt
 	name = "captain's parade jacket"
 	desc = "For when an armoured vest isn't fashionable enough."
 	icon_state = "capformal"
 	item_state = "capspacesuit"
 
+/obj/item/clothing/suit/armor/vest/comcarapace/formal
+	name = "captain's formal jacket"
+	desc = "For when an armoured vest isn't fashionable enough."
+	icon_state = "comformal"
+	item_state = "comspacesuit"
+
+/obj/item/clothing/suit/armor/vest/hop/nt
+	name = "head of personnel's coat"
+	desc = "A stylish coat given to a Head of Personnel."
+	icon_state = "hopcoat_nt"
+	item_state = "b_suit"
+	dog_fashion = null
+
+/obj/item/clothing/suit/armor/vest/hop
+	name = "head of personnel's coat"
+	desc = "A stylish coat given to a Head of Personnel."
+	icon_state = "hopcoat"
+	item_state = "w_suit"
+	dog_fashion = null
+
 /obj/item/clothing/suit/armor/riot
 	name = "riot suit"
 	desc = "A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Helps the wearer resist shoving in close quarters."

code/modules/clothing/suits/miscellaneous.dm

@@ -573,6 +573,36 @@
 	icon_state = "winterhood_captain"
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 25, "rad" = 10, "fire" = 15, "acid" = 50)
 
+/obj/item/clothing/suit/hooded/wintercoat/command
+	name = "captain's winter coat"
+	icon_state = "coatcommand"
+	item_state = "coatcommand"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 25, "rad" = 10, "fire" = 15, "acid" = 50)
+	hoodtype = /obj/item/clothing/head/hooded/winterhood/command
+
+/obj/item/clothing/suit/hooded/wintercoat/command/Initialize()
+	. = ..()
+	allowed = GLOB.security_wintercoat_allowed
+
+/obj/item/clothing/head/hooded/winterhood/command
+	icon_state = "winterhood_command"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 25, "rad" = 10, "fire" = 15, "acid" = 50)
+
+/obj/item/clothing/suit/hooded/wintercoat/hop
+	name = "captain's winter hop"
+	icon_state = "coathop"
+	item_state = "coathop"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 25, "rad" = 10, "fire" = 15, "acid" = 50)
+	hoodtype = /obj/item/clothing/head/hooded/winterhood/command
+
+/obj/item/clothing/suit/hooded/wintercoat/hop/Initialize()
+	. = ..()
+	allowed = GLOB.security_wintercoat_allowed
+
+/obj/item/clothing/head/hooded/winterhood/hop
+	icon_state = "winterhood_hop"
+	armor = list("melee" = 30, "bullet" = 30, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 25, "rad" = 10, "fire" = 15, "acid" = 50)
+
 /obj/item/clothing/suit/hooded/wintercoat/security
 	name = "security winter coat"
 	icon_state = "coatsecurity"

whitesands/code/modules/clothing/head/berets.dm

@@ -177,15 +177,16 @@
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 90
 
-/obj/item/clothing/head/beret/command
-	name = "command beret"
-	desc = "A modest blue command beret with a silver rank insignia. Smells of power and the sweat of assistants."
-	icon_state = "beret_com"
-	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
-	strip_delay = 90
-
 /obj/item/clothing/head/beret/lt
 	name = "officer beret"
 	desc = "A showy lieutenants's beret. Smells of spilled coffee and crushed dreams."
-	icon_state = "beret_com"
-	armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 10, "rad" = 10, "bio" = 5, "rad" = 5, "fire" = 5, "rad" = 30)
+	icon_state = "beret_lt"
+	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
+	strip_delay = 90
+
+/obj/item/clothing/head/beret/com
+	name = "command beret"
+	desc = "A bland command beret. Smells of boring paperwork and ink."
+	icon_state = "beret_con"
+	armor = list("melee" = 10, "bullet" = 5, "laser" = 10, "energy" = 15, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 25, "acid" = 25)
+	strip_delay = 90

whitesands/code/modules/clothing/suits/armor.dm

@@ -1,15 +1,9 @@
 /obj/item/clothing/suit/armor/vest/lieutenant
 	name = "lieutenant's armor"
 	desc = "An armored vest with the lieutenant's insignia imprinted on it."
-	icon_state = "blueshield"
+	icon_state = "armor_alt_lieutenant"
 	item_state = "blueshield"
 
-/obj/item/clothing/suit/armor/vest/hop
-	name = "head of personnel's parade jacket"
-	desc = "For when an armoured vest isn't fashionable enough."
-	icon_state = "hopformal"
-	item_state = "capspacesuit"
-
 /obj/item/clothing/suit/armor/vest/syndie
 	name = "\improper Syndicate plate carrier"
 	desc = "A plate carrier vest commonly used by Syndicate forces, regardless of affiliation. Has a few attached pouches."
@@ -22,3 +16,9 @@
 	icon_state = "scraparmor"
 	item_state = "scraparmor"
 	armor = list(melee = 5)
+
+/obj/item/clothing/suit/armor/vest/capcarapace/formal/nt
+	name = "captain's coat"
+	desc = "Worn by a Captain to show their class."
+	icon_state = "capcoat"
+	item_state = "capspacesuit"