mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-28 14:37:04 +01:00
Made storage nesting better, improved consistency between storage types. (#24699)
* Made storage nesting better, improved consistency between storage types. * Out, er, space. * Null safety is good. * Apply suggestions from code review Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> --------- Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
pockets.storage_slots = 2 //two slots
|
||||
pockets.max_w_class = WEIGHT_CLASS_SMALL //fit only pocket sized items
|
||||
pockets.max_combined_w_class = 4
|
||||
ADD_TRAIT(src, TRAIT_ADJACENCY_TRANSPARENT, ROUNDSTART_TRAIT)
|
||||
|
||||
/obj/item/clothing/suit/storage/Destroy()
|
||||
QDEL_NULL(pockets)
|
||||
@@ -25,15 +26,9 @@
|
||||
..()
|
||||
pockets?.update_viewers()
|
||||
|
||||
/obj/item/clothing/suit/storage/forceMove(atom/destination)
|
||||
/obj/item/clothing/suit/storage/Moved(atom/oldloc, dir, forced = FALSE)
|
||||
. = ..()
|
||||
if(ismob(destination.loc) || isnull(pockets))
|
||||
return
|
||||
|
||||
for(var/mob/player in pockets.mobs_viewing)
|
||||
if(player == destination)
|
||||
continue
|
||||
pockets.hide_from(player)
|
||||
pockets?.update_viewers()
|
||||
|
||||
/obj/item/clothing/suit/storage/AltClick(mob/user)
|
||||
if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE))
|
||||
@@ -43,6 +38,12 @@
|
||||
if(isobserver(user))
|
||||
pockets?.show_to(user)
|
||||
|
||||
/obj/item/clothing/suit/storage/attack_ghost(mob/user)
|
||||
if(isobserver(user))
|
||||
// Revenants don't get to play with the toys.
|
||||
pockets.show_to(user)
|
||||
return ..()
|
||||
|
||||
/obj/item/clothing/suit/storage/attackby(obj/item/W as obj, mob/user as mob, params)
|
||||
..()
|
||||
return pockets?.attackby(W, user, params)
|
||||
|
||||
Reference in New Issue
Block a user