diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm index 8c0a2ef0b8f..8d64b65df5c 100644 --- a/code/game/objects/items/weapons/vaurca_items.dm +++ b/code/game/objects/items/weapons/vaurca_items.dm @@ -13,27 +13,35 @@ to_chat(user, "This mask is too tight to adjust.") return -/obj/item/clothing/mask/breath/vaurca/expression - name = "human expression mask" - desc = "A mask that allows emotively challenged aliens to convey facial expressions. This one depicts a human." - icon_state = "human_mask" - item_state = "human_mask" - -/obj/item/clothing/mask/breath/vaurca/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_mask" - item_state = "skrell_mask" +/obj/item/clothing/mask/breath/vaurca/filter + desc = "A basic screw on filter attached beneath the mouthparts of the common Vaurca." + name = "filter port" + icon_state = "filterport" + item_state = 0 /obj/item/clothing/head/shaper name = "shaper helmet" - desc = "A mirrored helm commonly worn by Preimmients. The helm masks the visage of its wearer, symbolically and literally blinding them to all but the path set in front of them." + desc = "A mirrored helm commonly worn by Preimminents. The helm masks the visage of its wearer, symbolically and literally blinding them to all but the path set in front of them." icon = 'icons/obj/vaurca_items.dmi' icon_state = "shaper_helmet" item_state = "shaper_helmet" contained_sprite = TRUE species_restricted = list("Vaurca") +/obj/item/clothing/head/expression + name = "human expression mask" + desc = "A mask that allows emotively challenged aliens to convey facial expressions. This one depicts a human." + icon = 'icons/obj/vaurca_items.dmi' + icon_state = "human_helmet" + item_state = "human_helmet" + 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." + icon_state = "skrell_helmet" + item_state = "skrell_helmet" + /obj/item/weapon/melee/energy/vaurca name = "thermal knife" desc = "A Vaurcae-designed combat knife with a thermal energy blade designed for close-quarter encounters." diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm index 5575c857c5f..688562cd83a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/vaurca.dm @@ -12,9 +12,16 @@ whitelisted = list("Vaurca Worker", "Vaurca Warrior") sort_category = "Xenowear - Vaurca" +/datum/gear/mask/filterport + display_name = "filter port" + path = /obj/item/clothing/mask/breath/vaurca/filter + cost = 1 + whitelisted = list("Vaurca Worker", "Vaurca Warrior") + sort_category = "Xenowear - Vaurca" + /datum/gear/mask/vaurca_expression display_name = "human expression mask" - path = /obj/item/clothing/mask/breath/vaurca/expression + path = /obj/item/clothing/head/expression cost = 1 whitelisted = list("Vaurca Worker", "Vaurca Warrior") sort_category = "Xenowear - Vaurca" @@ -25,7 +32,7 @@ /datum/gear/mask/vaurca_expression/skrell display_name = "skrell expression mask" - path = /obj/item/clothing/mask/breath/vaurca/expression/skrell + path = /obj/item/clothing/head/expression/skrell /datum/gear/head/shaper display_name = "shaper helmet" diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index f90c45d80fa..f53c4559d7d 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -107,7 +107,7 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_vlong" length = 2 chatname = "Long Hair" - + longeralt2 name = "Long Hair Alt" @@ -455,7 +455,7 @@ Follow by example and make good judgement based on length which list to include gender = FEMALE length = 1 chatname = "Gentle Hair" - + spiky name = "Spiky" @@ -558,7 +558,7 @@ Follow by example and make good judgement based on length which list to include name = "Skinhead" icon_state = "hair_skinhead" length = 0 - + balding name = "Balding Hair" @@ -881,7 +881,7 @@ Follow by example and make good judgement based on length which list to include name = "Shaved Bun" icon_state = "hair_shavedbun" chatname = "Hair Bun" - + halfshaved name = "Half-Shaved" @@ -1451,7 +1451,7 @@ Follow by example and make good judgement based on length which list to include name = "Tajara Bangs" icon_state = "hair_bangs" chatname = "Short Hair" - + taj_ears_braid name = "Tajara Braid" @@ -1586,6 +1586,48 @@ Follow by example and make good judgement based on length which list to include chatname = "Antennae" length = 3 + vaurca_damaged_left + name = "Injured Antenna, Left" + icon_state = "vaurca_inj_left" + chatname = "Left Antenna" + length = 1 + + vaurca_damaged_right + name = "Injured Antenna, Right" + icon_state = "vaurca_inj_right" + chatname = "Right Antenna" + length = 1 + + vaurca_catfish + name = "Catfish Antennae" + icon_state = "vaurca_catfish" + chatname = "Antennae" + length = 2 + + vaurca_dipole + name = "Dipole Antennae" + icon_state = "vaurca_dipole" + chatname = "Antennae" + length = 2 + + vaurca_knight + name = "Knight Antennae" + icon_state = "vaurca_knight" + chatname = "Antennae" + length = 2 + + vaurca_formic + name = "Formic Antennae" + icon_state = "vaurca_formic" + chatname = "Antennae" + length = 2 + + vaurca_parabolic + name = "Parabolic Antennae" + icon_state = "vaurca_parabolic" + chatname = "Antennae" + length = 2 + /datum/sprite_accessory/facial_hair taj_sideburns icon = 'icons/mob/human_face/tajara_facial_hair.dmi' diff --git a/html/changelogs/paradoxspace-addsbugs.yml b/html/changelogs/paradoxspace-addsbugs.yml new file mode 100644 index 00000000000..c02d73a1450 --- /dev/null +++ b/html/changelogs/paradoxspace-addsbugs.yml @@ -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: ParadoxSpace + +# 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: + - rscadd: "Adds some new antennae for Vaurca." + - rscadd: "Vaurca now have a shiny new invisible filter port mask in the loadout." + - tweak: "Expression masks now go on the head instead." \ No newline at end of file diff --git a/icons/mob/human_face/vaurca_hair.dmi b/icons/mob/human_face/vaurca_hair.dmi index 3bc4443a8ff..8f658947956 100644 Binary files a/icons/mob/human_face/vaurca_hair.dmi and b/icons/mob/human_face/vaurca_hair.dmi differ diff --git a/icons/obj/vaurca_items.dmi b/icons/obj/vaurca_items.dmi index 7ce8d6968fe..84009fddff1 100644 Binary files a/icons/obj/vaurca_items.dmi and b/icons/obj/vaurca_items.dmi differ