Captain's Beret is brought up to the modern captain's palette colors,…

… captain's clothes get a protection lookover. (#667)

* Beret is brought to its new colors, buffs cap vest and cap wintercoat

* not modular, downstream what am i smoking

code/modules/clothing/head/jobs.dm

@@ -130,7 +130,7 @@
 	icon_state = "beret_badge"
 	greyscale_config = /datum/greyscale_config/beret_badge
 	greyscale_config_worn = /datum/greyscale_config/beret_badge/worn
-	greyscale_colors = "#0070B7#FFCE5B"
+	greyscale_colors = "#41579A#F0CC8F"
 
 //Head of Personnel
 /obj/item/clothing/head/hats/hopcap

code/modules/clothing/suits/jobs.dm

@@ -59,20 +59,17 @@
 	icon_state = "capjacket"
 	inhand_icon_state = "bio_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
-	allowed = list(
-		/obj/item/assembly/flash/handheld,
-		/obj/item/clothing/mask/cigarette,
-		/obj/item/disk,
-		/obj/item/lighter,
-		/obj/item/melee,
-		/obj/item/reagent_containers/cup/glass/flask,
-		/obj/item/stamp,
-		/obj/item/storage/box/matches,
-		/obj/item/storage/fancy/cigarettes,
-		/obj/item/storage/lockbox/medal,
-		/obj/item/tank/internals/emergency_oxygen,
-		/obj/item/tank/internals/plasmaman,
-	)
+	armor_type = /datum/armor/vest_capcarapace
+	resistance_flags = FIRE_PROOF
+	min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
+	max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
+	strip_delay = 60
+	equip_delay_other = 40
+	max_integrity = 250
+
+/obj/item/clothing/suit/jacket/capjacket/Initialize(mapload)
+	. = ..()
+	allowed += GLOB.security_vest_allowed
 
 //Chef
 /obj/item/clothing/suit/toggle/chef

code/modules/clothing/suits/wintercoats.dm

@@ -171,13 +171,15 @@
 	armor_type = /datum/armor/wintercoat_captain
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/captain
 
-/datum/armor/wintercoat_captain
-	melee = 25
+/datum/armor/wintercoat_captain //downstream edit to make it closer to the carapace values, but less because of the bonus of being a winter coat
+	melee = 40
 	bullet = 30
-	laser = 30
+	laser = 40
 	energy = 40
-	bomb = 25
-	acid = 50
+	bomb = 20
+	fire = 100
+	acid = 90
+	wound = 10
 
 /obj/item/clothing/suit/hooded/wintercoat/captain/Initialize(mapload)
 	. = ..()