Skip to content

Commit

Permalink
Vox Sprite Update - Scarves and other Assorted Items (#3264)
Browse files Browse the repository at this point in the history
## About The Pull Request
For some reason while watching Gundam I got the urge to sit down and
start doing things, so here I am.
Creates onmob_neck_vox.dmi for Vox neck items.

Adds Vox sprites for all the striped scarves in-game to Vox, as well as
Shemaghs, Cameras and the Stethoscope.
And chest-high towels.
And industrial jackets.
And updates the palette on security HUDs and medical HUDs.


![image](https://github.com/user-attachments/assets/5fb64134-8e0e-49b7-8fe2-281184babfb5)

![image](https://github.com/user-attachments/assets/e68b6e4c-17bf-4bd2-bf00-fa39fbc017d1)

![image](https://github.com/user-attachments/assets/fd847523-87a0-40ba-a510-c3fbb8c604ba)

![image](https://github.com/user-attachments/assets/7cc64efc-cb23-46bf-828f-72bd7d98d071)

![image](https://github.com/user-attachments/assets/c2366b63-e925-42c6-bd84-051bba2cde36)

![image](https://github.com/user-attachments/assets/596add83-4423-4653-a1a3-4d9c6a2f7966)

![image](https://github.com/user-attachments/assets/4a6adb9f-b8a2-415f-ab3b-35e02bc6291e)

![image](https://github.com/user-attachments/assets/0f189fe1-7a99-47ac-ab23-63b5b052d3fa)

![image](https://github.com/user-attachments/assets/c8ef064f-3764-4142-b5ae-cacee6a9c93d)

## Why It's Good For The Game

Adds more supported items for the Vox, which is pretty cool I think.
Hopefully, plenty of people will appreciate the more customization
options.

## Changelog

:cl:
add: Sprites for several different kinds of scarves for Vox!
add: Additional sprites for several other items for Vox, such as
chest-high towels and hazard jackets.
add: Created onmob_neck_vox.dmi file, plus enabled support for it.
/:cl:
  • Loading branch information
firebudgy authored Aug 10, 2024
1 parent aa03087 commit f297131
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 8 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/species_clothing_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
#define VOX_SUIT_PATH 'icons/mob/species/vox/onmob_suit_vox.dmi'
#define VOX_EARS_PATH 'icons/mob/species/vox/onmob_ears_vox.dmi'
#define VOX_MASK_PATH 'icons/mob/species/vox/onmob_mask_vox.dmi'
#define VOX_NECK_PATH 'icons/mob/species/vox/onmob_neck_vox.dmi'
#define VOX_HEAD_PATH 'icons/mob/species/vox/onmob_head_vox.dmi'
#define VOX_GLOVES_PATH 'icons/mob/species/vox/onmob_hands_vox.dmi'
#define VOX_GLASSES_PATH 'icons/mob/species/vox/onmob_eyes_vox.dmi'
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/factions/ngr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@
icon_state = "ngr_shemagh"
icon = 'icons/obj/clothing/faction/ngr/neck.dmi'
mob_overlay_icon = 'icons/mob/clothing/faction/ngr/neck.dmi'
supports_variations = VOX_VARIATION

//////////
//Belts//
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/neck/_neck.dm
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
icon_state = "stethoscope"
cuttable = FALSE
supports_variations = VOX_VARIATION

/obj/item/clothing/neck/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
if(ishuman(M) && isliving(user))
Expand Down Expand Up @@ -267,6 +268,7 @@
name = "shemagh"
desc = "An oversized shemagh, for those with a keen sense of fashion, or those operating tactically."
icon_state = "shemagh"
supports_variations = VOX_VARIATION

//The three following scarves don't have the scarf subtype
//This is because Ian can equip anything from that subtype
Expand All @@ -275,21 +277,25 @@
name = "striped red scarf"
icon_state = "stripedredscarf"
custom_price = 10
supports_variations = VOX_VARIATION

/obj/item/clothing/neck/stripedgreenscarf
name = "striped green scarf"
icon_state = "stripedgreenscarf"
custom_price = 10
supports_variations = VOX_VARIATION

/obj/item/clothing/neck/stripedbluescarf
name = "striped blue scarf"
icon_state = "stripedbluescarf"
custom_price = 10
supports_variations = VOX_VARIATION

/obj/item/clothing/neck/stripedsolgovscarf
name = "striped solgov scarf"
icon_state = "stripedsolgovscarf"
custom_price = 10
supports_variations = VOX_VARIATION

/obj/item/clothing/neck/petcollar
name = "pet collar"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/towels.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
item_flags = NOBLUDGEON
resistance_flags = FLAMMABLE
flags_inv = HIDEHAIR // Only relevant when in head shape, but useful to keep around regardless.
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON
supports_variations = DIGITIGRADE_VARIATION_NO_NEW_ICON | VOX_VARIATION
/// The shape we're currently in.
var/shape = TOWEL_FOLDED

Expand Down
14 changes: 7 additions & 7 deletions code/modules/mob/living/carbon/human/update_icons.dm
Original file line number Diff line number Diff line change
Expand Up @@ -741,13 +741,13 @@ There are several things that need to be remembered:
update_hud_neck(I)
if(!(ITEM_SLOT_NECK in check_obscured_slots()))

if(dna.species.bodytype & BODYTYPE_VOX) // there is neither a vox or kepori neck path, we just tell it to greyscale no matter what
// if(I.supports_variations & VOX_VARIATION)
// icon_file = VOX_NECK_PATH
// if(I.vox_override_icon)
// icon_file = I.vox_override_icon
// else
handled_by_bodytype = TRUE
if(dna.species.bodytype & BODYTYPE_VOX) // there is no kepori neck path, we just tell it to greyscale no matter what
if(I.supports_variations & VOX_VARIATION)
icon_file = VOX_NECK_PATH
if(I.vox_override_icon)
icon_file = I.vox_override_icon
else
handled_by_bodytype = TRUE

else if(dna.species.bodytype & BODYTYPE_KEPORI)
// if(I.supports_variations & KEPORI_VARIATION)
Expand Down
1 change: 1 addition & 0 deletions code/modules/photography/camera/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
slot_flags = ITEM_SLOT_NECK
custom_materials = list(/datum/material/iron = 50, /datum/material/glass = 150)
custom_price = 120
supports_variations = VOX_VARIATION
var/flash_enabled = TRUE
var/state_on = "camera"
var/state_off = "camera_off"
Expand Down
Binary file modified icons/mob/species/vox/onmob_eyes_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_head_vox.dmi
Binary file not shown.
Binary file added icons/mob/species/vox/onmob_neck_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_suit_vox.dmi
Binary file not shown.

0 comments on commit f297131

Please sign in to comment.