Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Marine Sergeant Hats #3554

Merged
merged 1 commit into from
May 4, 2024
Merged

Marine Sergeant Hats #3554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions code/modules/halo/clothing/marine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Binary file modified code/modules/halo/clothing/marine.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified code/modules/halo/clothing/marine_items.dmi
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions code/modules/halo/unsc/jobs/marines_outfits.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading