[MIRROR] Fixed a runtime error with lobstrosity charge (also rust cha…

…rge). [MDB IGNORE] (#1199) * Fixed a runtime error with lobstrosity charge (also rust charge). (#80392) --------- Co-authored-by: SkyratBot <[email protected]> Co-authored-by: Ghom <[email protected]>
Fluffy-Frontier · Dec 18, 2023 · 6e827fa · 6e827fa
1 parent 5474f2b
commit 6e827fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/code/modules/antagonists/heretic/magic/rust_charge.dm b/code/modules/antagonists/heretic/magic/rust_charge.dm
@@ -46,4 +46,4 @@
 			SSexplosions.med_mov_atom += target
 
 	INVOKE_ASYNC(src, PROC_REF(DestroySurroundings), source)
-	hit_target(source, target, charge_damage)
+	try_hit_target(source, target, charge_damage)
diff --git a/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm b/code/modules/mob/living/basic/lavaland/lobstrosity/lobstrosity.dm
@@ -68,7 +68,7 @@
 
 /datum/action/cooldown/mob_cooldown/charge/basic_charge/lobster/hit_target(atom/movable/source, atom/target, damage_dealt)
 	. = ..()
-	if(!isbasicmob(source))
+	if(!isbasicmob(source) || !isliving(target))
 		return
 	var/mob/living/basic/basic_source = source
 	var/mob/living/living_target = target