Merge branch 'master' into Adds-New-Synthetic-Cosmetics

code/modules/clothing/suits/marine_coat.dm

@@ -178,6 +178,11 @@
 	desc = "A Navy regulation dress blues coat for high-ranking officers. For those who wish for style and authority."
 	icon_state = "co_suit"
 
+/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon
+	name = "commanding officer falcon jacket"
+	desc = "A refurbished jacket liner tailor made for a senior officer. This liner has become more of a proper piece of attire, with a new layer of fabric, wrist cuffs, front pockets, and a custom embroidered falcon on the back. This jacket will keep its wearer warm no matter the circumstance, from a cool Sunday drive to chilly autumn's eve."
+	icon_state = "co_falcon"
+
 /obj/item/clothing/suit/storage/jacket/marine/dress/general
 	name = "general's jacket"
 	desc = "A black trench coat with gold metallic trim. Flashy, highly protective, and over-the-top. Fit for a king - or, in this case, a General. Has quite a few pockets."

code/modules/gear_presets/uscm_ship.dm

@@ -476,6 +476,13 @@
 	role_comm_title = "CO"
 	minimum_age = 35
 
+	dress_over = list(
+		/obj/item/clothing/suit/storage/jacket/marine/dress/officer/white,
+		/obj/item/clothing/suit/storage/jacket/marine/dress/officer/black,
+		/obj/item/clothing/suit/storage/jacket/marine/dress/officer/suit,
+		/obj/item/clothing/suit/storage/jacket/marine/dress/officer/falcon,
+	)
+
 /datum/equipment_preset/uscm_ship/commander/council/load_gear(mob/living/carbon/human/new_human)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/officer/bridge(new_human), WEAR_BODY)
 	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/marine/commander/council(new_human), WEAR_HEAD)

html/changelogs/AutoChangeLog-pr-3963.yml

@@ -0,0 +1,4 @@
+author: "BeagleGaming1"
+delete-after: True
+changes:
+  - rscadd: "Added a new CO jacket to the CO vendor"