VS: Port Bay's lockers and stuff

code/game/machinery/deployable_vr.dm

@@ -15,7 +15,7 @@
 	var/human_name = TRUE
 
 	var/static/list/cutout_types
-	var/static/list/painters = list(/obj/item/weapon/reagent_containers/glass/paint, /obj/item/device/floor_painter, /obj/item/device/closet_painter)
+	var/static/list/painters = list(/obj/item/weapon/reagent_containers/glass/paint, /obj/item/device/floor_painter)//, /obj/item/device/closet_painter)
 
 /obj/structure/barricade/cutout/New()
 	. = ..()

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

@@ -4,15 +4,24 @@
 	icon = 'icons/obj/egg_vr.dmi'
 	icon_state = "egg"
 	density = 0 //Just in case there's a lot of eggs, so it doesn't block hallways/areas.
-	icon_closed = "egg"
+	var/icon_closed = "egg"
-	icon_opened = "egg_open"
+	var/icon_opened = "egg_open"
-	icon_locked = "egg"
+	var/icon_locked = "egg"
 	open_sound = 'sound/vore/schlorp.ogg'
 	close_sound = 'sound/vore/schlorp.ogg'
 	opened = 0
 	sealed = 0 //Don't touch this.
 	health = 100
 
+/obj/structure/closet/secure_closet/egg/update_icon()
+	if(opened)
+		icon_state = icon_opened
+	else
+		if(sealed)
+			icon_state = icon_locked
+		else
+			icon_state = icon_closed
+
 /obj/structure/closet/secure_closet/egg/attackby(obj/item/weapon/W, mob/user as mob) //This also prevents crew from welding the eggs and making them unable to be opened.
 	if(istype(W, /obj/item/weapon/weldingtool))
 		src.dump_contents()

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

@@ -37,14 +37,8 @@
 
 /obj/structure/closet/secure_closet/explorer
 	name = "explorer locker"
-	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secureexp1"
-	icon_closed = "secureexp"
-	icon_locked = "secureexp1"
-	icon_opened = "secureexpopen"
-	icon_broken = "secureexpbroken"
-	icon_off = "secureexpoff"
 	req_access = list(access_explorer)
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration
 
 	starts_with = list(
 		/obj/item/clothing/under/explorer,
@@ -81,13 +75,8 @@
 /obj/structure/closet/secure_closet/sar
 	name = "field medic locker"
 	desc = "Supplies for a wilderness first responder."
-	icon_state = "medical1"
-	icon_closed = "medical"
-	icon_locked = "medical1"
-	icon_opened = "medicalopen"
-	icon_broken = "medicalbroken"
-	icon_off = "medicaloff"
 	req_access = list(access_medical_equip)
+	closet_appearance = /decl/closet_appearance/secure_closet/medical
 
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/dufflebag/emt,
@@ -128,6 +117,7 @@
 /obj/structure/closet/secure_closet/pilot
 	name = "pilot locker"
 	req_access = list(access_pilot)
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration/pilot
 
 	starts_with = list(
 		/obj/item/weapon/storage/backpack/parachute,
@@ -162,14 +152,8 @@
 
 /obj/structure/closet/secure_closet/pathfinder
 	name = "pathfinder locker"
-	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secureexp1"
-	icon_closed = "secureexp"
-	icon_locked = "secureexp1"
-	icon_opened = "secureexpopen"
-	icon_broken = "secureexpbroken"
-	icon_off = "secureexpoff"
 	req_access = list(access_gateway)
+	closet_appearance = /decl/closet_appearance/secure_closet/exploration/pathfinder
 
 	starts_with = list(
 		/obj/item/clothing/under/explorer,

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

@@ -1,12 +1,7 @@
 /obj/structure/closet/secure_closet/hos
 	name = "head of security's attire"
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
 	req_access = list(access_hos)
+	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -30,13 +25,8 @@
 
 /obj/structure/closet/secure_closet/hos2
 	name = "head of security's gear"
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
 	req_access = list(access_hos)
+	closet_appearance = /decl/closet_appearance/secure_closet/security/hos
 	storage_capacity = 2.5 * MOB_MEDIUM
 
 	starts_with = list(
@@ -61,12 +51,6 @@
 /obj/structure/closet/secure_closet/nanotrasen_security
 	name = "NanoTrasen security officer's locker"
 	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secC1"
-	icon_closed = "secC"
-	icon_locked = "secC1"
-	icon_opened = "secCopen"
-	icon_broken = "secCbroken"
-	icon_off = "seCcoff"
 	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 
@@ -108,12 +92,6 @@
 /obj/structure/closet/secure_closet/nanotrasen_commander
 	name = "NanoTrasen commander's locker"
 	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secC1"
-	icon_closed = "secC"
-	icon_locked = "secC1"
-	icon_opened = "secCopen"
-	icon_broken = "secCbroken"
-	icon_off = "seCcoff"
 	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 
@@ -163,12 +141,6 @@
 /obj/structure/closet/secure_closet/nanotrasen_warden
 	name = "NanoTrasen warden's locker"
 	icon = 'icons/obj/closet_vr.dmi'
-	icon_state = "secC1"
-	icon_closed = "secC"
-	icon_locked = "secC1"
-	icon_opened = "secCopen"
-	icon_broken = "secCbroken"
-	icon_off = "seCcoff"
 	req_access = list(access_brig)
 	storage_capacity = 3.5 * MOB_MEDIUM
 

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

@@ -34,6 +34,4 @@
 	return
 
 /obj/structure/closet/crate/medical/blood
-	icon_state = "blood"
+	closet_appearance = /decl/closet_appearance/cart/biohazard/alt
-	icon_opened = "bloodopen"
-	icon_closed = "blood"

code/modules/awaymissions/loot_vr.dm

@@ -78,8 +78,6 @@
 				new /obj/effect/decal/remains/xeno(src.loc)
 		if("clothes")
 			var/obj/structure/closet/C = new(src.loc)
-			C.icon_state = "blue"
-			C.icon_closed = "blue"
 			if(prob(33))
 				new /obj/item/clothing/under/color/rainbow(C)
 				new /obj/item/clothing/shoes/rainbow(C)

code/modules/mob/living/simple_mob/subtypes/vore/mimic.dm

@@ -27,8 +27,8 @@
 			new_mimic.name = name
 			new_mimic.desc = desc
 			new_mimic.icon = icon
-			new_mimic.icon_state = icon_opened
+			new_mimic.icon_state = "open"
-			new_mimic.icon_living = icon_opened
+			new_mimic.icon_living = "open"
 		else
 			return ..()
 	else

maps/tether/submaps/offmap/talon.dm

@@ -249,12 +249,6 @@ Once in open space, consider disabling nonessential power-consuming electronics
 
 /obj/structure/closet/secure_closet/talon_captain
 	name = "talon captain's locker"
-	icon_state = "capsecure1"
-	icon_closed = "capsecure"
-	icon_locked = "capsecure1"
-	icon_opened = "capsecureopen"
-	icon_broken = "capsecurebroken"
-	icon_off = "capsecureoff"
 	req_access = list(access_talon)
 
 	starts_with = list(
@@ -272,13 +266,6 @@ Once in open space, consider disabling nonessential power-consuming electronics
 
 /obj/structure/closet/secure_closet/talon_guard
 	name = "talon guard's locker"
-	req_access = list(access_hos)
-	icon_state = "hossecure1"
-	icon_closed = "hossecure"
-	icon_locked = "hossecure1"
-	icon_opened = "hossecureopen"
-	icon_broken = "hossecurebroken"
-	icon_off = "hossecureoff"
 	req_access = list(access_talon)
 
 	starts_with = list(
@@ -304,12 +291,6 @@ Once in open space, consider disabling nonessential power-consuming electronics
 
 /obj/structure/closet/secure_closet/talon_doctor
 	name = "talon doctor's locker"
-	icon_state = "cmosecure1"
-	icon_closed = "cmosecure"
-	icon_locked = "cmosecure1"
-	icon_opened = "cmosecureopen"
-	icon_broken = "cmosecurebroken"
-	icon_off = "cmosecureoff"
 	req_access = list(access_talon)
 
 	starts_with = list(
@@ -329,12 +310,6 @@ Once in open space, consider disabling nonessential power-consuming electronics
 
 /obj/structure/closet/secure_closet/talon_engineer
 	name = "talon engineer's locker"
-	icon_state = "securece1"
-	icon_closed = "securece"
-	icon_locked = "securece1"
-	icon_opened = "secureceopen"
-	icon_broken = "securecebroken"
-	icon_off = "secureceoff"
 	req_access = list(access_talon)
 
 	starts_with = list(

maps/tether/tether-03-surface3.dmm

@@ -6436,9 +6436,6 @@
 	dir = 1
 	},
 /obj/structure/closet{
-	icon_closed = "cabinet_closed";
-	icon_opened = "cabinet_open";
-	icon_state = "cabinet_closed";
 	name = "Clothing Storage"
 	},
 /obj/machinery/camera/network/civilian,
@@ -20424,8 +20421,6 @@
 /area/tether/surfacebase/bar_backroom)
 "aLH" = (
 /obj/structure/closet/gmcloset{
-	icon_closed = "black";
-	icon_state = "black";
 	name = "formal wardrobe"
 	},
 /obj/item/glass_jar,

maps/tether/tether-05-station1.dmm

@@ -9565,7 +9565,6 @@
 	pixel_x = 5
 	},
 /obj/item/weapon/reagent_containers/spray/cleaner,
-/obj/item/device/closet_painter,
 /obj/machinery/camera/network/engineering{
 	dir = 4
 	},