From a077f7f028ad900cfb9c95949c98b8cbb7098eb7 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Thu, 1 Feb 2024 20:47:06 +0000 Subject: [PATCH] works --- code/modules/gear_presets/synths.dm | 5 ----- .../mob/living/carbon/human/species/working_joe/_species.dm | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/gear_presets/synths.dm b/code/modules/gear_presets/synths.dm index 57bc5be27ec2..659bb832ef51 100644 --- 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 index 1a8db85b6ca4..73d62f369916 100644 --- 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))