From fe7cbf8842955dedc827f572634fb330c33f22be Mon Sep 17 00:00:00 2001 From: Kyle Spier-Swenson Date: Sat, 9 Jan 2021 21:08:27 -0800 Subject: [PATCH] throw_at() will not quickstart a throw if the throw was triggered from the same stack as SSthrowing/fire() (#56004) throw_at will not quickstart a throw if the throw was triggered from the same stack as SSthrowing/fire() Infinite throwing loops are fine, as long as they don't loop at the stack level. --- code/game/atoms_movable.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index fbf8b0c84aa..6fa1cda5588 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -737,7 +737,8 @@ if(pulledby) pulledby.stop_pulling() - + if (quickstart && (throwing || SSthrowing.state == SS_RUNNING)) //Avoid stack overflow edgecases. + quickstart = FALSE throwing = TT if(spin) SpinAnimation(5, 1)