diff --git a/code/game/objects/items/mail.dm b/code/game/objects/items/mail.dm index 26a2e9a5416..90888b062a3 100644 --- a/code/game/objects/items/mail.dm +++ b/code/game/objects/items/mail.dm @@ -250,8 +250,10 @@ base_icon_state = "mail" can_install_electronics = FALSE lid_icon_state = "maillid" - lid_x = -26 - lid_y = 2 + lid_w = -26 + lid_z = 2 + weld_w = 1 + weld_z = 4 paint_jobs = null ///if it'll show the nt mark on the crate var/postmarked = TRUE diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 46bf10eea67..ffe0d2334ac 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -32,9 +32,11 @@ /// Icon state to use for lid to display when opened. Leave undefined if there isn't one. var/lid_icon_state /// Controls the X value of the lid, allowing left and right pixel movement. - var/lid_x = 0 + var/lid_w = 0 /// Controls the Y value of the lid, allowing up and down pixel movement. - var/lid_y = 0 + var/lid_z = 0 + var/weld_w = 0 + var/weld_z = 0 /obj/structure/closet/crate/Initialize(mapload) AddElement(/datum/element/climbable, climb_time = crate_climb_time, climb_stun = 0) //add element in closed state before parent init opens it(if it does) @@ -95,12 +97,15 @@ . += "securecrateg" if(welded) - . += icon_welded + var/mutable_appearance/weld_overlay = mutable_appearance(icon, "welded") + weld_overlay.pixel_w = weld_w + weld_overlay.pixel_z = weld_z + . += weld_overlay if(opened && lid_icon_state) var/mutable_appearance/lid = mutable_appearance(icon = lid_icon, icon_state = lid_icon_state) - lid.pixel_x = lid_x - lid.pixel_y = lid_y + lid.pixel_w = lid_w + lid.pixel_z = lid_z lid.layer = layer . += lid @@ -185,6 +190,7 @@ base_icon_state = "trashcart" can_install_electronics = FALSE paint_jobs = null + weld_z = 5 /obj/structure/closet/crate/trashcart/laundry name = "laundry cart" diff --git a/code/game/objects/structures/crates_lockers/crates/cardboard.dm b/code/game/objects/structures/crates_lockers/crates/cardboard.dm index 5d1418e397e..1544bb2e0a4 100644 --- a/code/game/objects/structures/crates_lockers/crates/cardboard.dm +++ b/code/game/objects/structures/crates_lockers/crates/cardboard.dm @@ -13,6 +13,7 @@ paint_jobs = null cutting_tool = /obj/item/wirecutters can_weld_shut = FALSE + lid_icon_state = "cardboardopen" /obj/structure/closet/crate/cardboard/mothic name = "\improper Mothic Fleet box" @@ -25,3 +26,8 @@ desc = "For holding lizards, presumably." icon_state = "cardboard_tiziran" base_icon_state = "cardboard_tiziran" + +/obj/structure/closet/crate/cardboard/update_icon_state() + . = ..() + if(opened) + icon_state = "[base_icon_state]" diff --git a/code/game/objects/structures/crates_lockers/crates/secure.dm b/code/game/objects/structures/crates_lockers/crates/secure.dm index 40527d95bdd..787b48a3192 100644 --- a/code/game/objects/structures/crates_lockers/crates/secure.dm +++ b/code/game/objects/structures/crates_lockers/crates/secure.dm @@ -130,6 +130,7 @@ damage_deflection = 10 icon_state = "securetrashcart" base_icon_state = "securetrashcart" + weld_z = 5 paint_jobs = null req_access = list(ACCESS_JANITOR) diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index bb621570516..957321f98e1 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -123,8 +123,8 @@ icon_state = "necro_bubblegum" base_icon_state = "necro_bubblegum" lid_icon_state = "necro_bubblegum_lid" - lid_x = -26 - lid_y = 2 + lid_w = -26 + lid_z = 2 /obj/structure/closet/crate/necropolis/bubblegum/PopulateContents() new /obj/item/clothing/suit/hooded/hostile_environment(src) diff --git a/icons/obj/maintenance_loot.dmi b/icons/obj/maintenance_loot.dmi index c75cb583c19..961aaede1b7 100644 Binary files a/icons/obj/maintenance_loot.dmi and b/icons/obj/maintenance_loot.dmi differ diff --git a/icons/obj/storage/box.dmi b/icons/obj/storage/box.dmi index e48e65bf74b..58b67dc3779 100644 Binary files a/icons/obj/storage/box.dmi and b/icons/obj/storage/box.dmi differ diff --git a/icons/obj/storage/closet.dmi b/icons/obj/storage/closet.dmi index ec01f4b9a34..bfa929fb0d5 100644 Binary files a/icons/obj/storage/closet.dmi and b/icons/obj/storage/closet.dmi differ diff --git a/icons/obj/storage/crates.dmi b/icons/obj/storage/crates.dmi index 98538c386d2..8cd0b520efe 100644 Binary files a/icons/obj/storage/crates.dmi and b/icons/obj/storage/crates.dmi differ