mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-19 05:26:28 +00:00
12afcb911e
## About The Pull Request
- Large amount of storage datum cleanup.
- Documentation.
- Maybe more consistent use of parent vs real_location.
- Removes the weakrefs, replaces it with just references.
- These were already managed references anyways so why bother?
- Removes a bunch of arguments no one used and would ever used so only
the most useful args are left.
- Some bugfixes.
## Why It's Good For The Game
Aiming to make storage easier to work with. The whole intent of this was
to bugfix the whole "weight class" thing that keeps popping up but I had
to do this first.
## Changelog
🆑 Melbert
fix: When placing an item into storage (such as backpacks), all nearby
mobs now get a message, rather than just the first mob.
fix: TGC decks of cards should act a bit less odd when looking inside.
refactor: Refactored a bit of storage, cleaned up a fair bit of its
code. Let me know if you notice anything funky about storage (like
backpacks).
/🆑
51 lines
1.7 KiB
Plaintext
51 lines
1.7 KiB
Plaintext
/obj/item/storage/cans
|
|
name = "can ring"
|
|
desc = "Holds up to six drink cans, and select bottles."
|
|
icon = 'icons/obj/storage/storage.dmi'
|
|
icon_state = "canholder"
|
|
inhand_icon_state = "cola"
|
|
lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi'
|
|
righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi'
|
|
custom_materials = list(/datum/material/plastic = HALF_SHEET_MATERIAL_AMOUNT*1.2)
|
|
max_integrity = 500
|
|
|
|
/obj/item/storage/cans/suicide_act(mob/living/carbon/user)
|
|
user.visible_message(span_suicide("[user] begins popping open a final cold one with the boys! It looks like [user.p_theyre()] trying to commit suicide!"))
|
|
return BRUTELOSS
|
|
|
|
/obj/item/storage/cans/update_icon_state()
|
|
icon_state = "[initial(icon_state)][contents.len]"
|
|
return ..()
|
|
|
|
/obj/item/storage/cans/Initialize(mapload)
|
|
. = ..()
|
|
update_appearance()
|
|
|
|
/obj/item/storage/cans/Initialize(mapload)
|
|
. = ..()
|
|
atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
|
|
atom_storage.max_total_storage = 12
|
|
atom_storage.max_slots = 6
|
|
atom_storage.set_holdable(list(
|
|
/obj/item/reagent_containers/cup/soda_cans,
|
|
/obj/item/reagent_containers/cup/glass/bottle/beer,
|
|
/obj/item/reagent_containers/cup/glass/bottle/ale,
|
|
/obj/item/reagent_containers/cup/glass/waterbottle,
|
|
))
|
|
|
|
/obj/item/storage/cans/sixsoda
|
|
name = "soda bottle ring"
|
|
desc = "Holds six soda cans. Remember to recycle when you're done!"
|
|
|
|
/obj/item/storage/cans/sixsoda/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
new /obj/item/reagent_containers/cup/soda_cans/cola(src)
|
|
|
|
/obj/item/storage/cans/sixbeer
|
|
name = "beer bottle ring"
|
|
desc = "Holds six beer bottles. Remember to recycle when you're done!"
|
|
|
|
/obj/item/storage/cans/sixbeer/PopulateContents()
|
|
for(var/i in 1 to 6)
|
|
new /obj/item/reagent_containers/cup/glass/bottle/beer(src)
|