Merge branch 'master' into wound-port

2020-07-21 01:10:51 +01:00
parent 037cec508e b6f689b06d
commit 75a2035774
105 changed files with 695 additions and 263 deletions
@@ -371,7 +371,7 @@
 		if(isliving(hit_atom))
 			var/mob/living/M = hit_atom
 			if(!M.anti_magic_check())
-				M.electrocute_act(80, src, SHOCK_ILLUSION)
+				M.electrocute_act(80, src, null, SHOCK_ILLUSION)
 		qdel(src)

 /obj/item/spellpacket/lightningbolt/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)