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

2020-05-10 22:36:04 +02:00
parent e0b91c53af e1d113b970
commit 5ed6a18ef7
105 changed files with 1079 additions and 1039 deletions
@@ -11,7 +11,7 @@
 	var/charge_cost = 30

 /obj/item/borg/stun/attack(mob/living/M, mob/living/user)
-	if(M.run_block(src, 0, "[M]'s [name]", ATTACK_TYPE_MELEE, 0, user, ran_zone(user.zone_selected)) & BLOCK_SUCCESS)
+	if(M.mob_run_block(src, 0, "[M]'s [name]", ATTACK_TYPE_MELEE, 0, user, ran_zone(user.zone_selected), null) & BLOCK_SUCCESS)
 		playsound(M, 'sound/weapons/genhit.ogg', 50, 1)
 		return FALSE
 	if(iscyborg(user))