From f48ff52bf26fc837995cca6b1f299b78a3228238 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Mon, 20 Apr 2015 19:06:21 -0400 Subject: [PATCH] Twitch --- code/modules/mob/living/carbon/human/human_damage.dm | 1 + code/modules/mob/living/living.dm | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 95aeb8663d0..9bdd895a14a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -310,6 +310,7 @@ This function restores all organs. damage = damage*species.brute_mod if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) UpdateDamageIcon() + receive_damage() if(BURN) damageoverlaytemp = 20 if(species && species.burn_mod) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2901ae318aa..a19ee6e5207 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -808,6 +808,17 @@ ..() floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement. + +/atom/movable/proc/receive_damage(atom/A) + var/pixel_x_diff = rand(-3,3) + var/pixel_y_diff = rand(-3,3) + animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2) + animate(pixel_x = initial(pixel_x), pixel_y = initial(pixel_y), time = 2) + +/mob/living/receive_damage(atom/A) + ..() + floating = 0 // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement. + /mob/living/proc/do_jitter_animation(jitteriness) var/amplitude = min(4, (jitteriness/100) + 1) var/pixel_x_diff = rand(-amplitude, amplitude)