diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 5b99546fed97..8a121f8eae6f 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -82,8 +82,9 @@ #define DIGITIGRADE_VARIATION_NO_NEW_ICON (1<<2) #define DIGITIGRADE_VARIATION_SAME_ICON_FILE (1<<3) //intended for use with factional icon files for organization purposes, otherwise use either above. Ex of naming: a state called "nameof_thing" can be named "nameof_thing_digi" #define SNOUTED_VARIATION (1<<4) //Ex of naming: a state called "nameof_thing" can be named "nameof_thing_snouted" -#define VOX_VARIATION (1<<5) -#define KEPORI_VARIATION (1<<6) +#define SNOUTED_SMALL_VARIATION (1<<5) //For Elzuose snouts +#define VOX_VARIATION (1<<6) +#define KEPORI_VARIATION (1<<7) #define NOT_DIGITIGRADE 0 #define FULL_DIGITIGRADE 1 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 0bda789b98d4..e9a806203b79 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -135,10 +135,11 @@ #define BODYTYPE_ROBOTIC (1<<1) #define BODYTYPE_HUMANOID (1<<2) //Everything #define BODYTYPE_SNOUT (1<<3) //Snouts -#define BODYTYPE_BOXHEAD (1<<4) //TV Head -#define BODYTYPE_DIGITIGRADE (1<<5) //Lizard legs -#define BODYTYPE_KEPORI (1<<6) //Just Kepori -#define BODYTYPE_VOX (1<<7) //Big Vox +#define BODYTYPE_SNOUT_SMALL (1<<4) //Elzuose snouts +#define BODYTYPE_BOXHEAD (1<<5) //TV Head +#define BODYTYPE_DIGITIGRADE (1<<6) //Lizard legs +#define BODYTYPE_KEPORI (1<<7) //Just Kepori +#define BODYTYPE_VOX (1<<8) //Big Vox // Health/damage defines #define MAX_LIVING_HEALTH 100 diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm index 9e3b1a24d9d9..f67e79a6f2e9 100644 --- a/code/modules/clothing/factions/ngr.dm +++ b/code/modules/clothing/factions/ngr.dm @@ -234,6 +234,7 @@ item_state = "ngr_facemask" icon = 'icons/obj/clothing/faction/ngr/mask.dmi' mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi' + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION ////////// //Neck// diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 6bb58bb2b4e5..2790359d0b7c 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -7,6 +7,7 @@ visor_flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR w_class = WEIGHT_CLASS_SMALL actions_types = list(/datum/action/item_action/adjust) + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION /obj/item/clothing/mask/balaclava/attack_self(mob/user) adjustmask(user) diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 78bbc032e861..db12fff06885 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -75,6 +75,7 @@ strip_delay = 60 alternate_worn_layer = BODY_LAYER flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEARS|HIDEHAIR + supports_variations = SNOUTED_VARIATION | SNOUTED_SMALL_VARIATION /obj/item/clothing/mask/gas/sechailer/balaclava/inteq desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This one is a variataion commonly used by the IRMG to protect it's members idenites." diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 1400d2c641ca..56ee24b22213 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -687,6 +687,9 @@ There are several things that need to be remembered: if((head_bodypart.bodytype & BODYTYPE_SNOUT) && (I.supports_variations & SNOUTED_VARIATION)) target_overlay = "[target_overlay]_snouted" + if((head_bodypart.bodytype & BODYTYPE_SNOUT_SMALL) && (I.supports_variations & SNOUTED_SMALL_VARIATION)) + target_overlay = "[target_overlay]_snouted_small" + if(dna.species.bodytype & BODYTYPE_VOX) if(I.supports_variations & VOX_VARIATION) icon_file = VOX_MASK_PATH diff --git a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm index 0794602de953..ebf294a3cccf 100644 --- a/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/ethereal_bodyparts.dm @@ -4,7 +4,7 @@ limb_id = SPECIES_ELZUOSE is_dimorphic = FALSE uses_mutcolor = TRUE - bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_SNOUT + bodytype = BODYTYPE_HUMANOID | BODYTYPE_ORGANIC | BODYTYPE_SNOUT_SMALL /obj/item/bodypart/chest/ethereal icon = 'icons/mob/species/ethereal/bodyparts.dmi' diff --git a/icons/mob/clothing/faction/ngr/mask.dmi b/icons/mob/clothing/faction/ngr/mask.dmi index 0baead0a39b1..ef0c2bb56311 100644 Binary files a/icons/mob/clothing/faction/ngr/mask.dmi and b/icons/mob/clothing/faction/ngr/mask.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 8affe54d81d4..ba7a8a6b983a 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ