Skip to content

Commit

Permalink
Adds Vox Support to VI Uniforms (shiptest-ss13#3800)
Browse files Browse the repository at this point in the history
## About The Pull Request

Adds new Vox sprites to Vigilitas Interstellar items, namely their
vests, uniforms and gas masks. Should help make them look a bit less
gormless.

The gas mask was a pain in the ass. I might revisit it at a later date.

<details>
  <summary>Images</summary>
  

![image](https://github.com/user-attachments/assets/3fde4031-ad79-4860-9c52-f5d70ddbf3b6)

![image](https://github.com/user-attachments/assets/58dc02dc-388b-45bc-9906-397d6c41bebe)

![image](https://github.com/user-attachments/assets/74266972-05f0-4ddb-88c3-cbf7848570af)

![image](https://github.com/user-attachments/assets/1ad79ac5-0790-471d-af4a-72e6ec2d5846)

![image](https://github.com/user-attachments/assets/e8f6ec79-5b2c-479d-a5ed-54868668c69e)

</details>


## Why It's Good For The Game

Additional species support for factional outfits means more player
accessibility. If I get off my ass we might get the rest of NT
supported.

## Changelog

:cl:
add: Species sprites for various Vigilitas items
add: Nanotrasen vox.dmi
/:cl:
  • Loading branch information
firebudgy authored Nov 23, 2024
1 parent b68502f commit a7d0333
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 2 deletions.
47 changes: 45 additions & 2 deletions code/modules/clothing/factions/nanotrasen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,49 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "deckhand"
item_state = "graycloth"
supports_variations = DIGITIGRADE_VARIATION
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION

// Engineering uniforms
/obj/item/clothing/under/nanotrasen/engineering
name = "engineering jumpsuit"
desc = "A dirty grey jumpsuit with reflective blue flashes on the limbs and a wrench icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "engi"
item_state = "greycloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/engineering/atmos
name = "atmospherics jumpsuit"
desc = "A thick grey jumpsuit with black stripes and an 'O2' icon on the back. A Nanotrasen, Inc. logo is stitched into the collar."
icon_state = "atmos_tech"
item_state = "greycloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/engineering/director
name = "engineering director's overalls"
desc = "Thick black overalls over a blue office shirt. Unlike most managerial staff, Nanotrasen engineering directors still need to get hands-on with their work."
icon_state = "engi_director"
item_state = "blackcloth"


//Supply uniforms
/obj/item/clothing/under/nanotrasen/supply
name = "cargo handler shorts"
desc = "A cheap work shirt and black shorts, typical of cargo handlers and clerks at N+S Logistics."
icon_state = "supply"
item_state = "browncloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/supply/qm
name = "supply director slacks"
desc = "Crisp slacks and a pressed brown shirt that any supply director could be proud of. N+S Logistics' compass rose logo is embossed on every button."
icon_state = "supply_director"
item_state = "browncloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/supply/miner
name = "mining overalls"
Expand Down Expand Up @@ -74,12 +84,16 @@
desc = "A crisp white shirt with blue stripes on the arms, identifying the owner as trained Nanotrasen medical staff. The faint smell of antiseptic won't wash out."
icon_state = "doctor"
item_state = "whitecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/medical/paramedic
name = "paramedic uniform"
desc = "Tough synthetic pants and a white uniform shirt, designed to handle all manner of scrapes and splashes in the line of duty. The tag identifies this as property of Nanotrasen, Inc."
icon_state = "paramedic"
item_state = "whitecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/medical/director
name = "medical director's slacks"
Expand All @@ -94,24 +108,32 @@
desc = "A grey jumpsuit with purple sleeves and faint stains on the elbows and knees. It looks stiff and cheap, but is surprisingly comfortable."
icon_state = "janitor"
item_state = "graycloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/affairs
name = "neatly pleated slacks"
desc = "Flawlessly pleated slacks and a linen shirt with the Nanotrasen logo stitched repeatedly into the cuffs and collar. It exudes an aura of quiet authority."
icon_state = "affairs"
item_state = "whitecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/security
name = "security slacks"
desc = "A starched grey uniform with red arm flashes, of a type seen throughout the core worlds. The Vigilitas Interstellar logo is proudly emblazoned on the front."
icon_state = "security"
item_state = "graycloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/under/nanotrasen/security/director
name = "security director's slacks"
desc = "A robust crimson uniform, heavily starched, with a Vigilitas logo neatly stitched onto either end of the collar. The last line of defense for Vigilitas's managerial staff."
icon_state = "security_director"
item_state = "redcloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

//Command uniforms
/obj/item/clothing/under/nanotrasen/captain
Expand Down Expand Up @@ -170,18 +192,24 @@
desc = "A fine black linen suit jacket with blue markings and a Nanotrasen lapel pin. It has a strangely menacing aura."
icon_state = "suit_jacket"
item_state = "blackcloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/nanotrasen/vest
name = "black hazard vest"
desc = "A thin black vest with reflective markings, worn to guarantee visibility when operating around industrial equipment or in dark or dusty conditions. Property of Nanotrasen, Inc."
icon_state = "engi_vest"
item_state = "blackcloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/nanotrasen/vest/blue
name = "blue hazard vest"
desc = "A thin vest with reflective stripes, worn to guarantee visibility in dangerous conditions. The vest itself is an offensively bright shade of Nanotrasen Blue. Property of Nanotrasen, Inc."
icon_state = "atmos_vest"
item_state = "bluecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/toggle/nanotrasen
name = "officer's coat"
Expand Down Expand Up @@ -237,13 +265,17 @@
/obj/item/clothing/suit/armor/nanotrasen/slim
name = "slim armor vest"
icon_state = "armor_slim"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/armor/nanotrasen/sec_director
name = "security director's overcoat"
desc = "A tailored black overcoat, made from cutting-edge ballistic fabrics and composites. Vigilitas's 'VI' logo is embossed on every button. Intimidating and profoundly stylish."
icon_state = "command_coat"
body_parts_covered = CHEST|GROIN
armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90)
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/suit/armor/nanotrasen/captain
name = "captain's jacket"
Expand Down Expand Up @@ -337,6 +369,8 @@
desc = "A blue peaked hat with red silk decoration and an embroidered Nanotrasen logo, worn exclusively by management."
icon_state = "officer_peaked"
item_state = "bluecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/head/nanotrasen/officer/fedora
name = "officer's fedora"
Expand All @@ -355,6 +389,8 @@
desc = "A decorated blue peaked cap, rife with laurels and gold thread, with a large badge on the front displaying the Nanotrasen, Inc. logo. This hat practically oozes authority."
icon_state = "com_peaked"
item_state = "bluecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/head/hardhat/nanotrasen //TODO: inhands for hardhats
name = "black heavy-duty hat"
Expand All @@ -365,18 +401,24 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "hardhat_black"
item_state = "blackcloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/head/hardhat/nanotrasen/blue
name = "blue heavy-duty hat"
desc = "A tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is brightly colored in Nanotrasen Blue, with the company logo on the front."
icon_state = "hardhat_blue"
item_state = "bluecloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION

/obj/item/clothing/head/hardhat/nanotrasen/white
name = "white heavy-duty hat"
desc = "An extremely tough plastic helmet with suspension rig, designed to protect against blunt impacts. This one is colored bright white, typical of managerial staff, and has a Nanotrasen logo on the front."
icon_state = "hardhat_white"
item_state = "graycloth"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
supports_variations = VOX_VARIATION


// Neck //
Expand All @@ -403,5 +445,6 @@
righthand_file = 'icons/mob/inhands/faction/nanotrasen/nt_righthand.dmi'
icon_state = "vigi_gas_mask"
item_state = "vigi_gas_mask"
vox_override_icon = 'icons/mob/clothing/faction/nanotrasen/vox.dmi'
resistance_flags = FIRE_PROOF | ACID_PROOF
supports_variations = KEPORI_VARIATION
supports_variations = KEPORI_VARIATION | VOX_VARIATION
1 change: 1 addition & 0 deletions code/modules/clothing/masks/hailer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
visor_flags_inv = HIDEFACIALHAIR | HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF
supports_variations = VOX_VARIATION

/obj/item/clothing/mask/gas/sechailer/swat
name = "\improper SWAT mask"
Expand Down
Binary file added icons/mob/clothing/faction/nanotrasen/vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_hands_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_head_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_mask_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_suit_vox.dmi
Binary file not shown.
Binary file modified icons/mob/species/vox/onmob_uniform_vox.dmi
Binary file not shown.

0 comments on commit a7d0333

Please sign in to comment.