From 928cd8fd40e1d43cce8794ef4fa0b9ab7d1d50c1 Mon Sep 17 00:00:00 2001 From: Elizabeth Lavenza Date: Tue, 16 Apr 2024 02:09:25 -0400 Subject: [PATCH] Fix invalid box overlays --- code/game/objects/items/storage/boxes.dm | 2 ++ code/game/objects/items/storage/fancy.dm | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 6f28ab3cd3..5250318930 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -625,6 +625,7 @@ desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children." icon = 'icons/obj/toy.dmi' icon_state = "spbox" + illustration = null /obj/item/storage/box/snappops/ComponentInitialize() . = ..() @@ -1479,3 +1480,4 @@ /obj/item/stack/wrapping_paper/small=1 ) generate_items_inside(items_inside,src) + diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index ab9e62bde6..f13c206316 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -172,6 +172,7 @@ spawn_type = /obj/item/clothing/mask/cigarette/space_cigarette custom_price = PRICE_ALMOST_CHEAP var/spawn_coupon = TRUE + var/has_open_overlay = TRUE /obj/item/storage/fancy/cigarettes/attack_self(mob/user) if(contents.len == 0 && spawn_coupon) @@ -229,7 +230,8 @@ . = ..() if(!fancy_open || !contents.len) return - . += "[icon_state]_open" + if(has_open_overlay) + . += "[icon_state]_open" var/cig_position = 1 for(var/C in contents) var/mutable_appearance/inserted_overlay = mutable_appearance(icon) @@ -438,6 +440,7 @@ icon_type = "premium cigar" spawn_type = /obj/item/clothing/mask/cigarette/cigar spawn_coupon = FALSE + has_open_overlay = FALSE /obj/item/storage/fancy/cigarettes/cigars/ComponentInitialize() . = ..()