Skip to content

Commit

Permalink
[MIRROR] Hugs and Headpats (#2750)
Browse files Browse the repository at this point in the history
Co-authored-by: Hubblenaut <[email protected]>
Co-authored-by: Lexanx <[email protected]>
  • Loading branch information
3 people authored Nov 24, 2024
1 parent ccf2c30 commit ee5e044
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions code/modules/species/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ The slots that you can use are found in items_clothing.dm and are the inventory
post_organ_rejuvenate(O, H)

H.sync_organ_dna()
/* ------------------------> code\modules\emotes\definitions\_species.dm
/datum/species/proc/hug(mob/living/carbon/human/H,mob/living/target)
/* ------------------------> code\modules\emotes\definitions\_species.dm (У нас всё в моде в mods\emote_panel\code\species.dm)
/datum/species/proc/hug(mob/living/carbon/human/H, mob/living/target)
var/t_him = "them"
switch(target.gender)
Expand All @@ -441,8 +441,15 @@ The slots that you can use are found in items_clothing.dm and are the inventory
if(FEMALE)
t_him = "her"
H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), \
SPAN_NOTICE("You hug [target] to make [t_him] feel better!"))
// If aiming for the head, try a headpat
if (ishuman(target))
var/target_zone = check_zone(H.zone_sel.selecting)
var/mob/living/carbon/human/h_target = target
if (target_zone == BP_HEAD && h_target.get_organ(target_zone))
H.visible_message(SPAN_NOTICE("[H] pats [h_target]'s head to make [t_him] feel better!"), SPAN_NOTICE("You pat [h_target]'s head to make [t_him] feel better!"))
return
H.visible_message(SPAN_NOTICE("[H] hugs [target] to make [t_him] feel better!"), SPAN_NOTICE("You hug [target] to make [t_him] feel better!"))
if(H != target)
H.update_personal_goal(/datum/goal/achievement/givehug, TRUE)
Expand Down

0 comments on commit ee5e044

Please sign in to comment.