From 906175db2a69f9f98d3e8edb3d8dadb2d5a4e04e Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sun, 15 Oct 2017 20:01:13 +0200 Subject: [PATCH 1/4] Fixed fancy boxes not showing proper contents --- code/game/objects/items/storage/fancy.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index a37ea9f8cfe..6aa777d7f2d 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -29,8 +29,7 @@ /obj/item/storage/fancy/update_icon(itemremoved = 0) if(fancy_open) - var/total_contents = src.contents.len - itemremoved - icon_state = "[icon_type]box[total_contents]" + icon_state = "[icon_type]box[src.contents.len]" else icon_state = "[icon_type]box" From 922621ec26f5709e96400f4e03f6c50d7ef76271 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sun, 15 Oct 2017 20:04:55 +0200 Subject: [PATCH 2/4] Should probably delete unused variable --- code/game/objects/items/storage/fancy.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 6aa777d7f2d..2ccd6b27ddb 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -27,7 +27,7 @@ for(var/i = 1 to storage_slots) new spawn_type(src) -/obj/item/storage/fancy/update_icon(itemremoved = 0) +/obj/item/storage/fancy/update_icon() if(fancy_open) icon_state = "[icon_type]box[src.contents.len]" else From 80bc4243a9b6b67edca993e710fd457142a31c54 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sun, 15 Oct 2017 20:18:27 +0200 Subject: [PATCH 3/4] Removed all of the unneccesary src. in the fancy boxes code --- code/game/objects/items/storage/fancy.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 2ccd6b27ddb..fc3c7f3f347 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -29,7 +29,7 @@ /obj/item/storage/fancy/update_icon() if(fancy_open) - icon_state = "[icon_type]box[src.contents.len]" + icon_state = "[icon_type]box[contents.len]" else icon_state = "[icon_type]box" @@ -37,9 +37,9 @@ ..() if(fancy_open) if(contents.len == 1) - to_chat(user, "There is one [src.icon_type] left.") + to_chat(user, "There is one [icon_type] left.") else - to_chat(user, "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left.") + to_chat(user, "There are [contents.len <= 0 ? "no" : "[contents.len]"] [icon_type]s left.") /obj/item/storage/fancy/attack_self(mob/user) fancy_open = !fancy_open From e27cb7629808b4b0e8c3392014f6400732aa9e8a Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Mon, 16 Oct 2017 08:41:51 +0200 Subject: [PATCH 4/4] Removed snowflake update_icon call also used return ..() since it seems inline with the insertion --- code/game/objects/items/storage/fancy.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index fc3c7f3f347..d21e6988f28 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -57,9 +57,7 @@ /obj/item/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, burn = 0) fancy_open = TRUE - . = ..() - //Recall update icon with the fancy item snowflake arg (ugh) - update_icon(1) + return ..() /* * Donut Box