Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

code/game/objects/structures/crates_lockers/closets.dm

@@ -10,6 +10,7 @@
 
 	var/icon_door = null
 	var/icon_door_override = FALSE //override to have open overlay use icon different to its base's
+	var/has_door_icon = TRUE // Set to false to skip trying to draw a door icon.
 	var/secure = FALSE //secure locker or not, also used if overriding a non-secure locker with a secure door overlay to add fancy lights
 	var/opened = FALSE
 	var/welded = FALSE
@@ -76,7 +77,7 @@
 		. += "[icon_door_override ? icon_door : icon_state]_open"
 		return
 
-	if(icon_door)
+	if(has_door_icon)
 		. += "[icon_door || icon_state]_door"
 	if(welded)
 		. += icon_welded

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -3,7 +3,7 @@
 	name = "large cardboard box"
 	desc = "Just a box..."
 	icon_state = "cardboard"
-	icon_door = null
+	has_door_icon = FALSE
 	mob_storage_capacity = 1
 	resistance_flags = FLAMMABLE
 	max_integrity = 70