From a416dd8c831720435ddbd31e588c4d8f4839dedb Mon Sep 17 00:00:00 2001
From: Contrabang <91113370+Contrabang@users.noreply.github.com>
Date: Sun, 16 Jul 2023 13:17:51 -0400
Subject: [PATCH] its supposed to be pre-hugcode (#21606)
---
code/modules/mob/living/carbon/carbon.dm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 465313ff493..02cdbf43b15 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -251,6 +251,11 @@
"You shake [src] trying to wake [p_them()] up!",\
)
return
+ // If it has any of the highfive statuses, dap, handshake, etc
+ var/datum/status_effect/effect = has_status_effect_type(STATUS_EFFECT_HIGHFIVE)
+ if(effect)
+ M.apply_status_effect(effect.type)
+ return
// BEGIN HUGCODE - N3X
playsound(get_turf(src), 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(M.zone_selected == "head")
@@ -259,11 +264,6 @@
"You pat [src] on the head.",\
)
return
- // If it has any of the highfive statuses, dap, handshake, etc
- var/datum/status_effect/effect = has_status_effect_type(STATUS_EFFECT_HIGHFIVE)
- if(effect)
- M.apply_status_effect(effect.type)
- return
M.visible_message(\
"[M] gives [src] a [pick("hug","warm embrace")].",\
"You hug [src].",\