From a651785ac1d89adc15813ba8fe1cbe3d92b5e51d Mon Sep 17 00:00:00 2001 From: ori-disillusion-mirnov Date: Sat, 27 Jun 2026 04:29:59 -0400 Subject: [PATCH 1/3] aaaaaaaaaaa --- code/game/objects/items/storage/storage.dm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 499df6fe4618..efacb423f93d 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -378,16 +378,20 @@ GLOBAL_LIST_EMPTY_TYPED(item_storage_box_cache, /datum/item_storage_box) if (storage_flags & STORAGE_CONTENT_NUM_DISPLAY) numbered_contents = list() adjusted_contents = 0 - for (var/obj/item/I in contents) + for (var/obj/item/stored_items in contents) var/found = 0 for (var/datum/numbered_display/ND in numbered_contents) - if (ND.sample_object.type == I.type) + if (ND.sample_object.type == stored_items.type) ND.number++ +<<<<<<< Updated upstream +======= + stored_items.screen_loc = ND.sample_object.screen_loc +>>>>>>> Stashed changes found = 1 break if (!found) adjusted_contents++ - numbered_contents.Add( new/datum/numbered_display(I) ) + numbered_contents.Add( new/datum/numbered_display(stored_items) ) if (storage_slots == null) space_orient_objs(numbered_contents) From e65279aa4b86dbcfd2aa4cb3e88a199be8d69452 Mon Sep 17 00:00:00 2001 From: ori-disillusion-mirnov Date: Sat, 27 Jun 2026 04:32:54 -0400 Subject: [PATCH 2/3] k --- code/game/objects/items/storage/storage.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index efacb423f93d..15eab135f9e4 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -383,10 +383,7 @@ GLOBAL_LIST_EMPTY_TYPED(item_storage_box_cache, /datum/item_storage_box) for (var/datum/numbered_display/ND in numbered_contents) if (ND.sample_object.type == stored_items.type) ND.number++ -<<<<<<< Updated upstream -======= stored_items.screen_loc = ND.sample_object.screen_loc ->>>>>>> Stashed changes found = 1 break if (!found) From 4a38d92243efe5358d3f9bb6d746dc66e2f3295f Mon Sep 17 00:00:00 2001 From: ori-disillusion-mirnov Date: Sat, 27 Jun 2026 13:06:09 -0400 Subject: [PATCH 3/3] dsadsad --- code/game/objects/items/storage/storage.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm index 15eab135f9e4..01d970dc8500 100644 --- a/code/game/objects/items/storage/storage.dm +++ b/code/game/objects/items/storage/storage.dm @@ -380,10 +380,10 @@ GLOBAL_LIST_EMPTY_TYPED(item_storage_box_cache, /datum/item_storage_box) adjusted_contents = 0 for (var/obj/item/stored_items in contents) var/found = 0 - for (var/datum/numbered_display/ND in numbered_contents) - if (ND.sample_object.type == stored_items.type) - ND.number++ - stored_items.screen_loc = ND.sample_object.screen_loc + for (var/datum/numbered_display/display in numbered_contents) + if (display.sample_object.type == stored_items.type) + display.number++ + stored_items.screen_loc = display.sample_object.screen_loc found = 1 break if (!found)