From e99a5952aeb17cec39894e26a3c715ded32486bc Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon, 28 Jun 2021 10:45:24 -0400 Subject: [PATCH] Prevents AIS from gibbing when being carded from a mech (#16271) --- code/game/mecha/mecha.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 2c9682702f6..f60da7b879a 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -1200,7 +1200,8 @@ /obj/mecha/Exited(atom/movable/M, atom/newloc) if(occupant && occupant == M) // The occupant exited the mech without calling go_out() - go_out(1, newloc) + if(!isAI(occupant)) //This causes carded AIS to gib, so we do not want this to be called during carding. + go_out(1, newloc) /obj/mecha/proc/go_out(forced, atom/newloc = loc) if(!occupant)