From 7a7ebd561bfb7a9f4bea38e932a703cc8e76010c Mon Sep 17 00:00:00 2001
From: thgvr <81882910+thgvr@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:38:53 -0800
Subject: [PATCH] Adds HIDEHORNS bitflag (wigzards can live) (#2715)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds new HIDEHORNS bitflag for things that need to hide horns and shifts
mask+head handling to use it instead of HIDEHAIR.
This means wigs now
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl:
fix: Wigs no longer hide Sarathi horns
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
---
 code/__DEFINES/inventory.dm                     | 9 +++++----
 code/modules/mob/living/carbon/human/species.dm | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm
index e644340cd333..a5195f26623d 100644
--- a/code/__DEFINES/inventory.dm
+++ b/code/__DEFINES/inventory.dm
@@ -52,13 +52,14 @@
 #define HIDESUITSTORAGE (1<<1)
 #define HIDEJUMPSUIT (1<<2)	//these first four are only used in exterior suits
 #define HIDESHOES (1<<3)
-#define HIDEMASK (1<<4)	//these last six are only used in masks and headgear.
-#define HIDEEARS (1<<5)	// (ears means headsets and such)
-#define HIDEEYES (1<<6)	// Whether eyes and glasses are hidden
-#define HIDEFACE (1<<7)	// Whether we appear as unknown.
+#define HIDEMASK (1<<4)		//these last six are only used in masks and headgear.
+#define HIDEEARS (1<<5)		// (ears means headsets and such)
+#define HIDEEYES (1<<6)		// Whether eyes and glasses are hidden
+#define HIDEFACE (1<<7)		// Whether we appear as unknown.
 #define HIDEHAIR (1<<8)
 #define HIDEFACIALHAIR (1<<9)
 #define HIDENECK (1<<10)
+#define HIDEHORNS (1<<11) 	// Used for hiding Sarathi horns.
 
 //bitflags for clothing coverage - also used for limbs
 #define HEAD (1<<0)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index fbe020099ee8..eda9c8c3db64 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -809,7 +809,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			bodyparts_to_add -= "face_markings"
 
 	if("horns" in mutant_bodyparts)
-		if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHAIR) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHAIR)) || !HD)
+		if(!H.dna.features["horns"] || H.dna.features["horns"] == "None" || H.head && (H.head.flags_inv & HIDEHORNS) || (H.wear_mask && (H.wear_mask.flags_inv & HIDEHORNS)) || !HD)
 			bodyparts_to_add -= "horns"
 
 	if("frills" in mutant_bodyparts)