solution for numerical display bags
This commit is contained in:
@@ -63,7 +63,7 @@
|
||||
if(!istype(I) || QDELETED(I)) //We're specialized stack storage, just ignore non stacks.
|
||||
continue
|
||||
if(!.[I.merge_type])
|
||||
.[I.merge_type] = new /datum/numbered_display(I, I.amount)
|
||||
.[I.merge_type] = new /datum/numbered_display(I, I.amount, src)
|
||||
else
|
||||
var/datum/numbered_display/ND = .[I.merge_type]
|
||||
ND.number += I.amount
|
||||
|
||||
@@ -136,6 +136,8 @@
|
||||
. = ..()
|
||||
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/mutable_appearance/number = mutable_appearance(appearance_flags = APPEARANCE_UI_IGNORE_ALPHA)
|
||||
number.maptext = MAPTEXT(get_amount())
|
||||
. += number
|
||||
@@ -507,7 +509,11 @@
|
||||
F.forceMove(user.drop_location())
|
||||
add_fingerprint(user)
|
||||
F.add_fingerprint(user)
|
||||
zero_amount()
|
||||
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))
|
||||
var/datum/component/storage/concrete/storage = holder.master
|
||||
storage.refresh_mob_views()
|
||||
|
||||
/obj/item/stack/attackby(obj/item/W, mob/user, params)
|
||||
if(can_merge(W))
|
||||
|
||||
Reference in New Issue
Block a user