Merge pull request #12190 from farie82/shake-log-move

Moves the admin "Shake" log to the actual waking up people part of the code
This commit is contained in:
Fox McCloud
2019-09-02 17:36:27 -04:00
committed by GitHub
+1 -1
View File
@@ -213,7 +213,6 @@
swap_hand()
/mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
add_attack_logs(M, src, "Shaked", ATKLOG_ALL)
if(health >= HEALTH_THRESHOLD_CRIT)
if(src == M && ishuman(src))
check_self_for_injuries()
@@ -222,6 +221,7 @@
M.visible_message("<span class='notice'>[M] shakes [src], but [p_they()] [p_do()] not respond. Probably suffering from SSD.", \
"<span class='notice'>You shake [src], but [p_theyre()] unresponsive. Probably suffering from SSD.</span>")
if(lying) // /vg/: For hugs. This is how update_icon figgers it out, anyway. - N3X15
add_attack_logs(M, src, "Shaked", ATKLOG_ALL)
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.w_uniform)