cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-13 19:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'storage_rework' of github.com-kevinz000:kevinz000/Citadel-Station-13 into storage_rework

Browse Source
This commit is contained in:
kevinz000
2020-04-10 12:44:28 -07:00
parent 3788496204 a02bad15ea
commit bf1ffb7ebd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/datums/components/storage/concrete/rped.dm
View File

@@ -3,7 +3,7 @@
allow_quick_gather = TRUE allow_quick_gather = TRUE
allow_quick_empty = TRUE allow_quick_empty = TRUE
click_gather = TRUE click_gather = TRUE
storage_flags = STORAGE_LIMIT_MAX_ITEMS | STORAGE_LIMIT_COMBINED_W_CLASS storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
max_w_class = WEIGHT_CLASS_NORMAL max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 100 max_combined_w_class = 100
max_items = 100 max_items = 100

2
code/datums/components/storage/concrete/stack.dm
View File

@@ -1,7 +1,7 @@
//Stack-only storage. //Stack-only storage.
/datum/component/storage/concrete/stack /datum/component/storage/concrete/stack
display_numerical_stacking = TRUE display_numerical_stacking = TRUE
storage_flags = STORAGE_LIMIT_COMBINED_W_CLASS | STORAGE_LIMIT_MAX_ITEMS storage_flags = STORAGE_FLAGS_LEGACY_DEFAULT
var/max_combined_stack_amount = 300 var/max_combined_stack_amount = 300
max_w_class = WEIGHT_CLASS_NORMAL max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = WEIGHT_CLASS_NORMAL * 14 max_combined_w_class = WEIGHT_CLASS_NORMAL * 14