Shield Fix (#12074)

This commit is contained in:
Geeves
2021-06-20 17:32:48 -03:00
committed by GitHub
parent c6444fa548
commit e5a34c4f08
18 changed files with 73 additions and 62 deletions
@@ -165,15 +165,15 @@ emp_act
for(var/obj/item/shield in list(l_hand, r_hand, wear_suit, back))
if(!shield)
continue
if(!shield.can_shield_back())
continue
var/is_on_back = FALSE
if(back && back == shield)
if(!shield.can_shield_back())
continue
is_on_back = TRUE
. = shield.handle_shield(src, is_on_back, damage, damage_source, attacker, def_zone, attack_text)
if(.)
return
return 0
return FALSE
/mob/living/carbon/human/emp_act(severity)
if(isipc(src))