trash bag polishing and balance

-makes ui less bad -makes bigger objects fit in trash bags(it's a trash bag goofus)
shiptest-ss13 · Sep 27, 2023 · 4ebd2ad · 4ebd2ad
1 parent 473f632
commit 4ebd2ad
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
@@ -28,7 +28,7 @@
 		numbered_contents = _process_numerical_display()
 		adjusted_contents = numbered_contents.len
 
-	var/columns = clamp(max_items, 1, maxcolumns ? maxcolumns : screen_max_columns)
+	var/columns = limited_random_access_stack_position == 0 ? clamp(max_items, 1, maxcolumns ? maxcolumns : screen_max_columns) : limited_random_access_stack_position
 	var/rows = clamp(CEILING(adjusted_contents / columns, 1), 1, screen_max_rows)
 
 	// First, boxes.

diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
@@ -45,12 +45,12 @@
 /obj/item/storage/bag/trash/ComponentInitialize()
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
-	STR.max_w_class = WEIGHT_CLASS_SMALL
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
 	STR.max_combined_w_class = 50
 	STR.max_items = 50
 	STR.set_holdable(null, list(/obj/item/disk/nuclear))
 	STR.limited_random_access = TRUE
-	STR.limited_random_access_stack_position = 5
+	STR.limited_random_access_stack_position = 3
 
 /obj/item/storage/bag/trash/update_icon_state()
 	switch(contents.len)
@@ -87,6 +87,7 @@
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.max_combined_w_class = 75
 	STR.max_items = 75
+	STR.max_w_class = WEIGHT_CLASS_BULKY
 
 /obj/item/storage/bag/trash/bluespace/cyborg
 	insertable = FALSE