From 30d42eeb41a962d0abfc58954fcdb3d3ab4ed273 Mon Sep 17 00:00:00 2001 From: Ben10083 Date: Sun, 24 Mar 2024 19:57:03 -0400 Subject: [PATCH] fixes and sound proc overwrite --- code/__DEFINES/typecheck/humanoids.dm | 3 ++- code/_globalvars/global_lists.dm | 7 ------- .../mob/living/carbon/human/species/working_joe/_emote.dm | 5 +++-- .../mob/living/carbon/human/species/working_joe/quip.dm | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/code/__DEFINES/typecheck/humanoids.dm b/code/__DEFINES/typecheck/humanoids.dm index 7076cf67c95c..76f561e5fa1f 100644 --- a/code/__DEFINES/typecheck/humanoids.dm +++ b/code/__DEFINES/typecheck/humanoids.dm @@ -14,7 +14,8 @@ #define isSEA(A) (ishuman(A) && A.job == "Senior Enlisted Advisor") #define issynth(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic)) #define iscolonysynthetic(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/colonial)) -#define isworkingjoe(A) (iscolonysynthetic(A) && A.job == JOB_WORKING_JOE) +#define isworkingjoe(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/colonial/working_joe)) +#define ishazardjoe(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/colonial/working_joe/hazard)) #define isinfiltratorsynthetic(A) (ishuman(A) && istype(A?:species, /datum/species/synthetic/infiltrator)) //Specic group checks, use instead of typechecks (but use traits instead) diff --git a/code/_globalvars/global_lists.dm b/code/_globalvars/global_lists.dm index fb8f4bf22e3b..8f5e16d889e0 100644 --- a/code/_globalvars/global_lists.dm +++ b/code/_globalvars/global_lists.dm @@ -549,14 +549,7 @@ GLOBAL_LIST_INIT(available_specialist_kit_boxes, list( if(!(initial(emote.category) in GLOB.hj_categories)) GLOB.hj_categories += initial(emote.category) - //edits to the emotes - if(emote.haz_message) - emote.say_message = emote.haz_message - - emote.sound = emote.haz_sound - emotes_to_add += emote - return emotes_to_add GLOBAL_LIST_EMPTY(topic_tokens) 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 index e57ed1938726..7e07abd74eae 100644 --- 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,8 @@ var/override_say = "" /// Path to hazard joe variant sound var/haz_sound - /// 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 = "" /// What Working Joe types can use this emote var/joe_flag = WORKING_JOE_EMOTE + +/datum/emote/living/carbon/human/synthetic/working_joe/get_sound(mob/living/user) + return ishazardjoe(user) ? haz_sound : sound 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 index d2b329e22480..e83ba4138a78 100644 --- a/code/modules/mob/living/carbon/human/species/working_joe/quip.dm +++ b/code/modules/mob/living/carbon/human/species/working_joe/quip.dm @@ -1,7 +1,7 @@ /datum/emote/living/carbon/human/synthetic/working_joe/quip category = JOE_EMOTE_CATEGORY_QUIP -/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow //THE FUNNY LINE +/datum/emote/living/carbon/human/synthetic/working_joe/quip/alwaysknow // THE FUNNY LINE key = "alwaysknow" key_third_person = "workingjoe" sound = 'sound/voice/joe/alwaysknow.ogg'