diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 9ee1d5cd959..6d20bcfd6ae 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -927,7 +927,6 @@ contained_sprite = FALSE sprite_sheets = list(BODYTYPE_VAURCA = 'icons/mob/species/vaurca/back.dmi', BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/back.dmi') var/hooded = FALSE - var/cape_backing_state = "cape_backing" /obj/item/storage/backpack/cloak/verb/toggle_cloak_hood() set name = "Toggle Cloak Hood" @@ -946,7 +945,7 @@ /obj/item/storage/backpack/cloak/get_mob_overlay(var/mob/living/carbon/human/human, var/mob_icon, var/mob_state, var/slot) var/image/I = ..() - var/image/cape_backing = image(mob_icon, null, "[icon_state]_backing", MOB_SHADOW_LAYER) + var/image/cape_backing = image(mob_icon, null, "[initial(icon_state)]_backing", MOB_SHADOW_LAYER) I.AddOverlays(cape_backing) return I 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 bb240684873..d694e72b907 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -83,6 +83,7 @@ description = "A selection of vaurca colored Hive cloaks." path = /obj/item/clothing/suit/vaurca cost = 1 + slot = slot_wear_suit whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" @@ -147,7 +148,8 @@ description = "A selection of vaurca colored shrouds." path = /obj/item/clothing/head/shroud cost = 1 - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + slot = slot_head + whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK) sort_category = "Xenowear - Vaurca" /datum/gear/suit/vaurca_shroud/New() @@ -165,6 +167,7 @@ description = "A selection of vaurca colored shrouds." path = /obj/item/clothing/head/shroud/colorable cost = 1 + slot = slot_head whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_COLOR_SELECTION @@ -294,6 +297,6 @@ path = /obj/item/clothing/accessory/badge/passcard/tret cost = 1 whitelisted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) - culture_restriction = list(/singleton/origin_item/culture/klax) + culture_restriction = list(/singleton/origin_item/culture/klax, /singleton/origin_item/culture/klax_breeder) sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION diff --git a/html/changelogs/SimpleMaroon-vaurcamiscfixes.yml b/html/changelogs/SimpleMaroon-vaurcamiscfixes.yml new file mode 100644 index 00000000000..da40875699f --- /dev/null +++ b/html/changelogs/SimpleMaroon-vaurcamiscfixes.yml @@ -0,0 +1,65 @@ +################################ +# 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: 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, 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: + - bugfix: "Hive cloaks and Vaurcan shrouds will now show up on character preview." + - bugfix: "Vaurca shoes and clothes can now be properly colored for Bulwarks." + - bugfix: "The tunnel cloak backing now remains properly when the cloak's hood is pulled up." + - bugfix: "The Tret passcard can now be taken by K'lax Breeders." + - bugfix: "Fixes the misaligned sombrero sprite for Bulwarks." + - bugfix: "Moves the Bulwark sprites for the webbing vests and waistcoat to accessories.dmi where they belong." + - rscdel: "Removed Bulwark sprites for the defunct Internal Affairs jacket and blue lawyer jacket." + - bugfix: "Added the proper suffixes to Bulwark sprites needed to work with the contained sprite system." diff --git a/icons/mob/species/bulwark/accessories.dmi b/icons/mob/species/bulwark/accessories.dmi index b97a4bf6b2b..21516536420 100644 Binary files a/icons/mob/species/bulwark/accessories.dmi and b/icons/mob/species/bulwark/accessories.dmi differ diff --git a/icons/mob/species/bulwark/back.dmi b/icons/mob/species/bulwark/back.dmi index 7159d16cc56..a9d96fc834a 100644 Binary files a/icons/mob/species/bulwark/back.dmi and b/icons/mob/species/bulwark/back.dmi differ diff --git a/icons/mob/species/bulwark/head.dmi b/icons/mob/species/bulwark/head.dmi index 8457347b900..17b95f1d49d 100644 Binary files a/icons/mob/species/bulwark/head.dmi and b/icons/mob/species/bulwark/head.dmi differ diff --git a/icons/mob/species/bulwark/shoes.dmi b/icons/mob/species/bulwark/shoes.dmi index 348b6a5d6e1..7cd69fd226a 100644 Binary files a/icons/mob/species/bulwark/shoes.dmi and b/icons/mob/species/bulwark/shoes.dmi differ diff --git a/icons/mob/species/bulwark/suit.dmi b/icons/mob/species/bulwark/suit.dmi index b40c66394f9..d16d891e7c6 100644 Binary files a/icons/mob/species/bulwark/suit.dmi and b/icons/mob/species/bulwark/suit.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index dbdca46c854..d6434a9359e 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ