VS: Port Bay's lockers and stuff

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"
-	icon_opened = "egg_open"
-	icon_locked = "egg"
+	var/icon_closed = "egg"
+	var/icon_opened = "egg_open"
+	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"
-	icon_opened = "bloodopen"
-	icon_closed = "blood"
+	closet_appearance = /decl/closet_appearance/cart/biohazard/alt