Per-department wire layouts (#26247)

* add per-department wire layouts

* fix science/research inconsistency

* fix wireLayout inheritance

* science is no longer security

* Security doors back to normal wire count

* implement proper wire inheritance

* revert WiresSystem.cs fix

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 31f2f2c5d0a7c1d01a967d2fa56cac44a1373864..7eed29ad56ba562ecfc5c8e14c595b58eaa04019 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -6,6 +6,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -14,6 +16,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -22,6 +26,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -30,6 +36,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -38,6 +46,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -46,6 +56,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -54,6 +66,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -62,6 +76,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: Airlock
@@ -70,6 +86,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockExternal
@@ -86,6 +104,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockExternal
@@ -94,6 +114,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -102,6 +124,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternal
@@ -126,6 +150,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -134,6 +160,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"], ["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockFreezer
@@ -142,6 +170,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineering
@@ -150,6 +180,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmospherics
@@ -158,6 +190,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargo
@@ -166,6 +200,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargo
@@ -174,6 +210,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMining
@@ -182,6 +220,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMedical
@@ -190,6 +230,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockVirology
@@ -198,6 +240,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockChemistry
@@ -206,6 +250,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScience
@@ -214,6 +260,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScience
@@ -222,6 +270,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommand
@@ -250,6 +300,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -258,6 +310,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -266,6 +320,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -274,6 +330,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -282,6 +340,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -290,6 +350,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommand
@@ -298,6 +360,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurity
@@ -356,6 +420,8 @@
   components:
   - type: AccessReader
     access: [["Security", "Command"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommand
@@ -364,6 +430,8 @@
   components:
   - type: AccessReader
     access: [["External"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 # Glass Airlocks
 - type: entity
@@ -373,6 +441,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -381,6 +451,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -389,6 +461,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -397,6 +471,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -413,6 +489,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockExternalGlass
@@ -437,6 +515,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockExternalGlass
@@ -445,6 +525,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockGlass
@@ -453,6 +535,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -461,6 +545,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -469,6 +555,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockGlass
@@ -477,6 +565,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockEngineeringGlass
@@ -485,6 +575,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockAtmosphericsGlass
@@ -493,6 +585,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockCargoGlass
@@ -501,6 +595,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockCargoGlass
@@ -509,6 +605,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMiningGlass
@@ -517,6 +615,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockChemistryGlass
@@ -525,6 +625,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMedicalGlass
@@ -533,6 +635,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockVirologyGlass
@@ -541,6 +645,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockScienceGlass
@@ -549,6 +655,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockScienceGlass
@@ -557,6 +665,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockCentralCommandGlass
@@ -575,6 +685,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -583,6 +695,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -591,6 +705,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -599,6 +715,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -607,6 +725,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -615,6 +735,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -623,6 +745,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockCommandGlass
@@ -631,6 +755,8 @@
   components:
   - type: AccessReader
     access: [["Quartermaster"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -639,6 +765,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -647,6 +775,8 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -655,6 +785,8 @@
   components:
   - type: AccessReader
     access: [["Brig"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -663,6 +795,8 @@
   components:
   - type: AccessReader
     access: [["Security"], ["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSecurityGlass
@@ -671,6 +805,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockCommandGlassLocked
@@ -720,6 +856,8 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -728,6 +866,8 @@
   components:
   - type: AccessReader
     access: [["Cargo"]]
+  - type: Wires
+    layoutId: AirlockCargo
 
 - type: entity
   parent: AirlockMaint
@@ -736,6 +876,8 @@
   components:
   - type: AccessReader
     access: [["Command"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -752,6 +894,8 @@
   components:
   - type: AccessReader
     access: [["Engineering"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -760,6 +904,8 @@
   components:
   - type: AccessReader
     access: [["Atmospherics"]]
+  - type: Wires
+    layoutId: AirlockEngineering
 
 - type: entity
   parent: AirlockMaint
@@ -768,6 +914,8 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -776,6 +924,8 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -784,6 +934,8 @@
   components:
   - type: AccessReader
     access: [["Hydroponics"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -792,6 +944,8 @@
   components:
   - type: AccessReader
     access: [["Janitor"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -800,6 +954,8 @@
   components:
   - type: AccessReader
     access: [["Lawyer"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -808,6 +964,8 @@
   components:
   - type: AccessReader
     access: [["Service"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -816,6 +974,8 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -824,6 +984,8 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
+  - type: Wires
+    layoutId: AirlockService
 
 - type: entity
   parent: AirlockMaint
@@ -840,6 +1002,8 @@
   components:
   - type: AccessReader
     access: [["Medical"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -848,6 +1012,8 @@
   components:
   - type: AccessReader
     access: [["Chemistry"]]
+  - type: Wires
+    layoutId: AirlockMedical
 
 - type: entity
   parent: AirlockMaint
@@ -856,6 +1022,8 @@
   components:
   - type: AccessReader
     access: [["Research"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -864,6 +1032,8 @@
   components:
   - type: AccessReader
     access: [["Research"], ["Medical"]]
+  - type: Wires
+    layoutId: AirlockScience
 
 - type: entity
   parent: AirlockMaint
@@ -872,6 +1042,8 @@
   components:
   - type: AccessReader
     access: [["Security"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -880,6 +1052,8 @@
   components:
   - type: AccessReader
     access: [["Detective"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockMaint
@@ -888,6 +1062,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -896,6 +1072,8 @@
   components:
   - type: AccessReader
     access: [["Captain"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -904,6 +1082,8 @@
   components:
   - type: AccessReader
     access: [["ChiefEngineer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -912,6 +1092,8 @@
   components:
   - type: AccessReader
     access: [["ChiefMedicalOfficer"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -920,6 +1102,8 @@
   components:
   - type: AccessReader
     access: [["HeadOfSecurity"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -928,6 +1112,8 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
+  - type: Wires
+    layoutId: AirlockCommand
 
 - type: entity
   parent: AirlockMaint
@@ -936,6 +1122,8 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
+  - type: Wires
+    layoutId: AirlockSecurity
 
 - type: entity
   parent: AirlockSyndicate

diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml
index 338bf188ba09c13a2b288faf4cf6da723742166d..b30e68545dfb54d15b8a271e72513b20bc6aadb4 100644 (file)
--- a/Resources/Prototypes/Wires/layouts.yml
+++ b/Resources/Prototypes/Wires/layouts.yml
@@ -15,6 +15,26 @@
 
 - type: wireLayout
   parent: Airlock
+  id: AirlockService
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockCargo
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockEngineering
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockMedical
+
+- type: wireLayout
+  parent: Airlock
+  id: AirlockScience
+
+- type: wireLayout
+  parent: HighSec
   id: AirlockCommand
 
 - type: wireLayout