mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Fixed internal storage, added coat pockets
/mob/proc/ClickOn() now checks storage levels, not just contents levels, now allows items to be taken out of internal storage attached to another item. Coats now use internal storage for their pocket slots, removed duplicate storage code. Moved coat.dm out of it's special folder and into modules/clothing.
This commit is contained in:
@@ -92,8 +92,8 @@
|
||||
|
||||
return
|
||||
|
||||
// operate two levels deep here (item in backpack in src; NOT item in box in backpack in src)
|
||||
if(A == loc || (A in loc) || (A in contents) || (A.loc in contents))
|
||||
// operate two STORAGE levels deep here (item in backpack in src; NOT item in box in backpack in src)
|
||||
if(A == loc || (A in loc) || A.storage_depth(src) <= 1)
|
||||
|
||||
// faster access to objects already on you
|
||||
if(A in contents)
|
||||
|
||||
@@ -36,9 +36,6 @@
|
||||
if(istype(master, /obj/item/weapon/storage))
|
||||
var/obj/item/weapon/storage/S = master
|
||||
S.close(usr)
|
||||
else if(istype(master,/obj/item/clothing/suit/storage))
|
||||
var/obj/item/clothing/suit/storage/S = master
|
||||
S.close(usr)
|
||||
return 1
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user