Merge pull request #13327 from KorPhaeron/reactive

check_shields() refactor
This commit is contained in:
duncathan salt
2015-12-07 19:58:17 -06:00
17 changed files with 114 additions and 82 deletions
+2 -2
View File
@@ -31,9 +31,9 @@
New()
item_color = "red"
/obj/item/weapon/holo/esword/IsShield()
/obj/item/weapon/holo/esword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance)
if(active)
return 1
return ..()
return 0
/obj/item/weapon/holo/esword/attack(target as mob, mob/user as mob)