shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16047 from SandPoot/stacks-1

Browse Source 
Solve issues with stacks quickly
This commit is contained in:
deathride58
2024-01-01 12:42:01 -05:00
committed by GitHub
parent 9217fcc7dc 20d80858b6
commit 07184e6106
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+6 -3
View File
@@ -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()