From 6e827fa082d906a0ad7a2a0dcb962f86bbfb347e Mon Sep 17 00:00:00 2001 From: Iajret Creature <122297233+Steals-The-PRs@users.noreply.github.com> Date: Mon, 18 Dec 2023 23:53:19 +0300 Subject: [PATCH] [MIRROR] Fixed a runtime error with lobstrosity charge (also rust charge). [MDB IGNORE] (#1199) * Fixed a runtime error with lobstrosity charge (also rust charge). (#80392) --------- Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/antagonists/heretic/magic/rust_charge.dm | 2 +- .../mob/living/basic/lavaland/lobstrosity/lobstrosity.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/heretic/magic/rust_charge.dm b/code/modules/antagonists/heretic/magic/rust_charge.dm index 0d693b0de86..d5427cf3762 100644 --- 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 index 64facb5cfa3..88127b56cb6 100644 --- 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