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

Swaps box/material for a bag (#89393)

Browse Source 
## About The Pull Request
Removes `box/material`, and instead turns it into `bag/debug`. Replaces
the box in the debug toolkit box, and places a bag in the little science
room of runtimestation.
## Why It's Good For The Game
Manually putting sheets into runtimestation's ore silo--or having to
spawn in a sheet snatcher to do it for me--is really annoying, Now
instead we can just pick up the bag and shove it in and be done with it.
## Changelog
Not player facing
This commit is contained in:
Wallem
2025-02-10 18:22:31 -07:00
committed by GitHub
parent cd2d0797c9
commit 07af87e47e
3 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/bags.dm
+58 -1
View File
@@ -12,7 +12,7 @@
* Plant Bag
* Sheet Snatcher
* Book Bag
* Biowaste Bag
* Biowaste Bag
*
* -Sayu
*/
@@ -320,6 +320,63 @@
desc = ""
capacity = 500//Borgs get more because >specialization
// -----------------------------
// Sheet Snatcher (Debug)
// -----------------------------
/obj/item/storage/bag/sheetsnatcher/debug
name = "sheet snatcher EXTREME EDITION"
desc = "A Nanotrasen storage system designed which has been given post-market alterations to hold any type of sheet. Comes pre-populated with "
color = "#ff3737" // I'm too lazy to make a unique sprite
capacity = 5000 // Hopefully enough to fit anything you need
w_class = WEIGHT_CLASS_TINY
// Copy-pasted from the former /obj/item/storage/box/material, w/ small additions like rods, cardboard, plastic.
// "Only 20 uranium 'cause of radiation"
/obj/item/storage/bag/sheetsnatcher/debug/PopulateContents()
var/static/items_inside = list(
/obj/item/stack/sheet/iron/fifty=1,
/obj/item/stack/sheet/glass/fifty=1,
/obj/item/stack/sheet/rglass/fifty=1,
/obj/item/stack/sheet/plasmaglass/fifty=1,
/obj/item/stack/sheet/titaniumglass/fifty=1,
/obj/item/stack/sheet/plastitaniumglass/fifty=1,
/obj/item/stack/sheet/plasteel/fifty=1,
/obj/item/stack/sheet/mineral/titanium/fifty=1,
/obj/item/stack/sheet/mineral/gold=50,
/obj/item/stack/sheet/mineral/silver=50,
/obj/item/stack/sheet/mineral/plasma=50,
/obj/item/stack/sheet/mineral/uranium=20,
/obj/item/stack/sheet/mineral/diamond=50,
/obj/item/stack/sheet/bluespace_crystal=50,
/obj/item/stack/sheet/mineral/bananium=50,
/obj/item/stack/sheet/mineral/wood/fifty=1,
/obj/item/stack/sheet/plastic/fifty=1,
/obj/item/stack/sheet/runed_metal/fifty=1,
/obj/item/stack/rods/fifty=1,
/obj/item/stack/sheet/mineral/plastitanium=50,
/obj/item/stack/sheet/mineral/abductor=50,
/obj/item/stack/sheet/cardboard/fifty=1,
)
//This needs to be done here and not in Initialize() because the stacks get merged and fall out when their weight updates if this is set after PopulateContents()
atom_storage.allow_big_nesting = TRUE
atom_storage.max_slots = 99
atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC
atom_storage.max_total_storage = capacity
generate_items_inside(items_inside,src)
/obj/item/storage/bag/sheetsnatcher/debug/Initialize(mapload)
. = ..()
// Overrides so it can hold all possible sheets
atom_storage.set_holdable(
can_hold_list = list(
/obj/item/stack/sheet,
/obj/item/stack/sheet/mineral/sandstone,
/obj/item/stack/sheet/mineral/wood,
)
)
// -----------------------------
// Book bag
// -----------------------------
code/game/objects/items/storage/boxes/engineering_boxes.dm
+1 -38
View File
@@ -18,43 +18,6 @@
for(var/i in 1 to 7)
new/obj/item/grenade/chem_grenade/smart_metal_foam(src)
/obj/item/storage/box/material
name = "box of materials"
illustration = "implant"
/obj/item/storage/box/material/Initialize(mapload)
. = ..()
atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC //This needs to be set here too because the parent type overrides it again
/obj/item/storage/box/material/PopulateContents() //less uranium because radioactive
var/static/items_inside = list(
/obj/item/stack/sheet/iron/fifty=1,
/obj/item/stack/sheet/glass/fifty=1,
/obj/item/stack/sheet/rglass=50,
/obj/item/stack/sheet/plasmaglass=50,
/obj/item/stack/sheet/titaniumglass=50,
/obj/item/stack/sheet/plastitaniumglass=50,
/obj/item/stack/sheet/plasteel=50,
/obj/item/stack/sheet/mineral/plastitanium=50,
/obj/item/stack/sheet/mineral/titanium=50,
/obj/item/stack/sheet/mineral/gold=50,
/obj/item/stack/sheet/mineral/silver=50,
/obj/item/stack/sheet/mineral/plasma=50,
/obj/item/stack/sheet/mineral/uranium=20,
/obj/item/stack/sheet/mineral/diamond=50,
/obj/item/stack/sheet/bluespace_crystal=50,
/obj/item/stack/sheet/mineral/bananium=50,
/obj/item/stack/sheet/mineral/wood=50,
/obj/item/stack/sheet/plastic/fifty=1,
/obj/item/stack/sheet/runed_metal/fifty=1,
)
//This needs to be done here and not in Initialize() because the stacks get merged and fall out when their weight updates if this is set after PopulateContents()
atom_storage.allow_big_nesting = TRUE
atom_storage.max_slots = 99
atom_storage.max_specific_storage = WEIGHT_CLASS_GIGANTIC
atom_storage.max_total_storage = 99
generate_items_inside(items_inside,src)
/obj/item/storage/box/debugtools
name = "box of debug tools"
icon_state = "syndiebox"
@@ -79,7 +42,7 @@
/obj/item/stack/spacecash/c1000=50,
/obj/item/storage/box/beakers/bluespace=1,
/obj/item/storage/box/beakers/variety=1,
/obj/item/storage/box/material=1,
/obj/item/storage/bag/sheetsnatcher/debug=1,
/obj/item/uplink/debug=1,
/obj/item/uplink/nuclear/debug=1,
/obj/item/clothing/ears/earmuffs/debug = 1,