joe_flag

cmss13-devs · Mar 24, 2024 · aa356e2 · aa356e2
1 parent 317d05a
commit aa356e2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm
@@ -35,7 +35,7 @@
 #define EMOTE_NO_MESSAGE (1<<3)
 
 // Bitflags for Working Joe emotes
+/// Working Joe emote
+#define WORKING_JOE_EMOTE (1<<0)
 /// Hazard Joe emote
 #define HAZARD_JOE_EMOTE (1<<1)
-/// Both Hazard and Working Joe emote
-#define BOTH_JOE_EMOTE (1<<2)
diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm
@@ -530,7 +530,7 @@ GLOBAL_LIST_INIT(available_specialist_kit_boxes, list(
 /proc/setup_working_joe_emotes()
 	var/list/emotes_to_add = list()
 	for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe))
-		if((emote.hazard_flag && emote.hazard_flag != BOTH_JOE_EMOTE) || !initial(emote.key) || !initial(emote.say_message))
+		if(!(emote.joe_flag & WORKING_JOE_EMOTE) || !initial(emote.key) || !initial(emote.say_message))
 			continue
 
 		if(!(initial(emote.category) in GLOB.wj_categories))
@@ -543,7 +543,7 @@ GLOBAL_LIST_INIT(available_specialist_kit_boxes, list(
 /proc/setup_hazard_joe_emotes()
 	var/list/emotes_to_add = list()
 	for(var/datum/emote/living/carbon/human/synthetic/working_joe/emote as anything in subtypesof(/datum/emote/living/carbon/human/synthetic/working_joe))
-		if(((!emote.hazard_flag || (emote.hazard_flag != BOTH_JOE_EMOTE && emote.hazard_flag != HAZARD_JOE_EMOTE))) || !initial(emote.key) || !initial(emote.say_message))
+		if(!(emote.joe_flag & HAZARD_JOE_EMOTE) || !initial(emote.key) || !initial(emote.say_message))
 			continue
 
 		if(!(initial(emote.category) in GLOB.hj_categories))

diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm b/code/modules/mob/living/carbon/human/species/working_joe/_emote.dm
@@ -8,7 +8,7 @@
 	var/override_say = ""
 	/// Path to hazard joe variant sound
 	var/haz_sound
-	/// Alt message for Hazard Joe voiceline, if empty, will play message instead
+	/// Alt message for Hazard Joe voiceline, if empty, will play message instead. Should only be set if emote used for both joes
 	var/haz_message = ""
-	/// If set to HAZARD, only Hazard joes use this emote, if BOTH, both.
-	var/hazard_flag
+	/// What Working Joe types can use this emote
+	var/joe_flag = WORKING_JOE_EMOTE
diff --git a/code/modules/mob/living/carbon/human/species/working_joe/quip.dm b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm
@@ -8,7 +8,7 @@
 	haz_sound = 'sound/voice/joe/alwaysknow_haz.ogg'
 	say_message = "You always know a Working Joe."
 	emote_type = EMOTE_AUDIBLE|EMOTE_VISIBLE
-	hazard_flag = BOTH_JOE_EMOTE
+	joe_flag = WORKING_JOE_EMOTE|HAZARD_JOE_EMOTE
 
 /datum/emote/living/carbon/human/synthetic/working_joe/quip/awful_mess
 	key = "awful"