From 494a4509c2173baba99368ec7934ee7b47b0397c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 17 Sep 2020 03:06:11 +0200 Subject: [PATCH] [MIRROR] Fix burning black crossbreed runtime on humanizing (#834) * Fix burning black crossbreed runtime on humanizing (#53740) When transforming back to a human, /obj/effect/proc_holder/spell/targeted/shapeshift/slimeform/Restore called the parent but didn't return it, instead returning nothing (always null). It's used in /obj/effect/proc_holder/spell/targeted/shapeshift/cast when transforming back to human via the Burning Black crossbreed which expect Restore() to return a mob. The code would then go on to immediately runtime. With the appropriate return, this runtime no longer happens as the value is no longer null. * Fix burning black crossbreed runtime on humanizing Co-authored-by: Timberpoes --- code/modules/research/xenobiology/crossbreeding/_mobs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_mobs.dm b/code/modules/research/xenobiology/crossbreeding/_mobs.dm index 0d155f2f90f..cb16435e3d1 100644 --- a/code/modules/research/xenobiology/crossbreeding/_mobs.dm +++ b/code/modules/research/xenobiology/crossbreeding/_mobs.dm @@ -21,7 +21,7 @@ Slimecrossing Mobs if(remove_on_restore) if(M.mind) M.mind.RemoveSpell(src) - ..() + return ..() //Transformed slime - Burning Black /mob/living/simple_animal/slime/transformedslime