From f8586c9699cebf44af7ec188a3702a5f3b9deb95 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sat, 1 Jun 2019 18:51:25 +0100 Subject: [PATCH 1/8] Adds Friendly and empahty quirk from tg. --- code/__DEFINES/traits.dm | 2 ++ .../mood_events/generic_negative_events.dm | 8 +++++++ .../mood_events/generic_positive_events.dm | 24 +++++++++++++++++++ code/datums/traits/good.dm | 17 +++++++++++++ .../mob/living/carbon/carbon_defense.dm | 6 +++++ .../mob/living/carbon/human/examine.dm | 19 +++++++++++++++ 6 files changed, 76 insertions(+) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index b2caf614b3..1dca4b9633 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -72,6 +72,8 @@ #define TRAIT_CROCRIN_IMMUNE "crocin_immune" #define TRAIT_NYMPHO "nymphomania" #define TRAIT_MASO "masochism" +#define TRAIT_EMPATH "empath" +#define TRAIT_FRIENDLY "friendly" // common trait sources #define TRAIT_GENERIC "generic" diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 4021d11128..fc3e689c7e 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -125,3 +125,11 @@ /datum/mood_event/surgery description = "HE'S CUTTING ME OPEN!!\n" mood_change = -8 + +/datum/mood_event/sad_empath + description = "Someone seems upset...\n" + mood_change = -2 + timeout = 600 + + /datum/mood_event/sad_empath/add_effects(mob/sadtarget) + description = "[sadtarget.name] seems upset...\n" diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 6989744fe3..ac2e31d37d 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -75,3 +75,27 @@ description = "There is something soothing about this music.\n" mood_change = 3 timeout = 600 + +/datum/mood_event/betterhug + description = "Someone was very nice to me.\n" + mood_change = 3 + timeout = 3000 + + /datum/mood_event/betterhug/add_effects(mob/friend) + description = "[friend.name] was very nice to me.\n" + + /datum/mood_event/besthug + description = "Someone is great to be around, they make me feel so happy!\n" + mood_change = 5 + timeout = 3000 + + /datum/mood_event/besthug/add_effects(mob/friend) + description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!\n" + +/datum/mood_event/sad_empath + description = "Someone seems happy!\n" + mood_change = 2 + timeout = 600 + + /datum/mood_event/sad_empath/add_effects(mob/sadtarget) + description = "[sadtarget.name]'s happiness is infectious!\n" diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 513115b194..300a1264eb 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -35,6 +35,14 @@ lose_text = "You no longer feel like drinking would ease your pain." medical_record_text = "Patient has unusually efficient liver metabolism and can slowly regenerate wounds by drinking alcoholic beverages." +/datum/quirk/empath + name = "Empath" + desc = "Whether it's a sixth sense or careful study of body language, it only takes you a quick glance at someone to understand how they feel." + value = 2 + mob_trait = TRAIT_EMPATH + gain_text = "You feel in tune with those around you." + lose_text = "You feel isolated from others." + /datum/quirk/freerunning name = "Freerunning" desc = "You're great at quick moves! You can climb tables more quickly." @@ -43,6 +51,15 @@ gain_text = "You feel lithe on your feet!" lose_text = "You feel clumsy again." +/datum/quirk/friendly + name = "Friendly" + desc = "You give the best hugs, especially when you're in the right mood." + value = 1 + mob_trait = TRAIT_FRIENDLY + gain_text = "You want to hug someone." + lose_text = "You no longer feel compelled to hug others." + mood_quirk = TRUE + /datum/quirk/jolly name = "Jolly" desc = "You sometimes just feel happy, for no reason at all." diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index d8bb90460a..a739f599af 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -306,6 +306,12 @@ M.visible_message("[M] hugs [src] to make [p_them()] feel better!", \ "You hug [src] to make [p_them()] feel better!") SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) + if(M.has_trait(TRAIT_FRIENDLY)) + GET_COMPONENT_FROM(mood, /datum/component/mood, M) + if (mood.sanity >= SANITY_GREAT) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M) + else if (mood.sanity >= SANITY_DISTURBED) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M) AdjustStun(-60) AdjustKnockdown(-60) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 26e19ff376..a18c598173 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,6 +281,25 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" + if(user.has_trait(TRAIT_EMPATH) && !appears_dead && (src != user)) + if (a_intent != INTENT_HELP) + msg += "[t_He] seem[p_s()] to be on guard.\n" + if (getOxyLoss() >= 10) + msg += "[t_He] seem[p_s()] winded.\n" + if (getToxLoss() >= 10) + msg += "[t_He] seem[p_s()] sickly.\n" + GET_COMPONENT_FROM(mood, /datum/component/mood, src) + if(mood.sanity <= SANITY_DISTURBED) + msg += "[t_He] seem[p_s()] distressed.\n" + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) + if(mood.sanity >= SANITY_GREAT) + msg += "[t_He] seem[p_s()] to be doing well!\n" + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empathH", /datum/mood_event/happy_empath, src) + if (has_trait(TRAIT_BLIND)) + msg += "[t_He] appear[p_s()] to be staring off into space.\n" + if (has_trait(TRAIT_DEAF)) + msg += "[t_He] appear[p_s()] to not be responding to noises.\n" + msg += "" if(!appears_dead) From 5918b026aa41b5adc0abbd07caa4d6ce6e712fcf Mon Sep 17 00:00:00 2001 From: Fermi Date: Sat, 1 Jun 2019 20:02:51 +0100 Subject: [PATCH 2/8] Fixes, PLEASE CHECK HEADPATS IN MOODULAR. --- .../mood_events/generic_negative_events.dm | 2 +- .../mood_events/generic_positive_events.dm | 12 +++++----- .../mob/living/carbon/carbon_defense.dm | 16 +++++++++---- .../mob/living/carbon/human/examine.dm | 6 ++--- .../mood_events/generic_positive_events.dm | 4 ++-- .../code/datums/mood_events/moodular.dm | 2 ++ tgstation.dme | 24 +++++++++---------- 7 files changed, 37 insertions(+), 29 deletions(-) diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index fc3e689c7e..06857c0f55 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -131,5 +131,5 @@ mood_change = -2 timeout = 600 - /datum/mood_event/sad_empath/add_effects(mob/sadtarget) +/datum/mood_event/sad_empath/add_effects(mob/sadtarget) description = "[sadtarget.name] seems upset...\n" diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index ac2e31d37d..051a548d1d 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -81,21 +81,21 @@ mood_change = 3 timeout = 3000 - /datum/mood_event/betterhug/add_effects(mob/friend) +/datum/mood_event/betterhug/add_effects(mob/friend) description = "[friend.name] was very nice to me.\n" - /datum/mood_event/besthug +/datum/mood_event/besthug description = "Someone is great to be around, they make me feel so happy!\n" mood_change = 5 timeout = 3000 - /datum/mood_event/besthug/add_effects(mob/friend) +/datum/mood_event/besthug/add_effects(mob/friend) description = "[friend.name] is great to be around, [friend.p_they()] makes me feel so happy!\n" -/datum/mood_event/sad_empath +/datum/mood_event/happy_empath description = "Someone seems happy!\n" mood_change = 2 timeout = 600 - /datum/mood_event/sad_empath/add_effects(mob/sadtarget) - description = "[sadtarget.name]'s happiness is infectious!\n" +/datum/mood_event/happy_empath/add_effects(var/mob/happytarget) + description = "[happytarget.name]'s happiness is infectious!\n" diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index a739f599af..2c27f7d585 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -277,6 +277,12 @@ M.visible_message("[M] gives [H] a pat on the head to make [p_them()] feel better!", \ "You give [H] a pat on the head to make [p_them()] feel better!") SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "headpat", /datum/mood_event/headpat) + if(M.has_trait(TRAIT_FRIENDLY)) + GET_COMPONENT_FROM(mood, /datum/component/mood, M) + if (mood.sanity >= SANITY_GREAT) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M) + else if (mood.sanity >= SANITY_DISTURBED) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M) if(H.dna.species.can_wag_tail(H)) if("tail_human" in pref_species.default_features) if(H.dna.features["tail_human"] == "None") @@ -307,11 +313,11 @@ "You hug [src] to make [p_them()] feel better!") SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/hug) if(M.has_trait(TRAIT_FRIENDLY)) - GET_COMPONENT_FROM(mood, /datum/component/mood, M) - if (mood.sanity >= SANITY_GREAT) - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M) - else if (mood.sanity >= SANITY_DISTURBED) - SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M) + GET_COMPONENT_FROM(mood, /datum/component/mood, M) + if (mood.sanity >= SANITY_GREAT) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M) + else if (mood.sanity >= SANITY_DISTURBED) + SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M) AdjustStun(-60) AdjustKnockdown(-60) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index a18c598173..59cdda8484 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,7 +281,7 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - if(user.has_trait(TRAIT_EMPATH) && !appears_dead && (src != user)) + if(has_trait(TRAIT_EMPATH) && !appears_dead && (src != user)) if (a_intent != INTENT_HELP) msg += "[t_He] seem[p_s()] to be on guard.\n" if (getOxyLoss() >= 10) @@ -292,8 +292,8 @@ if(mood.sanity <= SANITY_DISTURBED) msg += "[t_He] seem[p_s()] distressed.\n" SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) - if(mood.sanity >= SANITY_GREAT) - msg += "[t_He] seem[p_s()] to be doing well!\n" + if(mood.mood >= 5) //So roundstart people aren't all "happy" + msg += "[t_He] seem[p_s()] to have had something nice happen to them recently.\n" SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empathH", /datum/mood_event/happy_empath, src) if (has_trait(TRAIT_BLIND)) msg += "[t_He] appear[p_s()] to be staring off into space.\n" diff --git a/modular_citadel/code/datums/mood_events/generic_positive_events.dm b/modular_citadel/code/datums/mood_events/generic_positive_events.dm index 717fe5a47d..7b989d7700 100644 --- a/modular_citadel/code/datums/mood_events/generic_positive_events.dm +++ b/modular_citadel/code/datums/mood_events/generic_positive_events.dm @@ -24,11 +24,11 @@ description = "I came!\n" //funny meme haha mood_change = 3 timeout = 1000 - + /datum/mood_event/fedpred description = "I've devoured someone!\n" mood_change = 3 /datum/mood_event/fedprey description = "It feels quite cozy in here.\n" - mood_change = 3 \ No newline at end of file + mood_change = 3 diff --git a/modular_citadel/code/datums/mood_events/moodular.dm b/modular_citadel/code/datums/mood_events/moodular.dm index b764c0027e..5b0e5ace24 100644 --- a/modular_citadel/code/datums/mood_events/moodular.dm +++ b/modular_citadel/code/datums/mood_events/moodular.dm @@ -7,12 +7,14 @@ if(mood) mood.add_event("hugbox", /datum/mood_event/hugbox) +/* // headpats (IMPORTANT) /mob/living/carbon/help_shake_act(mob/living/carbon/M) . = ..() GET_COMPONENT_FROM(mood, /datum/component/mood, src) if(mood) mood.add_event("headpat", /datum/mood_event/headpat) +*/ // plush petting /obj/item/toy/plush/attack_self(mob/user) diff --git a/tgstation.dme b/tgstation.dme index f2cef76dd9..c9098249b0 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2505,22 +2505,10 @@ #include "code\modules\research\designs\AI_module_designs.dm" #include "code\modules\research\designs\biogenerator_designs.dm" #include "code\modules\research\designs\bluespace_designs.dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm" -#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm" #include "code\modules\research\designs\computer_part_designs.dm" #include "code\modules\research\designs\electronics_designs.dm" #include "code\modules\research\designs\equipment_designs.dm" #include "code\modules\research\designs\limbgrower_designs.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm" -#include "code\modules\research\designs\machine_desings\machine_designs_service.dm" #include "code\modules\research\designs\mecha_designs.dm" #include "code\modules\research\designs\mechfabricator_designs.dm" #include "code\modules\research\designs\medical_designs.dm" @@ -2538,6 +2526,18 @@ #include "code\modules\research\designs\autolathe_desings\autolathe_designs_sec_and_hacked.dm" #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tcomms_and_misc.dm" #include "code\modules\research\designs\autolathe_desings\autolathe_designs_tools.dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_all_misc.dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_cargo .dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_engi.dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_medical.dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sci.dm" +#include "code\modules\research\designs\comp_board_designs\comp_board_designs_sec.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_all_misc.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_cargo.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_engi.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_medical.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_sci.dm" +#include "code\modules\research\designs\machine_desings\machine_designs_service.dm" #include "code\modules\research\machinery\_production.dm" #include "code\modules\research\machinery\circuit_imprinter.dm" #include "code\modules\research\machinery\departmental_circuit_imprinter.dm" From 0105dbf562f2fbb6c33d3fa604faf39258617c0c Mon Sep 17 00:00:00 2001 From: Fermi Date: Sat, 1 Jun 2019 20:04:41 +0100 Subject: [PATCH 3/8] Removed duplicate headpat code. --- modular_citadel/code/datums/mood_events/moodular.dm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modular_citadel/code/datums/mood_events/moodular.dm b/modular_citadel/code/datums/mood_events/moodular.dm index 5b0e5ace24..b53ce417e8 100644 --- a/modular_citadel/code/datums/mood_events/moodular.dm +++ b/modular_citadel/code/datums/mood_events/moodular.dm @@ -7,14 +7,7 @@ if(mood) mood.add_event("hugbox", /datum/mood_event/hugbox) -/* -// headpats (IMPORTANT) -/mob/living/carbon/help_shake_act(mob/living/carbon/M) - . = ..() - GET_COMPONENT_FROM(mood, /datum/component/mood, src) - if(mood) - mood.add_event("headpat", /datum/mood_event/headpat) -*/ +//Removed headpats here, duplicate code? // plush petting /obj/item/toy/plush/attack_self(mob/user) From abb76baeca1d715ebbc1596277494dc84709de88 Mon Sep 17 00:00:00 2001 From: Thalpy <33956696+Thalpy@users.noreply.github.com> Date: Sun, 2 Jun 2019 19:14:08 +0100 Subject: [PATCH 4/8] Update code/modules/mob/living/carbon/human/examine.dm Ghoomie's change. Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 59cdda8484..ef792443a3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,7 +281,7 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - if(has_trait(TRAIT_EMPATH) && !appears_dead && (src != user)) + if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) if (a_intent != INTENT_HELP) msg += "[t_He] seem[p_s()] to be on guard.\n" if (getOxyLoss() >= 10) From e0690c610ae01e59c5312dc3cf8a28dbb9f9adf6 Mon Sep 17 00:00:00 2001 From: Thalpy <33956696+Thalpy@users.noreply.github.com> Date: Sun, 2 Jun 2019 20:53:41 +0100 Subject: [PATCH 5/8] Added a check to ensure empath target isn't dead. --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ef792443a3..a88250f4c7 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,7 +281,7 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) + if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead && !stat == DEAD) if (a_intent != INTENT_HELP) msg += "[t_He] seem[p_s()] to be on guard.\n" if (getOxyLoss() >= 10) From 5b56225b72bdae06aee5ee86133fd3ac83b01c34 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 2 Jun 2019 21:01:05 +0100 Subject: [PATCH 6/8] Wait how can the dead inspect? --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index a88250f4c7..ef792443a3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,7 +281,7 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead && !stat == DEAD) + if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) if (a_intent != INTENT_HELP) msg += "[t_He] seem[p_s()] to be on guard.\n" if (getOxyLoss() >= 10) From c11d2bac80bf9f8385f136b903db1cb8942cc4f6 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 2 Jun 2019 21:03:16 +0100 Subject: [PATCH 7/8] Okay, now it checks the right thing. --- .../mob/living/carbon/human/examine.dm | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index ef792443a3..9964b9c1ca 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -281,24 +281,26 @@ if(91.01 to INFINITY) msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n" - if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) - if (a_intent != INTENT_HELP) - msg += "[t_He] seem[p_s()] to be on guard.\n" - if (getOxyLoss() >= 10) - msg += "[t_He] seem[p_s()] winded.\n" - if (getToxLoss() >= 10) - msg += "[t_He] seem[p_s()] sickly.\n" - GET_COMPONENT_FROM(mood, /datum/component/mood, src) - if(mood.sanity <= SANITY_DISTURBED) - msg += "[t_He] seem[p_s()] distressed.\n" - SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) - if(mood.mood >= 5) //So roundstart people aren't all "happy" - msg += "[t_He] seem[p_s()] to have had something nice happen to them recently.\n" - SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empathH", /datum/mood_event/happy_empath, src) - if (has_trait(TRAIT_BLIND)) - msg += "[t_He] appear[p_s()] to be staring off into space.\n" - if (has_trait(TRAIT_DEAF)) - msg += "[t_He] appear[p_s()] to not be responding to noises.\n" + if(isliving(user)) + var/mob/living/L = user + if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) + if (a_intent != INTENT_HELP) + msg += "[t_He] seem[p_s()] to be on guard.\n" + if (getOxyLoss() >= 10) + msg += "[t_He] seem[p_s()] winded.\n" + if (getToxLoss() >= 10) + msg += "[t_He] seem[p_s()] sickly.\n" + GET_COMPONENT_FROM(mood, /datum/component/mood, src) + if(mood.sanity <= SANITY_DISTURBED) + msg += "[t_He] seem[p_s()] distressed.\n" + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empath", /datum/mood_event/sad_empath, src) + if(mood.mood >= 5) //So roundstart people aren't all "happy" + msg += "[t_He] seem[p_s()] to have had something nice happen to them recently.\n" + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "empathH", /datum/mood_event/happy_empath, src) + if (has_trait(TRAIT_BLIND)) + msg += "[t_He] appear[p_s()] to be staring off into space.\n" + if (has_trait(TRAIT_DEAF)) + msg += "[t_He] appear[p_s()] to not be responding to noises.\n" msg += "" From 1a73cf6efe58f3757dac9544e2451515b1fdeac9 Mon Sep 17 00:00:00 2001 From: Fermi Date: Sun, 2 Jun 2019 21:09:31 +0100 Subject: [PATCH 8/8] This is why you compile test. --- code/modules/mob/living/carbon/human/examine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 9964b9c1ca..6dc15048d7 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -283,7 +283,7 @@ if(isliving(user)) var/mob/living/L = user - if(src != user && user.has_trait(TRAIT_EMPATH) && !appears_dead) + if(src != user && L.has_trait(TRAIT_EMPATH) && !appears_dead) if (a_intent != INTENT_HELP) msg += "[t_He] seem[p_s()] to be on guard.\n" if (getOxyLoss() >= 10)