diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm index 29442b10525..940634e6b0b 100644 --- a/code/game/objects/items/weapons/cigs.dm +++ b/code/game/objects/items/weapons/cigs.dm @@ -30,6 +30,14 @@ LIGHTERS ARE IN LIGHTERS.DM var/lastHolder = null var/smoketime = 300 var/chem_volume = 30 + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + ) + /obj/item/clothing/mask/cigarette/New() ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7b81a5b6460..26cd421133e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -115,7 +115,7 @@ new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/weapon/storage/lockbox/loyalty(src) new /obj/item/weapon/storage/box/flashbangs(src) - new /obj/item/clothing/mask/gas/sechailer/swat(src) + new /obj/item/clothing/mask/gas/sechailer/hos(src) new /obj/item/weapon/shield/riot/tele(src) new /obj/item/weapon/melee/baton/loaded(src) new /obj/item/weapon/storage/belt/security/sec(src) @@ -152,7 +152,7 @@ new /obj/item/clothing/under/rank/warden/formal(src) new /obj/item/clothing/under/rank/warden/corp(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) - new /obj/item/clothing/mask/gas/sechailer(src) + new /obj/item/clothing/mask/gas/sechailer/warden(src) new /obj/item/taperoll/police(src) new /obj/item/weapon/storage/box/zipties(src) new /obj/item/weapon/storage/box/flashbangs(src) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index d1376bf3b8a..977a3969a93 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -58,9 +58,12 @@ desc = "A Collectable Welding Helmet. Now with 80% less lead! Not for actual welding. Any welding done while wearing this Helmet is done so at the owner's own risk!" icon_state = "welding" item_state = "welding" - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/eyes.dmi' + "Vox" = 'icons/mob/species/vox/helmet.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) /obj/item/clothing/head/collectable/slime diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 4112164f0e3..3d138a29ab0 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -68,7 +68,7 @@ /obj/item/clothing/head/cueball name = "cueball helmet" - desc = "A large, featureless white orb mean to be worn on your head. How do you even see out of this thing?" + desc = "A large, featureless white orb meant to be worn on your head. How do you even see out of this thing?" icon_state = "cueball" flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR item_state="cueball" @@ -99,7 +99,7 @@ /obj/item/clothing/head/justice name = "justice hat" - desc = "fight for what's righteous!" + desc = "Fight for what's righteous!" icon_state = "justicered" item_state = "justicered" flags = HEADCOVERSEYES | HEADCOVERSMOUTH | BLOCKHAIR @@ -122,7 +122,7 @@ /obj/item/clothing/head/rabbitears name = "rabbit ears" - desc = "Wearing these makes you looks useless, and only good for your sex appeal." + desc = "Wearing these makes you look useless, and only good for your sex appeal." icon_state = "bunny" /obj/item/clothing/head/flatcap diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 494a1a99171..d822d76329c 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -24,9 +24,12 @@ armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) flags_inv = (HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE) action_button_name = "flip welding helmet" - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/head.dmi' + "Vox" = 'icons/mob/species/vox/head.dmi', + "Unathi" = 'icons/mob/species/unathi/helmet.dmi', + "Tajaran" = 'icons/mob/species/tajaran/helmet.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi' ) /obj/item/clothing/head/welding/flamedecal diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 0e317845cdf..c12fddfc884 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -8,9 +8,12 @@ w_class = 2 action_button_name = "Adjust Balaclava" ignore_maskadjust = 0 - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) /obj/item/clothing/mask/balaclava/attack_self(var/mob/user) @@ -24,9 +27,12 @@ flags = BLOCKHAIR flags_inv = HIDEFACE w_class = 2 - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) /obj/item/clothing/mask/luchador/tecnicos @@ -34,11 +40,9 @@ 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" - species_fit = list("Vox") \ No newline at end of file + item_state = "luchar" \ No newline at end of file diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm index 2155923b8f1..a9af66abd16 100644 --- a/code/modules/clothing/masks/breath.dm +++ b/code/modules/clothing/masks/breath.dm @@ -7,13 +7,15 @@ w_class = 2 gas_transfer_coefficient = 0.10 permeability_coefficient = 0.50 - species_fit = list("Vox") action_button_name = "Adjust Breath Mask" ignore_maskadjust = 0 - species_fit = list("Vox", "Vox Armalis") + species_fit = list("Vox", "Vox Armalis", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( "Vox" = 'icons/mob/species/vox/mask.dmi', "Vox Armalis" = 'icons/mob/species/armalis/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) /obj/item/clothing/mask/breath/attack_self(var/mob/user) @@ -26,7 +28,7 @@ item_state = "medical" permeability_coefficient = 0.01 put_on_delay = 10 - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") /obj/item/clothing/mask/breath/vox desc = "A weirdly-shaped breath mask." diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3dec1a52609..5debb427f99 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -8,9 +8,12 @@ item_state = "gas_alt" gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) // **** Welding gas mask **** @@ -25,7 +28,6 @@ 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" @@ -77,27 +79,23 @@ icon_state = "plaguedoctor" item_state = "gas_mask" armor = list(melee = 0, bullet = 0, laser = 2,energy = 2, bomb = 0, bio = 75, rad = 0) - species_fit = list("Vox") /obj/item/clothing/mask/gas/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" - species_fit = list("Vox") /obj/item/clothing/mask/gas/syndicate name = "syndicate mask" desc = "A close-fitting tactical mask that can be connected to an air supply." icon_state = "swat" strip_delay = 60 - species_fit = list("Vox") /obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" - species_fit = list("Vox") flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR /obj/item/clothing/mask/gas/clown_hat/attack_self(mob/user) @@ -128,53 +126,45 @@ desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" - species_fit = list("Vox") /obj/item/clothing/mask/gas/sexyclown name = "sexy-clown wig and mask" desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." icon_state = "sexyclown" item_state = "sexyclown" - species_fit = list("Vox") /obj/item/clothing/mask/gas/mime name = "mime mask" desc = "The traditional mime's mask. It has an eerie facial posture." icon_state = "mime" item_state = "mime" - species_fit = list("Vox") /obj/item/clothing/mask/gas/monkeymask name = "monkey mask" desc = "A mask used when acting as a monkey." icon_state = "monkeymask" item_state = "monkeymask" - species_fit = list("Vox") /obj/item/clothing/mask/gas/sexymime name = "sexy mime mask" desc = "A traditional female mime's mask." icon_state = "sexymime" item_state = "sexymime" - species_fit = list("Vox") /obj/item/clothing/mask/gas/death_commando name = "Death Commando Mask" icon_state = "death_commando_mask" item_state = "death_commando_mask" - species_fit = list("Vox") /obj/item/clothing/mask/gas/cyborg name = "cyborg visor" desc = "Beep boop" icon_state = "death" - species_fit = list("Vox") /obj/item/clothing/mask/gas/owl_mask name = "owl mask" desc = "Twoooo!" icon_state = "owl" - species_fit = list("Vox") flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | NODROP var/cooldown = 0 action_button_name = "Hoot" @@ -207,10 +197,23 @@ var/aggressiveness = 2 var/safety = 1 ignore_maskadjust = 0 - species_fit = list() - species_fit = list("Vox") action_button_name = "HALT!" +/obj/item/clothing/mask/gas/sechailer/hos + name = "\improper HOS SWAT mask" + desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe." + icon_state = "hosmask" + aggressiveness = 3 + ignore_maskadjust = 1 + +/obj/item/clothing/mask/gas/sechailer/warden + name = "\improper Warden SWAT mask" + desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe." + icon_state = "wardenmask" + aggressiveness = 3 + ignore_maskadjust = 1 + + /obj/item/clothing/mask/gas/sechailer/swat name = "\improper SWAT mask" desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000." diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 64435727738..e9da678a45b 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -36,11 +36,15 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 25, rad = 0) action_button_name = "Adjust Sterile Mask" ignore_maskadjust = 0 - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) + /obj/item/clothing/mask/surgical/attack_self(var/mob/user) adjustmask(user) @@ -49,9 +53,12 @@ desc = "moustache is totally real." icon_state = "fake-moustache" flags_inv = HIDEFACE - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) /obj/item/clothing/mask/fakemoustache/verb/pontificate() @@ -175,9 +182,12 @@ ignore_maskadjust = 0 adjusted_flags = SLOT_HEAD icon_state = "bandbotany" - species_fit = list("Vox") + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") sprite_sheets = list( - "Vox" = 'icons/mob/species/vox/mask.dmi' + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' ) action_button_name = "Adjust Bandana" @@ -187,37 +197,30 @@ 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" - species_fit = list("Vox") \ No newline at end of file + icon_state = "bandblack" \ No newline at end of file diff --git a/code/modules/ninja/suit/mask.dm b/code/modules/ninja/suit/mask.dm index 4db00b78091..910ccbc953c 100644 --- a/code/modules/ninja/suit/mask.dm +++ b/code/modules/ninja/suit/mask.dm @@ -11,4 +11,11 @@ Contents: desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement." icon_state = "s-ninja(norm)" item_state = "s-ninja_mask" - unacidable = 1 \ No newline at end of file + unacidable = 1 + species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/mask.dmi', + "Unathi" = 'icons/mob/species/unathi/mask.dmi', + "Tajaran" = 'icons/mob/species/tajaran/mask.dmi', + "Vulpkanin" = 'icons/mob/species/vulpkanin/mask.dmi' + ) diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index daee56b2e14..1b0e1213dab 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi new file mode 100644 index 00000000000..0b046910f48 Binary files /dev/null and b/icons/mob/species/tajaran/mask.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 165fe68157d..267e6653449 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi new file mode 100644 index 00000000000..80b212e9008 Binary files /dev/null and b/icons/mob/species/unathi/mask.dmi differ diff --git a/icons/mob/species/vox/mask.dmi b/icons/mob/species/vox/mask.dmi index 5616404917d..632ffe24c6f 100644 Binary files a/icons/mob/species/vox/mask.dmi and b/icons/mob/species/vox/mask.dmi differ diff --git a/icons/mob/species/vulpkanin/helmet.dmi b/icons/mob/species/vulpkanin/helmet.dmi index 06dc34ff68e..599f248db03 100644 Binary files a/icons/mob/species/vulpkanin/helmet.dmi and b/icons/mob/species/vulpkanin/helmet.dmi differ diff --git a/icons/mob/species/vulpkanin/mask.dmi b/icons/mob/species/vulpkanin/mask.dmi new file mode 100644 index 00000000000..86c84471a08 Binary files /dev/null and b/icons/mob/species/vulpkanin/mask.dmi differ