Grunge airlock fix and cleanup

ss220club · Nov 12, 2023 · 001233c · 001233c
1 parent e06adac
commit 001233c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 33 deletions.
diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock_assembly_types.dm b/modular_bandastation/aesthetics/airlocks/code/airlock_assembly_types.dm
@@ -82,30 +82,12 @@
 	airlock_type = /obj/machinery/door/airlock/hydroponics
 	glass_type = /obj/machinery/door/airlock/hydroponics/glass
 
-/obj/structure/door_assembly/door_assembly_eva
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/eva.dmi'
-	base_name = "eva airlock"
-	airlock_type = /obj/machinery/door/airlock/eva
-	glass_type = /obj/machinery/door/airlock/eva/glass
-
 /obj/structure/door_assembly/door_assembly_service
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/service.dmi'
 	base_name = "service airlock"
 	airlock_type = /obj/machinery/door/airlock/service
 	glass_type = /obj/machinery/door/airlock/service/glass
 
-/obj/structure/door_assembly/door_assembly_psych
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/psych.dmi'
-	base_name = "psychiatrist airlock"
-	airlock_type = /obj/machinery/door/airlock/psych
-	glass_type = /obj/machinery/door/airlock/psych/glass
-
-/obj/structure/door_assembly/door_assembly_lawyer
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/corporate.dmi'
-	base_name = "lawyer airlock"
-	airlock_type = /obj/machinery/door/airlock/lawyer
-	glass_type = /obj/machinery/door/airlock/lawyer/glass
-
 /obj/structure/door_assembly/door_assembly_bathroom
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bathroom.dmi'
 	base_name = "bathroom airlock"
@@ -139,7 +121,10 @@
 
 /obj/structure/door_assembly/door_assembly_centcom
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi'
-	base_name = "centcom airlock"
+	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi'
+
+/obj/structure/door_assembly/door_assembly_grunge
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi'
 	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi'
 
 // Mineral airlocks

diff --git a/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm b/modular_bandastation/aesthetics/airlocks/code/airlock_types.dm
@@ -39,29 +39,18 @@
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/botany.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_hydro
 
-/obj/machinery/door/airlock/eva
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/eva.dmi'
-	assemblytype = /obj/structure/door_assembly/door_assembly_eva
-
 /obj/machinery/door/airlock/service
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/service.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_service
 
-/obj/machinery/door/airlock/psych
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/psych.dmi'
-	assemblytype = /obj/structure/door_assembly/door_assembly_psych
-
 /obj/machinery/door/airlock/bathroom
 	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/bathroom.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_bathroom
 
-/obj/machinery/door/airlock/lawyer
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/corporate.dmi'
-	assemblytype = /obj/structure/door_assembly/door_assembly_lawyer
-
 /obj/machinery/door/airlock/grunge
-	icon = 'modular_bandastation/aesthetics/airlocks/icons/station/corporate.dmi'
-	assemblytype = /obj/structure/door_assembly/door_assembly_lawyer
+	icon = 'modular_bandastation/aesthetics/airlocks/icons/centcom/centcom.dmi'
+	overlays_file = 'modular_bandastation/aesthetics/airlocks/icons/centcom/overlays.dmi'
+	assemblytype = /obj/structure/door_assembly/door_assembly_grunge
 
 // Station airlocks glass
 /obj/machinery/door/airlock/command/cap/glass