cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 21:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fixes energy shield bugs and adds colour change as they take damage" (#22805)

Browse Source 
Breaks humans taking damage
This commit is contained in:
Matt Atlas
2026-07-09 23:03:12 +02:00
committed by GitHub
parent 8494a3146f
commit 7a609f1ad7
5 changed files with 19 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+3 -5
View File
@@ -152,7 +152,6 @@ emp_act
return null
/mob/living/carbon/human/check_shields(damage, atom/damage_source, mob/attacker, def_zone, attack_text = "the attack")
var/result
for(var/obj/item/shield in list(l_hand, r_hand, wear_suit, back))
if(!shield)
continue
@@ -161,10 +160,9 @@ emp_act
if(!shield.can_shield_back())
continue
is_on_back = TRUE
result = shield.handle_shield(src, is_on_back, damage, damage_source, attacker, def_zone, attack_text)
if (result == BULLET_ACT_FORCE_PIERCE || result == BULLET_ACT_BLOCK) //Necessary to handle multiple shields.
return result
return result
return shield.handle_shield(src, is_on_back, damage, damage_source, attacker, def_zone, attack_text)
return BULLET_ACT_HIT
/mob/living/carbon/human/emp_act(severity)
/*