Skip to content

Makes it easier to poke and annoy your colleagues than ever before. Also makes it so that hugging or shaking someone's hand requires you to grab them first. #4868

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2025
Merged

Makes it easier to poke and annoy your colleagues than ever before. Also makes it so that hugging or shaking someone's hand requires you to grab them first. #4868

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f104d21
makes hugging require grabbing the person you'd like to hug, and make…
zimon9 May 22, 2025
95a31ab
oops
zimon9 May 22, 2025
8d8581d
makes shaking one's arm also require grabbing the person first -- oth…
zimon9 May 22, 2025
caf334e
fixes knockdown behavior double calling shaking one up and also behav…
zimon9 May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions code/modules/mob/living/carbon/carbon_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@
if(istype(dna.species, /datum/species/moth))
M.mothdust += 10; // End WS edit

if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Nose boops!
else if(M.zone_selected == BODY_ZONE_PRECISE_MOUTH) // Nose boops!
nosound = TRUE
playsound(src, 'sound/effects/boop.ogg', 50, 0)
if (HAS_TRAIT(M, TRAIT_FRIENDLY))
Expand Down Expand Up @@ -471,9 +471,12 @@
null, span_hear("You hear the rustling of clothes."), DEFAULT_MESSAGE_RANGE, list(M, src))
to_chat(M, span_notice("You wrap [src] into a tight bear hug!"))
to_chat(src, span_notice("[M] squeezes you super tightly in a firm bear hug!"))
else
else if((M.grab_state == GRAB_PASSIVE) && (M.pulling))
M.visible_message(span_notice("[M] hugs [src] to make [p_them()] feel better!"), \
span_notice("You hug [src] to make [p_them()] feel better!"))
else
M.visible_message(span_notice("[M] pokes [src]."), \
span_notice("You poke [src]."))
if(istype(M.dna.species, /datum/species/moth)) //WS edit - moth dust from hugging
mothdust += 15;
if(istype(dna.species, /datum/species/moth))
Expand All @@ -497,32 +500,36 @@
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "hug", /datum/mood_event/bad_touch_bear_hug)

// Let people know if they hugged someone really warm or really cold
if(M.bodytemperature > M.dna.species.bodytemp_heat_damage_limit)
to_chat(src, span_warning("It feels like [M] is over heating as they hug you."))
else if(M.bodytemperature < M.dna.species.bodytemp_cold_damage_limit)
to_chat(src, span_warning("It feels like [M] is freezing as they hug you."))

if(bodytemperature > dna.species.bodytemp_heat_damage_limit)
to_chat(M, span_warning("It feels like [src] is over heating as you hug them."))
else if(bodytemperature < dna.species.bodytemp_cold_damage_limit)
to_chat(M, span_warning("It feels like [src] is freezing as you hug them."))

if(HAS_TRAIT(M, TRAIT_FRIENDLY))
if (hugger_mood.sanity >= SANITY_GREAT)
new /obj/effect/temp_visual/heart(loc)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
else if (hugger_mood.sanity >= SANITY_DISTURBED)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M)

if(HAS_TRAIT(src, TRAIT_BADTOUCH))
to_chat(M, span_warning("[src] looks visibly upset as you hug [p_them()]."))
if ((M.grab_state == GRAB_PASSIVE) && (M.pulling))
if(M.bodytemperature > M.dna.species.bodytemp_heat_damage_limit)
to_chat(src, span_warning("It feels like [M] is over heating as they hug you."))
else if(M.bodytemperature < M.dna.species.bodytemp_cold_damage_limit)
to_chat(src, span_warning("It feels like [M] is freezing as they hug you."))

if(bodytemperature > dna.species.bodytemp_heat_damage_limit)
to_chat(M, span_warning("It feels like [src] is over heating as you hug them."))
else if(bodytemperature < dna.species.bodytemp_cold_damage_limit)
to_chat(M, span_warning("It feels like [src] is freezing as you hug them."))

if(HAS_TRAIT(M, TRAIT_FRIENDLY))
if (hugger_mood.sanity >= SANITY_GREAT)
new /obj/effect/temp_visual/heart(loc)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/besthug, M)
else if (hugger_mood.sanity >= SANITY_DISTURBED)
SEND_SIGNAL(src, COMSIG_ADD_MOOD_EVENT, "friendly_hug", /datum/mood_event/betterhug, M)

if(HAS_TRAIT(src, TRAIT_BADTOUCH))
to_chat(M, span_warning("[src] looks visibly upset as you hug [p_them()]."))

else if((M.zone_selected == BODY_ZONE_L_ARM) || (M.zone_selected == BODY_ZONE_R_ARM))
if(!get_bodypart(check_zone(M.zone_selected)))
to_chat(M, span_warning("[src] does not have a [M.zone_selected == BODY_ZONE_L_ARM ? "left" : "right"] arm!"))
else
else if((M.grab_state == GRAB_PASSIVE) && (M.pulling))
M.visible_message(span_notice("[M] shakes [src]'s hand."), \
span_notice("You shake [src]'s hand."))
else
M.visible_message(span_notice("[M] pats [src] on the shoulder."), \
span_notice("You pat [src] on the shoulder."))
else if((M.zone_selected == BODY_ZONE_L_LEG) || (M.zone_selected == BODY_ZONE_R_LEG))
if(!get_bodypart(check_zone(M.zone_selected)))
to_chat(M, span_warning("[src] does not have a [M.zone_selected == BODY_ZONE_L_LEG ? "left" : "right"] leg!"))
Expand Down
Loading