works

cmss13-devs · Feb 1, 2024 · a077f7f · a077f7f
1 parent b202503
commit a077f7f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm
@@ -579,11 +579,6 @@
 	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/large_stack(new_human.back), WEAR_IN_R_STORE)
 	new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/glass/reinforced/large_stack(new_human.back), WEAR_IN_R_STORE)
 
-
-
-/datum/equipment_preset/synth/working_joe/load_race(mob/living/carbon/human/new_human)
-	new_human.set_species(SYNTH_WORKING_JOE)
-
 //*****************************************************************************************************/
 
 /datum/equipment_preset/synth/survivor/cultist_synth

diff --git a/code/modules/mob/living/carbon/human/species/working_joe/_species.dm b/code/modules/mob/living/carbon/human/species/working_joe/_species.dm
@@ -71,7 +71,7 @@
 	if(!length(wj_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(!initial(emote.key) || !initial(emote.say_message))
+			if(initial(emote.hazard) || !initial(emote.key) || !initial(emote.say_message))
 				continue
 
 			if(!(initial(emote.category) in wj_categories))