From a2a1aa04895373f28b948415b7231efe0f01d69f Mon Sep 17 00:00:00 2001
From: warriorstar-orion <orion@snowfrost.garden>
Date: Tue, 3 Sep 2024 09:18:46 -0400
Subject: [PATCH] fix: Standardize abandoned engi sat lockers. (#26654)

---
 .../SpaceRuins/abandoned_engi_sat.dmm         | 25 +++----------------
 .../mission_code/ruins/abandoned_engi_sat.dm  | 13 ++++++++++
 paradise.dme                                  |  1 +
 3 files changed, 18 insertions(+), 21 deletions(-)
 create mode 100644 code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm

diff --git a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
index 17b1b003e19..fc8f789a541 100644
--- a/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
+++ b/_maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
@@ -517,10 +517,7 @@
 	},
 /area/ruin/space/abandoned_engi_sat)
 "oG" = (
-/obj/structure/closet{
-	icon_state = "atmos_wardrobe";
-	name = "atmospherics wardrobe"
-	},
+/obj/structure/closet/wardrobe/atmospherics_yellow/empty,
 /obj/machinery/light_switch{
 	dir = 1;
 	pixel_y = -24;
@@ -570,11 +567,7 @@
 	},
 /area/ruin/space/abandoned_engi_sat)
 "pX" = (
-/obj/structure/closet{
-	icon_state = "eng_secure";
-	open_door_sprite = "eng_secure_door";
-	name = "engineer's locker"
-	},
+/obj/structure/closet/secure_closet/engineering_personal/empty,
 /turf/simulated/floor/wood/airless,
 /area/ruin/space/abandoned_engi_sat)
 "qu" = (
@@ -903,11 +896,7 @@
 	icon_state = "tube-broken";
 	status = 2
 	},
-/obj/structure/closet{
-	icon_state = "fire";
-	name = "fire-safety closet";
-	desc = "It's a storage unit for fire-fighting supplies."
-	},
+/obj/structure/closet/firecloset,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot";
 	dir = 1
@@ -1436,13 +1425,7 @@
 /turf/simulated/floor/plating,
 /area/ruin/space/abandoned_engi_sat)
 "Yz" = (
-/obj/structure/closet{
-	icon_state = "emergency";
-	open_door_sprite = "emergency_door";
-	name = "emergency closet";
-	desc = "It's a storage unit for emergency breathmasks and o2 tanks.";
-	opened = 1
-	},
+/obj/structure/closet/emcloset,
 /turf/simulated/floor/plasteel{
 	icon_state = "bot";
 	dir = 1
diff --git a/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
new file mode 100644
index 00000000000..2908f0b65f2
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/ruins/abandoned_engi_sat.dm
@@ -0,0 +1,13 @@
+/obj/structure/closet/secure_closet/engineering_personal/empty
+	locked = FALSE
+	opened = TRUE
+
+/obj/structure/closet/secure_closet/engineering_personal/empty/populate_contents()
+	return
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/empty
+	opened = TRUE
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/populate_contents()
+	return
+
diff --git a/paradise.dme b/paradise.dme
index 9fe3bf88a11..ff430b4fc5d 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -1629,6 +1629,7 @@
 #include "code\modules\awaymissions\mission_code\shuttle_shadow.dm"
 #include "code\modules\awaymissions\mission_code\ghost_role_spawners\golems.dm"
 #include "code\modules\awaymissions\mission_code\ghost_role_spawners\oldstation_spawns.dm"
+#include "code\modules\awaymissions\mission_code\ruins\abandoned_engi_sat.dm"
 #include "code\modules\awaymissions\mission_code\ruins\deepstorage.dm"
 #include "code\modules\awaymissions\mission_code\ruins\derelict5.dm"
 #include "code\modules\awaymissions\mission_code\ruins\gps_ruin.dm"