Balaclava Snout Sprites + Elzu Snouts (shiptest-ss13#3618)

## About The Pull Request Adds sprites for snouted balaclava variations (all sprites by moffball). Also adds a short snout variant, for Elzuose (coded with the help of @rye-rice). Comes with balaclava sprites for Elzuose as well (sprites also by moffball). (Top to bottom: Combat Balaclava, Inteq Balaclava, NGR Balaclava, NGR Facemask, Balaclava) ![image](https://github.com/user-attachments/assets/f6b5cb36-c2d1-4c25-9b40-34c5cb2ea0f8) ## Why It's Good For The Game Sarathi and Elzuose would no longer have weird clipping while wearing these masks :) ## Changelog :cl: MemeSnorfer and Moffball imageadd: Snouted balaclava sprites for both Sarathi and Elzuose code: Elzuose snout type, for use with mask sprites /:cl:
zimon9 · Oct 29, 2024 · 2681dc9 · 2681dc9
1 parent 5b6a707
commit 2681dc9
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi