Skip to content

Cup inventory grid change (You can use cloth on cups now) #6545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sulaboy wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Cup inventory grid change (You can use cloth on cups now) #6545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
624509e
Update storage_grid_types.dm
Sulaboy May 24, 2026
e97fc3d
No Vials, can't pour them into cups if they can be stored.
Sulaboy May 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion code/datums/components/storage/storage_grid_types.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,21 @@
/datum/component/storage/concrete/grid/cup
screen_max_rows = 2
screen_max_columns = 1
max_w_class = WEIGHT_CLASS_TINY
max_w_class = WEIGHT_CLASS_SMALL

/datum/component/storage/concrete/grid/cup/New(datum/P, ...)
. = ..()
//Going off the idea that giving cups storage grids was to smuggle things in them. Limiting what a cup can hold makes cloth work on them.
set_holdable(list(
/obj/item/weapon/knife,
/obj/item/gem,
/obj/item/coin,
/obj/item/paper,
/obj/item/clothing/ring,
/obj/item/reagent_containers/powder,
/obj/item/key,
/obj/item/collar_detonator
))

/datum/component/storage/concrete/grid/bucket
screen_max_rows = 4
Expand Down
Loading