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

More Vox Sprites - The Frontiersmen #3282

Merged
merged 4 commits into from
Aug 17, 2024
Merged

More Vox Sprites - The Frontiersmen #3282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8287624
frontesrsmen yes
firebudgy Aug 6, 2024
b54b926
minor edit
firebudgy Aug 6, 2024
3a38763
VOX_VARIATION'd
firebudgy Aug 6, 2024
55f606d
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
firebudgy Aug 11, 2024
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
5 changes: 5 additions & 0 deletions code/modules/clothing/factions/frontiersmen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
can_adjust = FALSE
icon = 'icons/obj/clothing/faction/frontiersmen/uniforms.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/uniforms.dmi'
supports_variations = VOX_VARIATION
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only need this set on the base type

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes made


/obj/item/clothing/under/frontiersmen/deckhand
name = "\improper deckhand jumpsuit"
Expand Down Expand Up @@ -58,6 +59,7 @@
icon = 'icons/obj/clothing/faction/frontiersmen/suits.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/frontiersmen/suits.dmi'
blood_overlay_type = "armor"
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/armor/vest/marine/frontier
name = "light tactical armor vest"
Expand Down Expand Up @@ -162,17 +164,20 @@
name = "\improper frontiersmen commander's cap"
desc = "An imposing peaked cap, meant for a commander of the Frontiersmen."
icon_state = "frontier_cap"
supports_variations = VOX_VARIATION

/obj/item/clothing/head/frontier/admiral
name = "\improper frontiersmen admiral's cap"
desc = "An imposing peaked cap meant for only the highest of officers of the Frontiersmen pirate fleet."
icon_state = "frontier_admiral_cap"
supports_variations = VOX_VARIATION

/obj/item/clothing/head/helmet/bulletproof/x11/frontier
name = "\improper frontiersmen X-11 helmet"
desc = "A heavily modified X-11 pattern helmet used by the Frontiersmen pirate fleet."
icon_state = "x11helm_frontier"
unique_reskin = null
supports_variations = VOX_VARIATION

/obj/item/clothing/head/helmet/bulletproof/x11/frontier/fireproof
name = "\improper fireproof frontiersmen X-11 helmet"
Expand Down
Binary file modified icons/mob/species/vox/onmob_eyes_vox.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_head_vox.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_suit_vox.dmi
View file
Open in desktop
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_uniform_vox.dmi
View file
Open in desktop
Binary file not shown.
Loading