From a67b806dba1e4ae484ae98f1fec2fc18daf47c1d Mon Sep 17 00:00:00 2001 From: magatsuchi <88991542+magatsuchi@users.noreply.github.com> Date: Mon, 18 Jul 2022 12:25:05 -0500 Subject: [PATCH] fixes TRAIT_NODROP items being able to be put into storage (#68516) initial --- code/datums/storage/storage.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/storage/storage.dm b/code/datums/storage/storage.dm index 67deab9a4d0..d8e6a6ffa15 100644 --- a/code/datums/storage/storage.dm +++ b/code/datums/storage/storage.dm @@ -340,6 +340,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches) to_chat(user, span_warning("\The [resolve_parent] cannot hold \the [to_insert]!")) return FALSE + if(HAS_TRAIT(to_insert, TRAIT_NODROP)) + if(messages) + to_chat(user, span_warning("\The [to_insert] is stuck on your hand!")) + return FALSE + var/datum/storage/biggerfish = resolve_parent.loc.atom_storage // this is valid if the container our resolve_parent is being held in is a storage item if(biggerfish && biggerfish.max_specific_storage < max_specific_storage)