Skip to content

Commit

Permalink
Improves expression mask sprites; adds Unathi mask (Aurorastation#18331)
Browse files Browse the repository at this point in the history
  • Loading branch information
feartheblackout authored Feb 8, 2024
1 parent 481014e commit 74e1c0b
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 6 deletions.
10 changes: 9 additions & 1 deletion code/game/objects/items/weapons/vaurca_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,22 @@
icon = 'icons/obj/vaurca_items.dmi'
icon_state = "human_helmet"
item_state = "human_helmet"
build_from_parts = TRUE
worn_overlay = "face"
contained_sprite = TRUE

/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."
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"

/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"

/obj/item/clothing/head/shroud
name = "vaurcan shroud"
desc = "This relatively new design is meant to cover the head of a Vaurca, to both protect against sunlight, and to cover their mandibles. This one is blue."
Expand Down
15 changes: 10 additions & 5 deletions code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,22 @@
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK)
sort_category = "Xenowear - Vaurca"

/datum/gear/mask/vaurca_expression
display_name = "human expression mask"
/datum/gear/mask/expression
display_name = "expression mask selection"
path = /obj/item/clothing/head/expression
cost = 1
slot = slot_head
whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR)
sort_category = "Xenowear - Vaurca"
flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION

/datum/gear/mask/vaurca_expression/skrell
display_name = "skrell expression mask"
path = /obj/item/clothing/head/expression/skrell
/datum/gear/mask/expression/New()
..()
var/list/masks = list()
masks["expression mask, human"] = /obj/item/clothing/head/expression
masks["expression mask, skrell"] = /obj/item/clothing/head/expression/skrell
masks["expression mask, unathi"] = /obj/item/clothing/head/expression/unathi
gear_tweaks += new /datum/gear_tweak/path(masks)

/datum/gear/head/shaper
display_name = "shaper helmet"
Expand Down
43 changes: 43 additions & 0 deletions html/changelogs/SimpleMaroon-untiliputonthemask.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
################################
# 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
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: SimpleMaroon

# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Adjusted the Vaurca expression mask sprites, and made them easier to color."
- tweak: "Placed the Vaurca expression masks into a list in the loadout, rather than as individual selections."
- rscadd: "Added a Unathi expression mask to the set."
Binary file modified icons/obj/vaurca_items.dmi
Binary file not shown.

0 comments on commit 74e1c0b

Please sign in to comment.