diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 3ef10615f94..0e317845cdf 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -24,15 +24,21 @@ flags = BLOCKHAIR flags_inv = HIDEFACE w_class = 2 + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /obj/item/clothing/mask/luchador/tecnicos name = "Tecnicos Mask" desc = "Worn by robust fighters who uphold justice and fight honorably." icon_state = "luchador" item_state = "luchador" + species_fit = list("Vox") /obj/item/clothing/mask/luchador/rudos name = "Rudos Mask" desc = "Worn by robust fighters who are willing to do anything to win." icon_state = "luchar" - item_state = "luchar" \ No newline at end of file + item_state = "luchar" + species_fit = list("Vox") \ No newline at end of file diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 0bb25729f42..3dec1a52609 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -25,6 +25,7 @@ flash_protect = 2 tint = 2 armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + species_fit = list("Vox") origin_tech = "materials=2;engineering=2" action_button_name = "Toggle Welding Helmet" @@ -207,6 +208,7 @@ var/safety = 1 ignore_maskadjust = 0 species_fit = list() + species_fit = list("Vox") action_button_name = "HALT!" /obj/item/clothing/mask/gas/sechailer/swat diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index f66a836beea..64435727738 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -49,6 +49,10 @@ desc = "moustache is totally real." icon_state = "fake-moustache" flags_inv = HIDEFACE + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) /obj/item/clothing/mask/fakemoustache/verb/pontificate() set name = "Pontificate Evilly" @@ -171,6 +175,10 @@ ignore_maskadjust = 0 adjusted_flags = SLOT_HEAD icon_state = "bandbotany" + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi' + ) action_button_name = "Adjust Bandana" /obj/item/clothing/mask/bandana/attack_self(var/mob/user) @@ -179,30 +187,37 @@ obj/item/clothing/mask/bandana/red name = "red bandana" icon_state = "bandred" + species_fit = list("Vox") obj/item/clothing/mask/bandana/blue name = "blue bandana" icon_state = "bandblue" + species_fit = list("Vox") obj/item/clothing/mask/bandana/gold name = "gold bandana" icon_state = "bandgold" + species_fit = list("Vox") obj/item/clothing/mask/bandana/green name = "green bandana" icon_state = "bandgreen" + species_fit = list("Vox") /obj/item/clothing/mask/bandana/botany name = "botany bandana" desc = "It's a green bandana with some fine nanotech lining." icon_state = "bandbotany" + species_fit = list("Vox") /obj/item/clothing/mask/bandana/skull name = "skull bandana" desc = "It's a black bandana with a skull pattern." icon_state = "bandskull" + species_fit = list("Vox") /obj/item/clothing/mask/bandana/black name = "black bandana" desc = "It's a black bandana." - icon_state = "bandblack" \ No newline at end of file + icon_state = "bandblack" + species_fit = list("Vox") \ No newline at end of file diff --git a/html/changelogs/KasparoVy-PR-3133.yml b/html/changelogs/KasparoVy-PR-3133.yml new file mode 100644 index 00000000000..280062feda9 --- /dev/null +++ b/html/changelogs/KasparoVy-PR-3133.yml @@ -0,0 +1,37 @@ +################################ +# 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 +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. Remove the quotation mark and put in your name when copy+pasting the example changelog. +author: KasparoVy + +# 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: + - rscadd: "Added the security gasmask, sexy mime mask, bandanas, balaclava, welding gas mask and wrestling masks for Vox. Added adjusted-state sprites for the Vox breath, medical, and surgical masks." + - rscdel: "Removed a duplicate of the human balaclava sprite." + - tweak: "Modifies the Vox plague-doctor, fake moustache, sterile and medical mask sprites to fit the Vox anatomy and animates the Vox SWAT mask. Corrects the names of some Vox mask adjusted-state sprites." \ No newline at end of file diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index b7bc0438f21..d839e71c4d7 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi index 688f81d7fbf..5616404917d 100644 Binary files a/icons/mob/species/vox/mask.dmi and b/icons/mob/species/vox/mask.dmi differ