Merge pull request #3554 from YourPalHolidays/alpha

Marine Sergeant Hats
HaloSpaceStation · May 4, 2024 · 8e932a2 · 8e932a2
2 parents 0aa7ad9 + 11a8d98
commit 8e932a2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/code/modules/halo/clothing/marine.dm b/code/modules/halo/clothing/marine.dm
@@ -98,6 +98,22 @@
 	icon_state = "helmet_b"
 	body_parts_covered = HEAD|EYES
 
+/obj/item/clothing/head/helmet/marine/combatcap
+	name = "UNSC Combat Cap"
+	desc = "A standard issue combat cap worn by NCOs, Squad Leaders, or Sergeants of the UNSC Marine Corps."
+	icon = ITEM_INHAND
+	icon_override = MARINE_OVERRIDE
+	item_state = "Combat Cap"
+	icon_state = "combat-cap"
+	body_parts_covered = HEAD|EYES
+
+/obj/item/clothing/head/helmet/marine/combatcap/brown
+	icon = ITEM_INHAND
+	icon_override = MARINE_OVERRIDE
+	item_state = "Combat Cap B"
+	icon_state = "combat-cap-b"
+	body_parts_covered = HEAD|EYES
+
 /obj/item/clothing/suit/storage/marine
 	name = "Olive Camo M52A Body Armor"
 	desc = "An armored protective vest worn by the members of the UNSC Marine Corps."

diff --git a/code/modules/halo/clothing/marine.dmi b/code/modules/halo/clothing/marine.dmi
diff --git a/code/modules/halo/clothing/marine_items.dmi b/code/modules/halo/clothing/marine_items.dmi
diff --git a/code/modules/halo/unsc/jobs/marines_outfits.dm b/code/modules/halo/unsc/jobs/marines_outfits.dm
@@ -22,18 +22,21 @@
 
 /decl/hierarchy/outfit/job/unsc/marine/e5
 	name = "Marine Sergeant (e5)"
+	head = /obj/item/clothing/head/helmet/marine/combatcap
 	starting_accessories = list(\
 		/obj/item/clothing/accessory/rank/marine/enlisted/e5,\
 		/obj/item/clothing/accessory/badge/tags)
 
 /decl/hierarchy/outfit/job/unsc/marine/e6
 	name = "Marine Staff Sergeant (e6)"
+	head = /obj/item/clothing/head/helmet/marine/combatcap
 	starting_accessories = list(\
 		/obj/item/clothing/accessory/rank/marine/enlisted/e6,\
 		/obj/item/clothing/accessory/badge/tags)
 
 /decl/hierarchy/outfit/job/unsc/marine/e7
 	name = "Marine Gunnery Sergeant (e7)"
+	head = /obj/item/clothing/head/helmet/marine/combatcap/brown
 	starting_accessories = list(\
 		/obj/item/clothing/accessory/rank/marine/enlisted/e7,\
 		/obj/item/clothing/accessory/badge/tags)