Merge pull request impstation#1860 from DinnerCalzone/command

Add unique airlock sprites to differentiate head airlocks, administrative assistant locker resprite
SixValentine · Mar 7, 2025 · 47f086e · 47f086e
2 parents b2304d5 + eb93110
commit 47f086e
Show file tree

Hide file tree

Showing 345 changed files with 3,513 additions and 68 deletions.
diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -311,7 +311,7 @@
       board: [ DoorElectronicsCommand ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockCaptain #imp edit
   id: AirlockCaptainLocked
   suffix: Captain, Locked
   components:
@@ -320,7 +320,7 @@
       board: [ DoorElectronicsCaptain ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockChiefMedicalOfficer #imp edit
   id: AirlockChiefMedicalOfficerLocked
   suffix: ChiefMedicalOfficer, Locked
   components:
@@ -329,7 +329,7 @@
       board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockChiefEngineer #imp edit
   id: AirlockChiefEngineerLocked
   suffix: ChiefEngineer, Locked
   components:
@@ -338,7 +338,7 @@
       board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockHeadOfSecurity #imp edit
   id: AirlockHeadOfSecurityLocked
   suffix: HeadOfSecurity, Locked
   components:
@@ -347,7 +347,7 @@
       board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockResearchDirector #imp edit
   id: AirlockResearchDirectorLocked
   suffix: ResearchDirector, Locked
   components:
@@ -356,7 +356,7 @@
       board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockHeadOfPersonnel #imp edit
   id: AirlockHeadOfPersonnelLocked
   suffix: HeadOfPersonnel, Locked
   components:
@@ -365,7 +365,7 @@
       board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockQuartermaster #imp edit
   id: AirlockQuartermasterLocked
   suffix: Quartermaster, Locked
   components:
@@ -703,7 +703,7 @@
       board: [ DoorElectronicsCommand ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockCaptainGlass #imp edit
   id: AirlockCaptainGlassLocked
   suffix: Captain, Locked
   components:
@@ -712,7 +712,7 @@
       board: [ DoorElectronicsCaptain ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockChiefMedicalOfficerGlass #imp edit
   id: AirlockChiefMedicalOfficerGlassLocked
   suffix: ChiefMedicalOfficer, Locked
   components:
@@ -721,7 +721,7 @@
       board: [ DoorElectronicsChiefMedicalOfficer ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockChiefEngineerGlass #imp edit
   id: AirlockChiefEngineerGlassLocked
   suffix: ChiefEngineer, Locked
   components:
@@ -730,7 +730,7 @@
       board: [ DoorElectronicsChiefEngineer ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockHeadOfSecurityGlass #imp edit
   id: AirlockHeadOfSecurityGlassLocked
   suffix: HeadOfSecurity, Locked
   components:
@@ -739,7 +739,7 @@
       board: [ DoorElectronicsHeadOfSecurity ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockResearchDirectorGlass #imp edit
   id: AirlockResearchDirectorGlassLocked
   suffix: ResearchDirector, Locked
   components:
@@ -748,7 +748,7 @@
       board: [ DoorElectronicsResearchDirector ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockHeadOfPersonnelGlass #imp edit
   id: AirlockHeadOfPersonnelGlassLocked
   suffix: HeadOfPersonnel, Locked
   components:
@@ -757,7 +757,7 @@
       board: [ DoorElectronicsHeadOfPersonnel ]
 
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockQuartermasterGlass #imp edit
   id: AirlockQuartermasterGlassLocked
   suffix: Quartermaster, Locked
   components:

diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
@@ -16,19 +16,28 @@
     security:    Structures/Doors/Airlocks/Standard/security.rsi
     virology:    Structures/Doors/Airlocks/Standard/virology.rsi
     #begin imp edit
+    basic:       _Impstation/Structures/Doors/Airlocks/Standard/public.rsi
     bar:         _Impstation/Structures/Doors/Airlocks/Standard/bar.rsi
+    captain:     _Impstation/Structures/Doors/Airlocks/Standard/captain.rsi
+    ce:          _Impstation/Structures/Doors/Airlocks/Standard/ce.rsi
     chapel:      _Impstation/Structures/Doors/Airlocks/Standard/chapel.rsi
     clown:       _Impstation/Structures/Doors/Airlocks/Standard/clown.rsi
+    cmo:         _Impstation/Structures/Doors/Airlocks/Standard/cmo.rsi
+    courier:     _Impstation/Structures/Doors/Airlocks/Standard/courier.rsi
+    hd:          _Impstation/Structures/Doors/Airlocks/Standard/hd.rsi
+    hop:         _Impstation/Structures/Doors/Airlocks/Standard/hop.rsi
+    hos:         _Impstation/Structures/Doors/Airlocks/Standard/hos.rsi
     janitor:     _Impstation/Structures/Doors/Airlocks/Standard/janitor.rsi
     kitchen:     _Impstation/Structures/Doors/Airlocks/Standard/kitchen.rsi
     lawyer:      _Impstation/Structures/Doors/Airlocks/Standard/lawyer.rsi
     librarian:   _Impstation/Structures/Doors/Airlocks/Standard/librarian.rsi
     mime:        _Impstation/Structures/Doors/Airlocks/Standard/mime.rsi
+    musician:    _Impstation/Structures/Doors/Airlocks/Standard/musician.rsi
+    qm:          _Impstation/Structures/Doors/Airlocks/Standard/qm.rsi
+    rd:          _Impstation/Structures/Doors/Airlocks/Standard/rd.rsi
     reporter:    _Impstation/Structures/Doors/Airlocks/Standard/reporter.rsi
-    theatre:     _Impstation/Structures/Doors/Airlocks/Standard/theatre.rsi
     salvage:     _Impstation/Structures/Doors/Airlocks/Standard/salvage.rsi
-    courier:     _Impstation/Structures/Doors/Airlocks/Standard/courier.rsi
-    basic:      _Impstation/Structures/Doors/Airlocks/Standard/public.rsi
+    theatre:     _Impstation/Structures/Doors/Airlocks/Standard/theatre.rsi
     #end imp edit
 
 - type: AirlockGroup
@@ -50,17 +59,26 @@
     virology:    Structures/Doors/Airlocks/Glass/virology.rsi
     #begin imp edit
     bar:         _Impstation/Structures/Doors/Airlocks/Glass/bar.rsi
+    captain:     _Impstation/Structures/Doors/Airlocks/Glass/captain.rsi
+    ce:          _Impstation/Structures/Doors/Airlocks/Glass/ce.rsi
     chapel:      _Impstation/Structures/Doors/Airlocks/Glass/chapel.rsi
-    clown:      _Impstation/Structures/Doors/Airlocks/Glass/clown.rsi
+    clown:       _Impstation/Structures/Doors/Airlocks/Glass/clown.rsi
+    cmo:         _Impstation/Structures/Doors/Airlocks/Glass/cmo.rsi
+    courier:     _Impstation/Structures/Doors/Airlocks/Glass/courier.rsi
+    hd:          _Impstation/Structures/Doors/Airlocks/Glass/hd.rsi
+    hop:         _Impstation/Structures/Doors/Airlocks/Glass/hop.rsi
+    hos:         _Impstation/Structures/Doors/Airlocks/Glass/hos.rsi
     janitor:     _Impstation/Structures/Doors/Airlocks/Glass/janitor.rsi
     kitchen:     _Impstation/Structures/Doors/Airlocks/Glass/kitchen.rsi
     lawyer:      _Impstation/Structures/Doors/Airlocks/Glass/lawyer.rsi
     librarian:   _Impstation/Structures/Doors/Airlocks/Glass/librarian.rsi
     mime:        _Impstation/Structures/Doors/Airlocks/Glass/mime.rsi
+    musician:    _Impstation/Structures/Doors/Airlocks/Glass/musician.rsi
+    qm:          _Impstation/Structures/Doors/Airlocks/Glass/qm.rsi
+    rd:          _Impstation/Structures/Doors/Airlocks/Glass/rd.rsi
     reporter:    _Impstation/Structures/Doors/Airlocks/Glass/reporter.rsi
-    theatre:     _Impstation/Structures/Doors/Airlocks/Glass/theatre.rsi
     salvage:     _Impstation/Structures/Doors/Airlocks/Glass/salvage.rsi
-    courier:     _Impstation/Structures/Doors/Airlocks/Glass/courier.rsi
+    theatre:     _Impstation/Structures/Doors/Airlocks/Glass/theatre.rsi
     #end imp edit
 
 - type: AirlockGroup
@@ -120,8 +138,17 @@
     lawyer: Service
     librarian: Service
     mime: Service
+    musician: Service
     reporter: Service
     theatre: Service
     salvage: Cargo
     courier: Cargo
+    captain: Command
+    ce: Command
+    cmo: Command
+    hd: Command
+    hop: Command
+    hos: Command
+    qm: Command
+    rd: Command
     #end imp edit
diff --git a/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/_DV/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -4,10 +4,27 @@
   name: administrative assistant's locker
   components:
   - type: Sprite
-    sprite: _DV/Structures/Storage/closet.rsi
+    sprite: _Impstation/Structures/Storage/aacloset.rsi
+    noRot: true
+    layers:
+    - state: aa
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: aa_door
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+    - state: welded
+      visible: false
+      map: ["enum.WeldableLayers.BaseWelded"]
+    - state: paper
+      visible: false
+      sprite: Structures/Storage/closet_labels.rsi
+      offset: "-0.065,0"
+      map: ["enum.PaperLabelVisuals.Layer"]
   - type: EntityStorageVisuals
-    stateBaseClosed: admin_assist
-    stateDoorOpen: admin_assist_open
-    stateDoorClosed: admin_assist_door
+    stateBaseClosed: aa
+    stateDoorOpen: aa_open
+    stateDoorClosed: aa_door
   - type: AccessReader
     access: [["Command"]]
diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Doors/Airlocks/access.yml
@@ -2,7 +2,7 @@
 
 # Command
 - type: entity
-  parent: AirlockCommand
+  parent: AirlockHospitalityDirector
   id: AirlockHospitalityDirectorLocked
   suffix: HospitalityDirector, Locked
   components:
@@ -79,7 +79,7 @@
 
 # Command
 - type: entity
-  parent: AirlockCommandGlass
+  parent: AirlockHospitalityDirectorGlass
   id: AirlockHospitalityDirectorGlassLocked
   suffix: HospitalityDirector, Locked
   components:

diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Doors/Airlocks/airlocks.yml
@@ -1,5 +1,70 @@
 # Airlocks
 
+# Command
+- type: entity
+  parent: AirlockCommand
+  id: AirlockCaptain
+  suffix: Captain
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/captain.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockChiefMedicalOfficer
+  suffix: ChiefMedicalOfficer
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/cmo.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockChiefEngineer
+  suffix: ChiefEngineer
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/ce.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockHeadOfSecurity
+  suffix: HeadOfSecurity
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/hos.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockResearchDirector
+  suffix: ResearchDirector
+  components:
+   - type: Sprite
+     sprite: _Impstation/Structures/Doors/Airlocks/Standard/rd.rsi 
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockHeadOfPersonnel
+  suffix: HeadOfPersonnel
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/hop.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockQuartermaster
+  suffix: Quartermaster
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/qm.rsi
+
+- type: entity
+  parent: AirlockCommand
+  id: AirlockHospitalityDirector
+  suffix: HospitalityDirector
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Standard/hd.rsi
+
 # Service
 - type: entity
   parent: Airlock
@@ -118,6 +183,72 @@
 
 # Glass Airlocks
 
+# Command
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockCaptainGlass
+  suffix: Captain
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/captain.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockChiefMedicalOfficerGlass
+  suffix: ChiefMedicalOfficer
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/cmo.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockChiefEngineerGlass
+  suffix: ChiefEngineer
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/ce.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockHeadOfSecurityGlass
+  suffix: HeadOfSecurity
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/hos.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockResearchDirectorGlass
+  suffix: ResearchDirector
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/rd.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockHeadOfPersonnelGlass
+  suffix: HeadOfPersonnel
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/hop.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockQuartermasterGlass
+  suffix: Quartermaster
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/qm.rsi
+
+- type: entity
+  parent: AirlockCommandGlass
+  id: AirlockHospitalityDirectorGlass
+  suffix: HospitalityDirector 
+  components:
+  - type: Sprite
+    sprite: _Impstation/Structures/Doors/Airlocks/Glass/hd.rsi
+
 # Service
 - type: entity
   parent: AirlockGlass