Trashcart and Various Cardboard Related Resprites (#90129)

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"

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]"

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)