From 20d80858b6e524ec4ab7e6399432c7e3ab226705 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 31 Dec 2023 15:53:38 -0300 Subject: [PATCH] solve minor issues real quick --- code/game/objects/items/stacks/stack.dm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 0f04e1a6e7..6de1991675 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -136,8 +136,11 @@ . = ..() if(isturf(loc)) return - if(locate(/atom/movable/screen/storage/item_holder) in vis_locs) // It's being handled by the storage we're in, forget about it. - return + var/atom/movable/screen/storage/item_holder/holder = locate(/atom/movable/screen/storage/item_holder) in vis_locs + if(holder?.master && istype(holder.master, /datum/component/storage/concrete)) + var/datum/component/storage/concrete/storage = holder.master + if(storage.display_numerical_stacking) + return // It's being handled by the storage we're in, forget about it. var/mutable_appearance/number = mutable_appearance(appearance_flags = APPEARANCE_UI_IGNORE_ALPHA) number.maptext = MAPTEXT(get_amount()) . += number @@ -511,7 +514,7 @@ F.add_fingerprint(user) if(!zero_amount()) var/atom/movable/screen/storage/item_holder/holder = locate(/atom/movable/screen/storage/item_holder) in vis_locs - if(holder.master && istype(holder.master, /datum/component/storage/concrete)) + if(holder?.master && istype(holder.master, /datum/component/storage/concrete)) var/datum/component/storage/concrete/storage = holder.master storage.refresh_mob_views()