From 6a3e6f33999b2e31622374a0199b12fcd3608a9f Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Wed, 23 Feb 2022 04:39:50 -0400
Subject: [PATCH] Extra mapping assets (#6854)

---
 .../Structures/Doors/Airlocks/access.yml      | 49 +++++++++++++------
 .../Entities/Structures/Wallmounts/mirror.yml |  4 +-
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
index 86709a5795..c02d21faf2 100644
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml
@@ -14,7 +14,7 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
-    
+
 - type: entity
   parent: Airlock
   id: AirlockChapelLocked
@@ -22,7 +22,7 @@
   components:
   - type: AccessReader
     access: [["Chapel"]]
-    
+
 - type: entity
   parent: Airlock
   id: AirlockJanitorLocked
@@ -38,7 +38,7 @@
   components:
   - type: AccessReader
     access: [["Kitchen"]]
-    
+
 - type: entity
   parent: Airlock
   id: AirlockBarLocked
@@ -46,7 +46,7 @@
   components:
   - type: AccessReader
     access: [["Bar"]]
-    
+
 - type: entity
   parent: Airlock
   id: AirlockHydroponicsLocked
@@ -55,6 +55,14 @@
   - type: AccessReader
     access: [["Hydroponics"]]
 
+- type: entity
+  parent: Airlock
+  id: AirlockServiceCaptainLocked
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
 - type: entity
   parent: AirlockExternal
   id: AirlockExternalLocked
@@ -102,7 +110,7 @@
   components:
   - type: AccessReader
     access: [["Salvage"]]
-    
+
 - type: entity
   parent: AirlockCargo
   id: AirlockQuartermasterLocked
@@ -134,7 +142,7 @@
   components:
   - type: AccessReader
     access: [["Research"]]
-    
+
 - type: entity
   parent: AirlockScience
   id: AirlockMedicalScienceLocked
@@ -192,7 +200,7 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
-    
+
 - type: entity
   parent: AirlockCommand
   id: AirlockHeadOfPersonnelLocked
@@ -210,7 +218,7 @@
     access: [["Security"]]
   - type: Wires
     LayoutId: AirlockSecurity
-    
+
 - type: entity
   parent: AirlockSecurity
   id: AirlockBrigLocked
@@ -399,7 +407,7 @@
   components:
   - type: AccessReader
     access: [["ResearchDirector"]]
-    
+
 - type: entity
   parent: AirlockCommandGlass
   id: AirlockHeadOfPersonnelGlassLocked
@@ -407,7 +415,7 @@
   components:
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
-    
+
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockSecurityGlassLocked
@@ -415,7 +423,7 @@
   components:
   - type: AccessReader
     access: [["Security"]]
-    
+
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockBrigGlassLocked
@@ -423,7 +431,7 @@
   components:
   - type: AccessReader
     access: [["Brig"]]
-    
+
 - type: entity
   parent: AirlockSecurityGlass
   id: AirlockArmoryGlassLocked
@@ -431,7 +439,7 @@
   components:
   - type: AccessReader
     access: [["Armory"]]
-  
+
 - type: entity
   parent: AirlockEVALocked
   id: AirlockEVAGlassLocked
@@ -528,7 +536,7 @@
   components:
   - type: AccessReader
     access: [["Theatre"]]
-    
+
 - type: entity
   parent: AirlockMaint
   id: AirlockMaintKitchenLocked
@@ -593,6 +601,14 @@
   - type: AccessReader
     access: [["HeadOfPersonnel"]]
 
+- type: entity
+  parent: AirlockMaint
+  id: AirlockMaintCaptainLocked
+  suffix: Captain, Locked
+  components:
+  - type: AccessReader
+    access: [["Captain"]]
+
 # Shuttle airlocks
 - type: entity
   parent: AirlockShuttle
@@ -608,4 +624,7 @@
   suffix: External, Glass, Docking, Locked
   components:
   - type: AccessReader
-    access: [["External"]]
\ No newline at end of file
+    access: [["External"]]
+
+
+
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
index f2df3fc89b..2b44e00e7f 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml
@@ -1,6 +1,5 @@
 - type: entity
   id: Mirror
-  parent: BaseStructure
   name: mirror
   description: 'Mirror mirror on the wall , who''s the most robust of them all?'
   components:
@@ -9,6 +8,9 @@
     sprite: Structures/Wallmounts/mirror.rsi
     state: mirror
   - type: InteractionOutline
+  - type: Clickable
+  - type: Transform
+    anchored: true
   - type: MagicMirror
   - type: UserInterface
     interfaces: