Fix some maintenance doors not using wires configuration + cleanup + minor changes (#36735)

* Kill useless maints doors + general fixes * Migrate the common maints airlock * Fix parenting * Service Theatre * migrate out the other removed airlock --------- Co-authored-by: EmoGarbage404 <retron404@gmail.com>
2025-05-03 12:07:57 -03:00
parent f3bc40eaa7
commit aaa4c75341
2 changed files with 97 additions and 183 deletions
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -879,311 +879,221 @@
      board: [ DoorElectronicsMaintenance ]

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockSalvageLocked
  id: AirlockMaintSalvageLocked
-  suffix: Salvage, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsSalvage ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockCargoLocked
  id: AirlockMaintCargoLocked
-  suffix: Cargo, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCargo ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockCommandLocked
  id: AirlockMaintCommandLocked
-  suffix: Command, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCommand ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
-  id: AirlockMaintCommonLocked
-  suffix: Common, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMaintenance ]
-
- type: entity
-  parent: AirlockMaint
+  parent: AirlockEngineeringLocked
  id: AirlockMaintEngiLocked
-  suffix: Engineering, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsEngineering ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockAtmosphericsLocked
  id: AirlockMaintAtmoLocked
-  suffix: Atmospherics, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsAtmospherics ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockBarLocked
  id: AirlockMaintBarLocked
-  suffix: Bar, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsBar ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockBarKitchenLocked
  id: AirlockMaintBarKitchenLocked
-  suffix: Bar&Kitchen, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsBarKitchen ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockChapelLocked
  id: AirlockMaintChapelLocked
-  suffix: Chapel, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsChapel ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockHydroponicsLocked
  id: AirlockMaintHydroLocked
-  suffix: Hydroponics, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsHydroponics ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockJanitorLocked
  id: AirlockMaintJanitorLocked
-  suffix: Janitor, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsJanitor ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockLawyerLocked
  id: AirlockMaintLawyerLocked
-  suffix: Lawyer, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsLawyer ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockServiceLocked
  id: AirlockMaintServiceLocked
-  suffix: Service, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsService ]
-  - type: Wires
-    layoutId: AirlockService
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockTheatreLocked
  id: AirlockMaintTheatreLocked
-  suffix: Theatre, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsTheatre ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockServiceTheatreLocked
  id: AirlockMaintServiceTheatreLocked
-  suffix: Service, Theatre, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsServiceTheatre ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockKitchenLocked
  id: AirlockMaintKitchenLocked
-  suffix: Kitchen, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsKitchen ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintServiceLocked
+  parent: AirlockFreezerKitchenHydroLocked
  id: AirlockMaintKitchenHydroLocked
-  suffix: Kitchen/Hydroponics, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsKitchenHydroponics ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
-  id: AirlockMaintIntLocked
-  suffix: Interior, Locked
-  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMaintenance ]
-
- type: entity
-  parent: AirlockMaint
+  parent: AirlockMedicalLocked
  id: AirlockMaintMedLocked
-  suffix: Medical, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMedical ]
-  - type: Wires
-    layoutId: AirlockMedical
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintMedLocked
+  parent: AirlockMedicalMorgueLocked
  id: AirlockMedicalMorgueMaintLocked
-  suffix: Morgue, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMorgue ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintMedLocked
+  parent: AirlockChemistryLocked
  id: AirlockMaintChemLocked
-  suffix: Chemistry, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsChemistry ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockScienceLocked
  id: AirlockMaintRnDLocked
-  suffix: Science, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsResearch ]
-  - type: Wires
-    layoutId: AirlockScience
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintRnDLocked
+  parent: AirlockMedicalScienceLocked
  id: AirlockMaintRnDMedLocked
-  suffix: Medical/Science, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsMedicalResearch ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockSecurityLocked
  id: AirlockMaintSecLocked
-  suffix: Security, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsSecurity ]
-  - type: Wires
-    layoutId: AirlockSecurity
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintSecLocked
+  parent: AirlockDetectiveLocked
  id: AirlockMaintDetectiveLocked
-  suffix: Detective, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsDetective ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockHeadOfPersonnelLocked
  id: AirlockMaintHOPLocked
-  suffix: HeadOfPersonnel, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsHeadOfPersonnel ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockCaptainLocked
  id: AirlockMaintCaptainLocked
-  suffix: Captain, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsCaptain ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockChiefEngineerLocked
  id: AirlockMaintChiefEngineerLocked
-  suffix: ChiefEngineer, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsChiefEngineer ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockChiefMedicalOfficerLocked
  id: AirlockMaintChiefMedicalOfficerLocked
-  suffix: ChiefMedicalOfficer, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsChiefMedicalOfficer ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockHeadOfSecurityLocked
  id: AirlockMaintHeadOfSecurityLocked
-  suffix: HeadOfSecurity, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsHeadOfSecurity ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockResearchDirectorLocked
  id: AirlockMaintResearchDirectorLocked
-  suffix: ResearchDirector, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsResearchDirector ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaintCommandLocked
+  parent: AirlockQuartermasterLocked
  id: AirlockMaintQuartermasterLocked
-  suffix: Quartermaster, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsQuartermaster ]
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
-  parent: AirlockMaint
+  parent: AirlockArmoryLocked
  id: AirlockMaintArmoryLocked
-  suffix: Armory, Locked
  components:
-  - type: ContainerFill
-    containers:
-      board: [ DoorElectronicsArmory ]
-  - type: Wires
-    layoutId: AirlockArmory
+  - type: Sprite
+    sprite: Structures/Doors/Airlocks/Standard/maint.rsi

 - type: entity
  parent: AirlockSyndicate
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -611,6 +611,10 @@ SimpleXenoArtifactItem: ComplexXenoArtifactItem
 MediumXenoArtifactItem: ComplexXenoArtifactItem
 VariedXenoArtifactItem: ComplexXenoArtifactItem

+# 2025-04-19
+AirlockMaintCommonLocked: AirlockMaintLocked
+AirlockMaintIntLocked: AirlockMaintLocked
+
 # 2025-04-26
 ComputerCargoShuttle: ComputerShuttleCargo
 CargoShuttleComputerCircuitboard: CargoShuttleConsoleCircuitboard