From 6d2c21168855718df45c5006c5415bb997acfe0e Mon Sep 17 00:00:00 2001 From: Kyep <16434066+Kyep@users.noreply.github.com> Date: Tue, 22 Dec 2020 18:08:10 +0000 Subject: [PATCH] Fixes organs_internal:295 runtime (#15171) Co-authored-by: Kyep --- code/modules/surgery/organs_internal.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm index 554f8bd63e4..b3ee81cdc0a 100644 --- a/code/modules/surgery/organs_internal.dm +++ b/code/modules/surgery/organs_internal.dm @@ -291,11 +291,11 @@ add_attack_logs(user, target, "Surgically removed [I.name]. INTENT: [uppertext(user.a_intent)]") spread_germs_to_organ(I, user, tool) var/obj/item/thing = I.remove(target) - if(!istype(thing)) - thing.forceMove(get_turf(target)) - else - user.put_in_hands(thing) - + if(thing) // some "organs", like egg infections, can have I.remove(target) return null, and so we can't use "thing" in that case + if(istype(thing)) + user.put_in_hands(thing) + else + thing.forceMove(get_turf(target)) target.update_icons() else user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",