diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm
index adf8656708..12e222e1ef 100644
--- a/code/__DEFINES/traits.dm
+++ b/code/__DEFINES/traits.dm
@@ -130,6 +130,8 @@
#define TRAIT_CROCRIN_IMMUNE "crocin_immune"
#define TRAIT_NYMPHO "nymphomania"
#define TRAIT_MASO "masochism"
+#define TRAIT_EMPATH "empath"
+#define TRAIT_FRIENDLY "friendly"
#define TRAIT_ASSBLASTUSA "assblastusa"
#define TRAIT_CULT_EYES "cult_eyes"
diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm
index 4021d11128..06857c0f55 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..051a548d1d 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/happy_empath
+ description = "Someone seems happy!\n"
+ mood_change = 2
+ timeout = 600
+
+/datum/mood_event/happy_empath/add_effects(var/mob/happytarget)
+ description = "[happytarget.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 e40c591014..36e2365d6b 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")
@@ -306,6 +312,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 de99287d41..76399147b7 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -281,6 +281,27 @@
if(91.01 to INFINITY)
msg += "[t_He] [t_is] a shitfaced, slobbering wreck.\n"
+ if(isliving(user))
+ var/mob/living/L = user
+ 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)
+ 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 += ""
if(!appears_dead)
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..b53ce417e8 100644
--- a/modular_citadel/code/datums/mood_events/moodular.dm
+++ b/modular_citadel/code/datums/mood_events/moodular.dm
@@ -7,12 +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)