From 4c86dfc553187a3c97cefdfd7ad30e1f2d5d5fc8 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 21 Dec 2020 20:56:29 +0100 Subject: [PATCH] [MIRROR] Fixing a very old issue about lizard snouts and hoods, fake mustaches and similars. (#2264) * Fixing a very old issue about lizard snouts and hoods, fake mustaches and similars. (#55574) Fixing a little visual issue with certain hoods, fake mustaches and similars making lizard snouts magically disappear when worn. * Fixing a very old issue about lizard snouts and hoods, fake mustaches and similars. Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/__DEFINES/inventory.dm | 2 ++ code/game/objects/items/holy_weapons.dm | 2 +- .../objects/structures/lavaland/geyser.dm | 1 + .../abductor/equipment/abduction_gear.dm | 2 +- .../changeling/powers/mutations.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 2 +- .../eldritch_cult/eldritch_items.dm | 4 ++-- code/modules/clothing/chameleon.dm | 2 +- code/modules/clothing/head/hardhat.dm | 6 +++--- code/modules/clothing/head/helmet.dm | 12 ++++++------ code/modules/clothing/head/misc.dm | 19 +++++++++---------- code/modules/clothing/head/misc_special.dm | 8 ++++---- code/modules/clothing/masks/animal_masks.dm | 10 +++++----- code/modules/clothing/masks/boxing.dm | 14 +++++++------- code/modules/clothing/masks/gasmask.dm | 6 +++--- code/modules/clothing/masks/hailer.dm | 6 +++--- code/modules/clothing/masks/miscellaneous.dm | 15 ++++++++------- .../clothing/spacesuits/_spacesuits.dm | 2 +- code/modules/clothing/spacesuits/hardsuit.dm | 4 ++-- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 6 +++--- code/modules/clothing/suits/utility.dm | 4 ++-- code/modules/holiday/easter.dm | 2 +- .../mob/living/carbon/human/species.dm | 2 +- 25 files changed, 70 insertions(+), 67 deletions(-) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 3e5bbc1372a..d1e6815c32c 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -82,6 +82,8 @@ #define HIDENECK (1<<10) /// for wigs, only obscures the headgear #define HIDEHEADGEAR (1<<11) +///for lizard snouts, because some HIDEFACE clothes don't actually conceal that portion of the head. +#define HIDESNOUT (1<<12) //bitflags for clothing coverage - also used for limbs #define HEAD (1<<0) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 6a8bb50256e..2e5267dd053 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -6,7 +6,7 @@ icon_state = "knight_templar" inhand_icon_state = "knight_templar" armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH strip_delay = 80 dog_fashion = null diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index 2f5ffd1d6af..ba2ae8cd87c 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -61,6 +61,7 @@ icon_state = "plunger" slot_flags = ITEM_SLOT_MASK + flags_inv = HIDESNOUT ///time*plunge_mod = total time we take to plunge an object var/plunge_mod = 1 diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 098269d37b8..e0272708495 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -758,7 +758,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} icon_state = "alienhelmet" inhand_icon_state = "alienhelmet" blockTracking = TRUE - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT // Operating Table / Beds / Lockers diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm index a68bd22c8b5..020a09080f2 100644 --- a/code/modules/antagonists/changeling/powers/mutations.dm +++ b/code/modules/antagonists/changeling/powers/mutations.dm @@ -553,7 +553,7 @@ icon_state = "lingarmorhelmet" item_flags = DROPDEL armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 10, BIO = 4, RAD = 0, FIRE = 90, ACID = 90) - flags_inv = HIDEEARS|HIDEHAIR|HIDEEYES|HIDEFACIALHAIR|HIDEFACE + flags_inv = HIDEEARS|HIDEHAIR|HIDEEYES|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT /obj/item/clothing/head/helmet/changeling/Initialize() . = ..() diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 68c739d23ed..404e33db80a 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -323,7 +323,7 @@ icon_state = "magus" inhand_icon_state = "magus" desc = "A helm worn by the followers of Nar'Sie." - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEARS|HIDEEYES|HIDESNOUT armor = list(MELEE = 50, BULLET = 30, LASER = 50,ENERGY = 50, BOMB = 25, BIO = 10, RAD = 0, FIRE = 10, ACID = 10) flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH diff --git a/code/modules/antagonists/eldritch_cult/eldritch_items.dm b/code/modules/antagonists/eldritch_cult/eldritch_items.dm index 81d2198191b..ef4e849995b 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_items.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_items.dm @@ -167,7 +167,7 @@ name = "ominous hood" icon_state = "eldritch" desc = "A torn, dust-caked hood. Strange eyes line the inside." - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF flash_protect = FLASH_PROTECTION_WELDER @@ -236,7 +236,7 @@ w_class = WEIGHT_CLASS_SMALL flags_cover = MASKCOVERSEYES resistance_flags = FLAMMABLE - flags_inv = HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT ///Who is wearing this var/mob/living/carbon/human/local_user diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8ecbfcfa622..c94584f5907 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -462,7 +462,7 @@ resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT gas_transfer_coefficient = 0.01 permeability_coefficient = 0.01 flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm index 7019a9beb1c..9b540825708 100644 --- a/code/modules/clothing/head/hardhat.dm +++ b/code/modules/clothing/head/hardhat.dm @@ -98,7 +98,7 @@ name = "atmospheric technician's firefighting helmet" desc = "A firefighter's helmet, able to keep the user cool in any situation." clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT cold_protection = HEAD @@ -113,10 +113,10 @@ actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen) flash_protect = FLASH_PROTECTION_WELDER tint = 2 - flags_inv = HIDEEYES | HIDEFACE + flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT - visor_flags_inv = HIDEEYES | HIDEFACE + visor_flags_inv = HIDEEYES | HIDEFACE | HIDESNOUT visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF /obj/item/clothing/head/hardhat/weldhat/Initialize() diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index ecab5b3d85d..3bd77d21863 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -118,10 +118,10 @@ alt_toggle_message = "You push the visor up on" can_toggle = 1 armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80, WOUND = 15) - flags_inv = HIDEEARS|HIDEFACE + flags_inv = HIDEEARS|HIDEFACE|HIDESNOUT strip_delay = 80 actions_types = list(/datum/action/item_action/toggle) - visor_flags_inv = HIDEFACE + visor_flags_inv = HIDEFACE|HIDESNOUT toggle_cooldown = 0 flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF @@ -291,7 +291,7 @@ icon_state = "knight_green" inhand_icon_state = "knight_green" armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80) // no wound armor cause getting domed in a bucket head sounds like concussion city - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH strip_delay = 80 dog_fashion = null @@ -325,7 +325,7 @@ /obj/item/clothing/head/helmet/skull name = "skull helmet" desc = "An intimidating tribal helmet, it doesn't look very comfortable." - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT flags_cover = HEADCOVERSEYES armor = list(MELEE = 35, BULLET = 25, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) icon_state = "skull" @@ -367,7 +367,7 @@ armor = list(MELEE = 40, BULLET = 40, LASER = 30, ENERGY = 40, BOMB = 70, BIO = 0, RAD = 0, FIRE = 100, ACID = 100) resistance_flags = FIRE_PROOF | ACID_PROOF flash_protect = FLASH_PROTECTION_WELDER - flags_inv = HIDEHAIR|HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = HIDEHAIR|HIDEFACIALHAIR|HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF strip_delay = 80 @@ -378,7 +378,7 @@ inhand_icon_state = "knight_greyscale" armor = list(MELEE = 15, BULLET = 10, LASER = 30, ENERGY = 30, BOMB = 10, BIO = 10, RAD = 20, FIRE = 65, ACID = 40, WOUND = 15) material_flags = MATERIAL_COLOR | MATERIAL_AFFECT_STATISTICS //Can change color and add prefix - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH //monkey sentience caps diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index d2978cb140b..d2f782bf239 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -72,7 +72,7 @@ inhand_icon_state = "syndicate-helm-black-red" desc = "A plastic replica of a Syndicate agent's space helmet. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/cueball name = "cueball helmet" @@ -81,7 +81,7 @@ inhand_icon_state="cueball" clothing_flags = SNUG_FIT flags_cover = HEADCOVERSEYES|HEADCOVERSMOUTH - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/snowman name = "Snowman Head" @@ -90,7 +90,7 @@ inhand_icon_state = "snowman_h" clothing_flags = SNUG_FIT flags_cover = HEADCOVERSEYES - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/justice name = "justice hat" @@ -98,7 +98,7 @@ icon_state = "justicered" inhand_icon_state = "justicered" clothing_flags = SNUG_FIT - flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEHAIR|HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES /obj/item/clothing/head/justice/blue @@ -184,7 +184,7 @@ icon_state = "chickenhead" inhand_icon_state = "chickensuit" clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/griffin name = "griffon head" @@ -192,7 +192,7 @@ icon_state = "griffinhat" inhand_icon_state = "griffinhat" clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/bearpelt name = "bear pelt hat" @@ -206,7 +206,7 @@ inhand_icon_state = "xenos_helm" desc = "A helmet made out of chitinous alien hide." clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH /obj/item/clothing/head/fedora @@ -327,13 +327,12 @@ name = "paper sack hat" desc = "A paper sack with crude holes cut out for eyes. Useful for hiding one's identity or ugliness." icon_state = "papersack" - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS|HIDESNOUT /obj/item/clothing/head/papersack/smiley name = "paper sack hat" desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all." icon_state = "papersack_smile" - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS /obj/item/clothing/head/crown name = "crown" @@ -358,7 +357,7 @@ desc = "When everything's going to crab, protecting your head is the best choice." icon_state = "lobster_hat" clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/head/drfreezehat name = "doctor freeze's wig" diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index e1eb890341c..03b87bc339a 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -23,9 +23,9 @@ flash_protect = FLASH_PROTECTION_WELDER tint = 2 armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 60) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT actions_types = list(/datum/action/item_action/toggle) - visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE + visor_flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF resistance_flags = FIRE_PROOF clothing_flags = SNUG_FIT @@ -147,7 +147,7 @@ inhand_icon_state = "hardhat0_pumpkin" hat_type = "pumpkin" clothing_flags = SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) light_range = 2 //luminosity when on flags_cover = HEADCOVERSEYES @@ -197,7 +197,7 @@ inhand_icon_state = "cardborg_h" clothing_flags = SNUG_FIT flags_cover = HEADCOVERSEYES - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT dog_fashion = /datum/dog_fashion/head/cardborg diff --git a/code/modules/clothing/masks/animal_masks.dm b/code/modules/clothing/masks/animal_masks.dm index f41dea23bf4..a4bf46f3353 100644 --- a/code/modules/clothing/masks/animal_masks.dm +++ b/code/modules/clothing/masks/animal_masks.dm @@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( inhand_icon_state = "pig" animal_sounds = list("Oink!","Squeeeeeeee!","Oink Oink!") curse_spawn_sound = 'sound/magic/pighead_curse.ogg' - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/mask/animal/pig/cursed cursed = TRUE @@ -126,7 +126,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( animal_sounds = list("Ree!!", "Reee!!","REEE!!","REEEEE!!") animal_sounds_alt_probability = 5 animal_sounds_alt = list("HUUUUU!!","SMOOOOOKIN'!!","Hello my baby, hello my honey, hello my rag-time gal.", "Feels bad, man.", "GIT DIS GUY OFF ME!!" ,"SOMEBODY STOP ME!!", "NORMIES, GET OUT!!") - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/mask/animal/frog/cursed cursed = TRUE @@ -135,7 +135,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( name = "cow mask" icon_state = "cowmask" inhand_icon_state = "cowmask" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT curse_spawn_sound = 'sound/magic/cowhead_curse.ogg' animal_sounds = list("Moooooooo!","Moo!","Moooo!") @@ -149,7 +149,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( icon_state = "horsehead" inhand_icon_state = "horsehead" animal_sounds = list("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS|HIDESNOUT curse_spawn_sound = 'sound/magic/horsehead_curse.ogg' /obj/item/clothing/mask/animal/horsehead/cursed @@ -161,7 +161,7 @@ GLOBAL_LIST_INIT(cursed_animal_masks, list( animal_type = "rat" icon_state = "rat" inhand_icon_state = "rat" - flags_inv = HIDEFACE + flags_inv = HIDEFACE|HIDESNOUT modifies_speech = FALSE animal_sounds = list("Skree!","SKREEE!","Squeak!") diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 1559f382498..fbd73dd22e7 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -3,8 +3,8 @@ desc = "LOADSAMONEY" icon_state = "balaclava" inhand_icon_state = "balaclava" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR - visor_flags_inv = HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/adjust) @@ -17,8 +17,8 @@ icon_state = "syndicate_balaclava" inhand_icon_state = "syndicate_balaclava" clothing_flags = MASKINTERNALS - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR - visor_flags_inv = HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL armor = list(MELEE = 10, BULLET = 5, LASER = 5,ENERGY = 5, BOMB = 0, BIO = 0, RAD = 10, FIRE = 100, ACID = 40) resistance_flags = FIRE_PROOF | ACID_PROOF @@ -48,7 +48,7 @@ desc = "Worn by robust fighters, flying high to defeat their foes!" icon_state = "luchag" inhand_icon_state = "luchag" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL modifies_speech = TRUE @@ -93,6 +93,6 @@ desc = "Protects your face from snow." icon_state = "rus_balaclava" inhand_icon_state = "rus_balaclava" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR - visor_flags_inv = HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index f503a66e0aa..8a49e986ee2 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -3,7 +3,7 @@ desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow." //More accurate icon_state = "gas_alt" clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_NORMAL inhand_icon_state = "gas_alt" gas_transfer_coefficient = 0.01 @@ -40,7 +40,7 @@ tint = 2 armor = list(MELEE = 10, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 55) actions_types = list(/datum/action/item_action/toggle) - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDESNOUT flags_cover = MASKCOVERSEYES visor_flags_inv = HIDEEYES visor_flags_cover = MASKCOVERSEYES @@ -267,4 +267,4 @@ icon_state = "hunter" inhand_icon_state = "hunter" resistance_flags = FIRE_PROOF | ACID_PROOF - flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR + flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR|HIDESNOUT diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 38eb7992a1d..273f32b7ce7 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -49,10 +49,10 @@ GLOBAL_LIST_INIT(hailer_phrases, list( icon_state = "sechailer" inhand_icon_state = "sechailer" clothing_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS - flags_inv = HIDEFACIALHAIR | HIDEFACE + flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT w_class = WEIGHT_CLASS_SMALL visor_flags = BLOCK_GAS_SMOKE_EFFECT | MASKINTERNALS - visor_flags_inv = HIDEFACIALHAIR | HIDEFACE + visor_flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDESNOUT flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF visor_flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES | PEPPERPROOF var/aggressiveness = AGGR_BAD_COP @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(hailer_phrases, list( icon_state = "swat" inhand_icon_state = "swat" aggressiveness = AGGR_SHIT_COP - flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEEYES | HIDEEARS | HIDEHAIR + flags_inv = HIDEFACIALHAIR | HIDEFACE | HIDEEYES | HIDEEARS | HIDEHAIR | HIDESNOUT visor_flags_inv = 0 /obj/item/clothing/mask/gas/sechailer/swat/spacepol diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index df8a341560e..703df06417f 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -22,9 +22,9 @@ icon_state = "sterile" inhand_icon_state = "sterile" w_class = WEIGHT_CLASS_TINY - flags_inv = HIDEFACE + flags_inv = HIDEFACE|HIDESNOUT flags_cover = MASKCOVERSMOUTH - visor_flags_inv = HIDEFACE + visor_flags_inv = HIDEFACE|HIDESNOUT visor_flags_cover = MASKCOVERSMOUTH gas_transfer_coefficient = 0.9 permeability_coefficient = 0.01 @@ -69,6 +69,7 @@ name = "joy mask" desc = "Express your happiness or hide your sorrows with this laughing face with crying tears of joy cutout." icon_state = "joy" + flags_inv = HIDESNOUT /obj/item/clothing/mask/bandana @@ -76,8 +77,8 @@ desc = "A fine bandana with nanotech lining and a hydroponics pattern." w_class = WEIGHT_CLASS_TINY flags_cover = MASKCOVERSMOUTH - flags_inv = HIDEFACE|HIDEFACIALHAIR - visor_flags_inv = HIDEFACE|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT + visor_flags_inv = HIDEFACE|HIDEFACIALHAIR|HIDESNOUT visor_flags_cover = MASKCOVERSMOUTH | PEPPERPROOF slot_flags = ITEM_SLOT_MASK adjusted_flags = ITEM_SLOT_HEAD @@ -152,21 +153,21 @@ desc = "Ancient bandages." icon_state = "mummy_mask" inhand_icon_state = "mummy_mask" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/mask/scarecrow name = "sack mask" desc = "A burlap sack with eyeholes." icon_state = "scarecrow_sack" inhand_icon_state = "scarecrow_sack" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/mask/gondola name = "gondola mask" desc = "Genuine gondola fur." icon_state = "gondola" inhand_icon_state = "gondola" - flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT w_class = WEIGHT_CLASS_SMALL modifies_speech = TRUE diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 3f26570d9c6..0ba58085462 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -10,7 +10,7 @@ inhand_icon_state = "spaceold" permeability_coefficient = 0.01 armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 50, FIRE = 80, ACID = 70) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT dynamic_hair_suffix = "" dynamic_fhair_suffix = "" cold_protection = HEAD diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 9a99951c24f..4357cb1fa8c 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -314,7 +314,7 @@ on = TRUE var/obj/item/clothing/suit/space/hardsuit/syndi/linkedsuit = null actions_types = list(/datum/action/item_action/toggle_helmet_mode) - visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR + visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT visor_flags = STOPSPRESSUREDAMAGE /obj/item/clothing/head/helmet/space/hardsuit/syndi/update_icon_state() @@ -617,7 +617,7 @@ desc = "A tactical SWAT helmet MK.II." armor = list(MELEE = 40, BULLET = 50, LASER = 50, ENERGY = 60, BOMB = 50, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = FIRE_PROOF | ACID_PROOF - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR //we want to see the mask //this makes the hardsuit not fireproof you genius + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT //we want to see the mask //this makes the hardsuit not fireproof you genius heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT actions_types = list() diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm index aad72c791ef..9db34a64bda 100644 --- a/code/modules/clothing/spacesuits/plasmamen.dm +++ b/code/modules/clothing/spacesuits/plasmamen.dm @@ -55,7 +55,7 @@ var/smile_state = "envirohelm_smile" actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman) visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF visor_flags_inv = HIDEEYES|HIDEFACE diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index bc18cdc709b..8779b148016 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -6,7 +6,7 @@ permeability_coefficient = 0.01 clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT | SNUG_FIT armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 100, RAD = 80, FIRE = 30, ACID = 100) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE|HIDESNOUT resistance_flags = ACID_PROOF flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 2df969e27ad..89a0c4be332 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -44,7 +44,7 @@ desc = "You will learn to fear the flash." icon_state = "flashsuit" body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK + flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT /obj/item/clothing/suit/pirate name = "pirate coat" @@ -331,7 +331,7 @@ icon_state = "lingspacehelmet" body_parts_covered = HEAD flags_cover = HEADCOVERSEYES - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/suit/security/officer/russian name = "\improper Russian officer's jacket" @@ -745,7 +745,7 @@ throw_speed = 1 throw_range = 2 w_class = WEIGHT_CLASS_TINY - flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEGLOVES|HIDEEARS|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT alternate_worn_layer = UNDER_HEAD_LAYER species_exception = list(/datum/species/golem) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index ec860f9a838..5ac587d75fa 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -58,7 +58,7 @@ icon_state = "bombsuit" clothing_flags = THICKMATERIAL | SNUG_FIT armor = list(MELEE = 20, BULLET = 0, LASER = 20,ENERGY = 30, BOMB = 100, BIO = 0, RAD = 0, FIRE = 80, ACID = 50) - flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEFACE|HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT dynamic_hair_suffix = "" dynamic_fhair_suffix = "" cold_protection = HEAD @@ -120,7 +120,7 @@ icon_state = RAD desc = "A hood with radiation protective properties. The label reads, 'Made with lead. Please do not consume insulation.'" clothing_flags = THICKMATERIAL | SNUG_FIT - flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT armor = list(MELEE = 0, BULLET = 0, LASER = 0,ENERGY = 0, BOMB = 0, BIO = 60, RAD = 100, FIRE = 30, ACID = 30) strip_delay = 60 equip_delay_other = 60 diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 92f7ed7df1c..d4beb308bbb 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -91,7 +91,7 @@ inhand_icon_state = "bunnyhead" desc = "Considerably more cute than 'Frank'." slowdown = -1 - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT /obj/item/clothing/suit/bunnysuit name = "Easter Bunny Suit" diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 3de8c9d5fed..ecb8de37840 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -772,7 +772,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) bodyparts_to_add -= "waggingspines" if(mutant_bodyparts["snout"]) //Take a closer look at that snout! - if((H.wear_mask && (H.wear_mask.flags_inv & HIDEFACE)) || (H.head && (H.head.flags_inv & HIDEFACE)) || !HD || HD.status == BODYPART_ROBOTIC) + if((H.wear_mask && (H.wear_mask.flags_inv & HIDESNOUT)) || (H.head && (H.head.flags_inv & HIDESNOUT)) || !HD || HD.status == BODYPART_ROBOTIC) bodyparts_to_add -= "snout" if(mutant_bodyparts["frills"])