cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small storage refactor and examine change

Browse Source
This commit is contained in:
Joe Schmoe
2019-06-08 20:48:29 +02:00
parent 7a823ca965
commit 2ce3bb43e4
23 changed files with 124 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/objects/items/storage/boxes.dm
View File

@@ -402,7 +402,7 @@
/obj/item/storage/box/donkpockets/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket))
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/donkpocket))
/obj/item/storage/box/donkpockets/PopulateContents()
for(var/i in 1 to 6)
@@ -419,7 +419,7 @@
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 7
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/monkeycube))
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))
/obj/item/storage/box/monkeycubes/PopulateContents()
for(var/i in 1 to 5)
@@ -439,7 +439,7 @@
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 3
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/monkeycube))
STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/monkeycube))
/obj/item/storage/box/gorillacubes/PopulateContents()
for(var/i in 1 to 3)
@@ -591,7 +591,7 @@
/obj/item/storage/box/snappops/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/toy/snappop))
STR.set_holdable(list(/obj/item/toy/snappop))
STR.max_items = 8
/obj/item/storage/box/snappops/PopulateContents()
@@ -610,8 +610,13 @@
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 10
<<<<<<< HEAD
STR.can_hold = typecacheof(list(/obj/item/match))
// yogs start -- make matches play nice with holodeck
=======
STR.set_holdable(list(/obj/item/match))
>>>>>>> 2d32be1904... Small storage refactor and examine change (#44109)
/obj/item/storage/box/matches/PopulateContents()
for(var/i in 1 to 10)
new /obj/item/match(src)
@@ -634,7 +639,7 @@
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 21
STR.can_hold = typecacheof(list(/obj/item/light/tube, /obj/item/light/bulb))
STR.set_holdable(list(/obj/item/light/tube, /obj/item/light/bulb))
STR.max_combined_w_class = 21
STR.click_gather = FALSE //temp workaround to re-enable filling the light replacer with the box