diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index 95e555300cd..b3d2e7c685d 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -49,18 +49,30 @@ build_from_parts = TRUE worn_overlay = "face" contained_sprite = TRUE + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/head.dmi' + ) + species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BULWARK) /obj/item/clothing/head/expression/skrell name = "skrell expression mask" desc = "A mask that allows emotively challenged aliens to convey facial expressions. This one depicts a Skrell." icon_state = "skrell_helmet" item_state = "skrell_helmet" + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/head.dmi' + ) + species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BULWARK) /obj/item/clothing/head/expression/unathi name = "unathi expression mask" desc = "A mask that allows emotively challenged aliens to convey facial expressions. This one depicts a Unathi." icon_state = "unathi_helmet" item_state = "unathi_helmet" + sprite_sheets = list( + BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/head.dmi' + ) + species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_BULWARK) /obj/item/clothing/head/shroud name = "vaurcan shroud" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index 55b414bb6d6..3e10e09b471 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -26,7 +26,7 @@ path = /obj/item/clothing/head/expression cost = 1 slot = slot_head - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT) + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_ATTENDANT, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION diff --git a/html/changelogs/Stev-the-third-bulwark_expression_mask.yml b/html/changelogs/Stev-the-third-bulwark_expression_mask.yml new file mode 100644 index 00000000000..2a773fb2614 --- /dev/null +++ b/html/changelogs/Stev-the-third-bulwark_expression_mask.yml @@ -0,0 +1,61 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Stev-the-third + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - imageadd: "Added sprites for bulwark expression masks." + - rscadd: "Added expression masks to Vaurca bulwarks and the loadout." + - bugfix: "Re-aligned the face for human expression masks." + diff --git a/icons/mob/species/bulwark/head.dmi b/icons/mob/species/bulwark/head.dmi index 17b95f1d49d..92eb5b65d2a 100644 Binary files a/icons/mob/species/bulwark/head.dmi and b/icons/mob/species/bulwark/head.dmi differ diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi index 9ba18ecc702..7baff46842f 100644 Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ