cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 13:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Gives pocket protectors their inventory back, also fixes an allowed contents display error [MDB IGNORE] (#16919)

Browse Source 
* Gives pocket protectors their inventory back, also fixes an allowed contents display error (#70528)

* create_storage is now part of pocketprotector init, not just the full subtype of it.
* set_holdable now takes atom_storage into account when setting what can be held in them.

* Gives pocket protectors their inventory back, also fixes an allowed contents display error

Co-authored-by: Rhials <Datguy33456@gmail.com>
This commit is contained in:
SkyratBot
2022-10-17 10:01:44 +01:00
committed by GitHub
co-authored by Rhials
parent bc0acc8357
commit bc49cb69f8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms.dm
+2 -1
View File
@@ -374,7 +374,8 @@
atom_storage = new cloning.type(src, cloning.max_slots, cloning.max_specific_storage, cloning.max_total_storage, cloning.numerical_stacking, cloning.allow_quick_gather, cloning.collection_mode, cloning.attack_hand_interact)
if(cloning.can_hold || cloning.cant_hold)
atom_storage.set_holdable(cloning.can_hold, cloning.cant_hold)
if(!atom_storage.can_hold && !atom_storage.cant_hold) //In the event that the can/can't hold lists are already in place (such as from storage objects added on initialize).
atom_storage.set_holdable(cloning.can_hold, cloning.cant_hold)
return atom_storage
code/modules/clothing/under/accessories.dm
+4 -1
View File
@@ -360,11 +360,14 @@
desc = "Can protect your clothing from ink stains, but you'll look like a nerd if you're using one."
icon_state = "pocketprotector"
/obj/item/clothing/accessory/pocketprotector/full/Initialize(mapload)
/obj/item/clothing/accessory/pocketprotector/Initialize(mapload)
. = ..()
create_storage(type = /datum/storage/pockets/pocketprotector)
/obj/item/clothing/accessory/pocketprotector/full/Initialize(mapload)
. = ..()
new /obj/item/pen/red(src)
new /obj/item/pen(src)
new /obj/item/pen/blue(src)