54321

code/datums/outfits/jobs/command.dm

@@ -3,7 +3,7 @@
 	name = OUTFIT_JOB_NAME("Captain")
 
 	uniform = /obj/item/clothing/under/rank/captain
-	shoes = /obj/item/clothing/shoes/brown
+	shoes = /obj/item/clothing/shoes/laceup
 	head = /obj/item/clothing/head/caphat
 	glasses = /obj/item/clothing/glasses/sunglasses
 
@@ -28,7 +28,7 @@
 	name = OUTFIT_JOB_NAME("Head of Personnel")
 
 	uniform = /obj/item/clothing/under/rank/head_of_personnel
-	shoes = /obj/item/clothing/shoes/brown
+	shoes = /obj/item/clothing/shoes/laceup
 
 	l_ear = /obj/item/device/radio/headset/heads/hop
 	belt = /obj/item/device/pda/heads/hop

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

@@ -21,9 +21,9 @@
 		new /obj/item/weapon/gun/energy/gun/head(src)
 
 	new /obj/item/clothing/accessory/armor(src)
-	new /obj/item/clothing/suit/captunic(src)
-	new /obj/item/clothing/suit/captunic/capjacket(src)
-	new /obj/item/clothing/head/helmet/cap(src)
+	new /obj/item/clothing/suit/capjacket(src)
+	new /obj/item/clothing/head/caphat/alt(src)
+	new /obj/item/clothing/shoes/laceup(src)
 	new /obj/item/clothing/under/rank/captain(src)
 	new /obj/item/clothing/suit/armor/vest(src)
 	new /obj/item/weapon/cartridge/captain(src)

code/modules/cargo/prices.dm

@@ -97,7 +97,7 @@
 /obj/item/clothing/head/helmet/price = 3000
 /obj/item/clothing/head/helmet/gladiator/price = 432
 /obj/item/clothing/head/helmet/HoS/dermal/price = 12888
-/obj/item/clothing/head/helmet/cap/price = 3866
+/obj/item/clothing/head/caphat/price = 3866
 /obj/item/clothing/head/helmet/helmet_of_justice/price = 9166
 /obj/item/clothing/head/helmet/space/price = 8700
 /obj/item/clothing/head/helmet/space/rig/price = 12300
@@ -123,7 +123,7 @@
 /obj/item/clothing/suit/armor/vest/reactive/price = 50000
 /obj/item/clothing/suit/armor/swat/price = 33500
 /obj/item/clothing/suit/armor/tactical/price = 9990
-/obj/item/clothing/suit/captunic/price = 6000
+/obj/item/clothing/suit/capjacket/price = 6000
 /obj/item/clothing/suit/ianshirt/price = 3000
 /obj/item/clothing/suit/space/price = 15000
 /obj/item/clothing/suit/space/rig/price = 20000

code/modules/clothing/gloves/miscellaneous.dm

@@ -2,6 +2,7 @@
 	desc = "Regal blue gloves, with a nice gold trim. Swanky."
 	name = "captain's gloves"
 	icon_state = "captain"
+	item_state_world = "captain_world"
 	item_state = "egloves"
 	cold_protection = ARMS
 	min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE

code/modules/clothing/head/jobs.dm

@@ -14,26 +14,18 @@
 	icon_state = "sushiband"
 	item_state = "sushiband"
 
-//Captain: This probably shouldn't be space-worthy
+//Captain
 /obj/item/clothing/head/caphat
 	name = "captain's hat"
-	icon_state = "captain"
-	desc = "It's good being the king."
+	icon_state = "caphat"
 	item_state = "caphat"
+	item_state_world = "caphat_world"
+	desc = "It's good being the king."
 	siemens_coefficient = 0.9
 
-//Captain: This probably shouldn't be space-worthy
-/obj/item/clothing/head/helmet/cap
-	name = "captain's cap"
-	desc = "You fear to wear it for the negligence it brings."
-	icon_state = "capcap"
-	flags_inv = 0
-	body_parts_covered = HEAD
-	cold_protection = HEAD
-	min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
-	siemens_coefficient = 0.9
-	force = 0
-	hitsound = list()
+/obj/item/clothing/head/caphat/alt
+	icon_state = "caphat_alt"
+	item_state_world = "caphat_alt_world"
 
 //Chaplain
 /obj/item/clothing/head/chaplain_hood

code/modules/clothing/suits/jobs.dm

@@ -13,20 +13,16 @@
 	allowed = list (/obj/item/weapon/reagent_containers/spray/plantbgone,/obj/item/device/plant_analyzer,/obj/item/seeds,/obj/item/nutrient,/obj/item/weapon/minihoe)
 
 //Captain
-/obj/item/clothing/suit/captunic
-	name = "captain's parade tunic"
-	desc = "Worn by a Captain to show their class. Also has some space for armor plate."
-	icon_state = "captunic"
+
+/obj/item/clothing/suit/capjacket
+	name = "captain's uniform jacket"
+	desc = "A formal jacket for captain use. Also has some space for armor plate."
+	icon_state = "capjacket"
 	item_state = "bio_suit"
+	item_state_world = "capjacket_world"
 	valid_accessory_slots = list("armband", "decor", "armor")
 	restricted_accessory_slots = list("armband", "armor")
 	body_parts_covered = UPPER_TORSO|ARMS
-	flags_inv = HIDEJUMPSUIT
-
-/obj/item/clothing/suit/captunic/capjacket
-	name = "captain's uniform jacket"
-	desc = "A less formal jacket for everyday captain use. Also has some space for armor plate."
-	icon_state = "capjacket"
 
 //Chaplain
 /obj/item/clothing/suit/chaplain_hoodie

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

@@ -18,6 +18,7 @@
 	icon_state = "captain"
 	item_state = "captain"
 	flags = ONESIZEFITSALL|HEAR_TALK
+	item_state_world = "captain_world"
 
 
 /obj/item/clothing/under/rank/cargo
@@ -92,13 +93,15 @@
 	name = "head of personnel's jumpsuit"
 	icon_state = "hop"
 	item_state = "hop"
+	item_state_world = "hop_world"
 	flags = ONESIZEFITSALL|HEAR_TALK
 
 /obj/item/clothing/under/rank/head_of_personnel_whimsy
 	desc = "A blue jacket and red tie, with matching red cuffs! Snazzy. Wearing this makes you feel more important than your job title does."
 	name = "head of personnel's suit"
 	icon_state = "hopwhimsy"
 	item_state = "hopwhimsy"
+	item_state_world = "hopwhimsy_world"
 	flags = ONESIZEFITSALL|HEAR_TALK
 
 

code/modules/clothing/under/miscellaneous.dm

@@ -530,16 +530,19 @@
 	item_state = "mafia_tan"
 
 /obj/item/clothing/under/rank/capcamsole
-	desc = "It's a blue feminine camisole with some gold markings denoting the rank of \"Captain\" and gold aquila on it."
+	desc = "It's a blue camisole with some gold markings denoting the rank of \"Captain\" and gold aquila on it."
 	name = "captain's camisole"
 	icon_state = "capcamisole"
 	item_state = "capcamisole"
+	item_state_world = "capcamisole_world"
+	flags = ONESIZEFITSALL|HEAR_TALK
 
 /obj/item/clothing/under/rank/goodman_shirt
 	name = "head of personnel's suit"
 	desc = "A good suit for good men."
-	icon_state = "gmshirt"
-	item_state = "gmshirt"
+	icon_state = "gm_shirt"
+	item_state = "gm_shirt"
+	item_state_world = "gmshirt_world"
 
 /obj/item/clothing/under/rank/centcom/representative
 	desc = "Gold trim on space-black cloth, this uniform displays the rank of \"Ensign\" and bears \"N.C.V. Fearless CV-286\" on the left shounder."