cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Made storage nesting better, improved consistency between storage types. (#24699)

Browse Source 
* 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:
Charlie Nolan
2024-04-10 11:59:43 -07:00
committed by GitHub
parent 94c93c2537
commit fe74786905
9 changed files with 104 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/loot/tendril_loot.dm
+33 -12
View File
@@ -6,6 +6,11 @@
desc = "Somehow, it's in two places at once."
max_combined_w_class = 60
max_w_class = WEIGHT_CLASS_NORMAL
var/obj/item/shared_storage/red
var/obj/item/shared_storage/blue
/obj/item/storage/backpack/shared/Adjacent(atom/neighbor, recurse = 1)
return red?.Adjacent(neighbor, recurse) || blue?.Adjacent(neighbor, recurse)
//External
/obj/item/shared_storage
@@ -17,6 +22,10 @@
resistance_flags = INDESTRUCTIBLE
var/obj/item/storage/backpack/shared/bag
/obj/item/shared_storage/Moved(atom/oldloc, dir, forced = FALSE)
. = ..()
bag?.update_viewers()
/obj/item/shared_storage/red
name = "paradox bag"
desc = "Somehow, it's in two places at once."
@@ -29,19 +38,27 @@
bag = S
blue.bag = S
bag.red = src
bag.blue = blue
/obj/item/shared_storage/Initialize()
. = ..()
ADD_TRAIT(src, TRAIT_ADJACENCY_TRANSPARENT, ROUNDSTART_TRAIT)
/obj/item/shared_storage/attackby(obj/item/W, mob/user, params)
if(bag)
bag.loc = user
bag.attackby(W, user, params)
bag?.attackby(W, user, params)
/obj/item/shared_storage/attack_ghost(mob/user)
if(isobserver(user))
// Revenants don't get to play with the toys.
bag?.show_to(user)
return ..()
/obj/item/shared_storage/attack_self(mob/living/carbon/user)
if(!iscarbon(user))
return
if(src == user.l_hand || src == user.r_hand)
if(bag)
bag.loc = user
bag.attack_hand(user)
bag?.open(user)
else
..()
@@ -49,12 +66,17 @@
if(!iscarbon(user))
return
if(loc == user && user.back && user.back == src)
if(bag)
bag.loc = user
bag.attack_hand(user)
bag?.open(user)
else
..()
/obj/item/shared_storage/AltClick(mob/user)
if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE))
bag?.open(user)
add_fingerprint(user)
else if(isobserver(user))
bag?.show_to(user)
/obj/item/shared_storage/MouseDrop(atom/over_object)
if(iscarbon(usr))
var/mob/M = usr
@@ -72,9 +94,8 @@
if(!M.unEquip(src))
return
M.put_in_active_hand(src)
else if(bag)
bag.loc = usr
bag.attack_hand(usr)
else
bag?.open(usr)
add_fingerprint(M)