From 9c011f5b25babed0431fe7d479219c2f87d0c322 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Wed, 6 May 2015 18:05:16 -0400 Subject: [PATCH] Re-added hitblips for superheros POW WHAMMY --- .../mob/living/carbon/human/human_damage.dm | 14 ++++++++++++++ icons/effects/hit_blips.dmi | Bin 0 -> 520 bytes 2 files changed, 14 insertions(+) create mode 100644 icons/effects/hit_blips.dmi diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 9bdd895a14a..cf74bb7e96a 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -310,6 +310,20 @@ This function restores all organs. damage = damage*species.brute_mod if(organ.take_damage(damage, 0, sharp, edge, used_weapon)) UpdateDamageIcon() + if(LAssailant && ishuman(LAssailant)) + var/mob/living/carbon/human/H = LAssailant + if(H.mind && H.mind in (ticker.mode.superheroes || ticker.mode.supervillains || ticker.mode.greyshirts)) + var/list/attack_bubble_recipients = list() + var/mob/living/user + for(var/mob/O in viewers(user, src)) + if (O.client && !( O.blinded )) + attack_bubble_recipients.Add(O.client) + spawn(0) + var/image/dmgIcon = image('icons/effects/hit_blips.dmi', src, "dmg[rand(1,2)]",MOB_LAYER+1) + dmgIcon.pixel_x = (!lying) ? rand(-3,3) : rand(-11,12) + dmgIcon.pixel_y = (!lying) ? rand(-11,9) : rand(-10,1) + //world << "x: [dmgIcon.pixel_x] AND y: [dmgIcon.pixel_y]" + flick_overlay(dmgIcon, attack_bubble_recipients, 9) receive_damage() if(BURN) damageoverlaytemp = 20 diff --git a/icons/effects/hit_blips.dmi b/icons/effects/hit_blips.dmi new file mode 100644 index 0000000000000000000000000000000000000000..53ec7b3fd074180e4cc9b6e19e032d410542da09 GIT binary patch literal 520 zcmV+j0{8uiP)ItnE)Eh01cQfF24W`ng<7q4GqA+!0hEsdjJ3c0d!JMQvg8b*k%9#0DyW_ zSad{Xb7OL8aCB*JZU6vyoKseCa&`CgQ*iP1_dEGYCD#~5X(bCQ#a_6g zOgdmZoh{lO7UjIZfd&$G68_Tl-2gJ#8XfB+$ZR=sL#X784SS*8Xfr4lT{S-4;brz6hV}O_&Qd`G~)TlRNwecjp&+Oyi%W{1j)g1s}M~UNiXs0000< KMNUMnLSTZyB+~!@ literal 0 HcmV?d00001