Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655

2020-04-09 15:46:19 +02:00
parent 45d1917f0f 5078b5875a
commit 7c1e5aa2c9
415 changed files with 144051 additions and 5109 deletions
@@ -35,10 +35,10 @@
 	. = ..()
 	saber_color = "red"

-/obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	if(active)
+/obj/item/holo/esword/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return)
+	if(!active)
 		return ..()
-	return 0
+	return ..()

 /obj/item/holo/esword/attack(target as mob, mob/user as mob)
 	..()