The Crate Animatening, A.K.A. I hate Crate Trigonometry (#13339)

code/game/objects/items/airbubble.dm

@@ -57,8 +57,6 @@
 	desc = "Special air bubble designed to protect people inside of it from decompressed environments. Has an integrated cooling unit to preserve a stable temperature inside. Requires a power cell to operate."
 	icon = 'icons/obj/airbubble.dmi'
 	icon_state = "airbubble"
-	icon_closed = "airbubble"
-	icon_opened = "airbubble_open"
 	open_sound = 'sound/items/zip.ogg'
 	close_sound = 'sound/items/zip.ogg'
 	var/item_path = /obj/item/airbubble
@@ -157,7 +155,7 @@
 
 	dump_contents()
 
-	icon_state = icon_opened
+	update_icon()
 	opened = 1
 	playsound(loc, open_sound, 15, 1, -3)
 	density = 0
@@ -178,7 +176,7 @@
 	if(store_mobs)
 		stored_units += store_mobs(stored_units)
 
-	icon_state = icon_closed
+	update_icon()
 	opened = 0
 
 	playsound(loc, close_sound, 25, 0, -3)
@@ -225,10 +223,10 @@
 		bag.desc += " <span class='notice'>It appears to be poorly hand folded.</span>"
 
 		if(ripped)
-			bag.icon_state = "[icon_closed]_man_folded_ripped"
+			bag.icon_state = "[icon_state]_man_folded_ripped"
 			bag.desc += " <span class='danger'>It has hole in it! Maybe you shouldn't use it!</span>"
 		else
-			bag.icon_state = "[icon_closed]_man_folded"
+			bag.icon_state = "[icon_state]_man_folded"
 		qdel(src)
 		return
 
@@ -492,15 +490,13 @@
 
 /obj/structure/closet/airbubble/update_icon()
 	cut_overlays()
-	if(opened)
-		icon_state = icon_opened
-	else if(ripped)
+	if(ripped)
 		name = "ripped air bubble"
-		icon_state = "[icon_closed]_ripped"
+		icon_state = "[icon_state]_ripped"
 	else
-		icon_state = icon_closed
+		icon_state = "[initial(icon_state)][opened ? "_open" : ""]"
 	if(zipped)
-		add_overlay("[icon_closed]_restrained")
+		add_overlay("[icon_state]_restrained")
 	add_overlay("pressure_[(use_internal_tank) ?("on") : ("off") ]")
 
 // Process transfer of air from the tank. Handle if it is ripped open.
@@ -629,8 +625,5 @@
 	name = "air bubble"
 	desc = "Special air bubble designed to protect people inside of it from decompressed environments. Has an integrated cooling unit to preserve a stable temperature inside. Requires a power cell to operate. This does not seem like a regular color scheme."
 	icon_state = "airbubble_syndie"
-	icon_closed = "airbubble_syndie"
-	icon_closed = "airbubble_syndie"
-	icon_opened = "airbubble_syndie_open"
 	item_path = /obj/item/airbubble/syndie
 	syndie = TRUE