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

Jump to bottom

Foxtrot and intel squad berets and headband #4781

Merged
merged 3 commits into from
Nov 3, 2023
Merged

Foxtrot and intel squad berets and headband #4781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e58cff5
initial
Blundir Oct 25, 2023
5f2cf24
Update cm_hats.dmi
Blundir Oct 25, 2023
32531e3
Merge branch 'master' into berets
Blundir Oct 26, 2023
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
6 changes: 6 additions & 0 deletions code/modules/clothing/head/head.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@
if(SQUAD_MARINE_5)
icon_state = "beret_echo"
desc = "Tightly Woven, as it should be."
if(SQUAD_MARINE_CRYO)
icon_state = "beret_foxtrot"
desc = "Looks and feels starched, cold to the touch."
if(SQUAD_MARINE_INTEL)
icon_state = "beret_intel"
desc = "Looks more intellegent than the person wearing it."
else
icon_state = "beret"
desc = initial(desc)
Expand Down
Binary file modified icons/mob/humans/onmob/head_1.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/humans/onmob/helmet_garb.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/obj/items/clothing/cm_hats.dmi
View file
Open in desktop
Binary file not shown.