From ced45cfddd2c2baff0f9995a60284ce9fd6c367c Mon Sep 17 00:00:00 2001 From: nemvar Date: Wed, 16 Oct 2019 19:21:41 +0200 Subject: [PATCH] Fixes forceMove to null --- code/datums/components/storage/storage.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index f6b33f7326c..5b66786446b 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -723,8 +723,11 @@ if(!force) amount = min(remaining_space_items(), amount) for(var/i in 1 to amount) - handle_item_insertion(new type(real_location), TRUE) + if(!handle_item_insertion(new type(real_location), TRUE)) + return i > 1 //return TRUE only if at least one insertion has been successful. CHECK_TICK + if(QDELETED(src)) + return TRUE return TRUE /datum/component/storage/proc/on_attack_hand(datum/source, mob/user)