CentComm Map Updates (#34475)

* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype

diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs
index de327bd084038ab86ea0fc5743759833f236705e..27df5ef34d20f4ec7a375c902313a68fa320b043 100644 (file)
--- a/Content.Server/Remotes/DoorRemoteSystem.cs
+++ b/Content.Server/Remotes/DoorRemoteSystem.cs
@@ -1,13 +1,13 @@
 using Content.Server.Administration.Logs;
-using Content.Shared.Interaction;
-using Content.Shared.Doors.Components;
-using Content.Shared.Access.Components;
 using Content.Server.Doors.Systems;
 using Content.Server.Power.EntitySystems;
+using Content.Shared.Access.Components;
 using Content.Shared.Database;
+using Content.Shared.Doors.Components;
 using Content.Shared.Examine;
-using Content.Shared.Remotes.EntitySystems;
+using Content.Shared.Interaction;
 using Content.Shared.Remotes.Components;
+using Content.Shared.Remotes.EntitySystems;
 
 namespace Content.Shared.Remotes
 {
@@ -17,6 +17,7 @@ namespace Content.Shared.Remotes
         [Dependency] private readonly AirlockSystem _airlock = default!;
         [Dependency] private readonly DoorSystem _doorSystem = default!;
         [Dependency] private readonly ExamineSystemShared _examine = default!;
+
         public override void Initialize()
         {
             base.Initialize();
@@ -31,9 +32,12 @@ namespace Content.Shared.Remotes
             if (args.Handled
                 || args.Target == null
                 || !TryComp<DoorComponent>(args.Target, out var doorComp) // If it isn't a door we don't use it
-                                                                          // Only able to control doors if they are within your vision and within your max range.
-                                                                          // Not affected by mobs or machines anymore.
-                || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null))
+                // Only able to control doors if they are within your vision and within your max range.
+                // Not affected by mobs or machines anymore.
+                || !_examine.InRangeUnOccluded(args.User,
+                    args.Target.Value,
+                    SharedInteractionSystem.MaxRaycastRange,
+                    null))
 
             {
                 return;
@@ -50,7 +54,8 @@ namespace Content.Shared.Remotes
             if (TryComp<AccessReaderComponent>(args.Target, out var accessComponent)
                 && !_doorSystem.HasAccess(args.Target.Value, args.Used, doorComp, accessComponent))
             {
-                _doorSystem.Deny(args.Target.Value, doorComp, args.User);
+                if (isAirlock)
+                    _doorSystem.Deny(args.Target.Value, doorComp, args.User);
                 Popup.PopupEntity(Loc.GetString("door-remote-denied"), args.User, args.User);
                 return;
             }
@@ -59,7 +64,9 @@ namespace Content.Shared.Remotes
             {
                 case OperatingMode.OpenClose:
                     if (_doorSystem.TryToggleDoor(args.Target.Value, doorComp, args.Used))
-                        _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Medium,
+                            $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)}: {doorComp.State}");
                     break;
                 case OperatingMode.ToggleBolts:
                     if (TryComp<DoorBoltComponent>(args.Target, out var boltsComp))
@@ -67,17 +74,22 @@ namespace Content.Shared.Remotes
                         if (!boltsComp.BoltWireCut)
                         {
                             _doorSystem.SetBoltsDown((args.Target.Value, boltsComp), !boltsComp.BoltsDown, args.Used);
-                            _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
+                            _adminLogger.Add(LogType.Action,
+                                LogImpact.Medium,
+                                $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to {(boltsComp.BoltsDown ? "" : "un")}bolt it");
                         }
                     }
+
                     break;
                 case OperatingMode.ToggleEmergencyAccess:
                     if (airlockComp != null)
                     {
                         _airlock.SetEmergencyAccess((args.Target.Value, airlockComp), !airlockComp.EmergencyAccess);
-                        _adminLogger.Add(LogType.Action, LogImpact.Medium,
+                        _adminLogger.Add(LogType.Action,
+                            LogImpact.Medium,
                             $"{ToPrettyString(args.User):player} used {ToPrettyString(args.Used)} on {ToPrettyString(args.Target.Value)} to set emergency access {(airlockComp.EmergencyAccess ? "on" : "off")}");
                     }
+
                     break;
                 default:
                     throw new InvalidOperationException(

diff --git a/Resources/Maps/centcomm.yml b/Resources/Maps/centcomm.yml
index c2c8087bf891a57f92312555c4af2b1032db4e81..88df424d9a8be283ae3d168d9b23f7b44e520354 100644 (file)
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -2330,7 +2330,8 @@ entities:
           0,-2:
             0: 65535
           1,-4:
-            0: 65535
+            0: 65023
+            1: 512
           1,-3:
             0: 65535
           1,-2:
@@ -2781,17 +2782,17 @@ entities:
             0: 65535
           4,-8:
             0: 30719
-            1: 34816
+            2: 34816
           4,-7:
             0: 65535
           5,-8:
             0: 61183
-            1: 4352
+            2: 4352
           5,-7:
             0: 65535
           6,-8:
             0: 52479
-            2: 13056
+            3: 13056
           6,-7:
             0: 65535
           7,-8:
@@ -2872,6 +2873,21 @@ entities:
           - 0
           - 0
           - 0
+        - volume: 2500
+          temperature: 293.14975
+          moles:
+          - 20.078888
+          - 75.53487
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -2930,8 +2946,6 @@ entities:
     - type: Transform
       pos: -16.5,4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: Airlock
   entities:
   - uid: 5314
@@ -2974,6 +2988,30 @@ entities:
       parent: 1668
 - proto: AirlockBrigGlassLocked
   entities:
+  - uid: 736
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,20.5
+      parent: 1668
+  - uid: 816
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,20.5
+      parent: 1668
+  - uid: 856
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 12.5,16.5
+      parent: 1668
+  - uid: 898
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 11.5,16.5
+      parent: 1668
   - uid: 2299
     components:
     - type: Transform
@@ -2996,26 +3034,11 @@ entities:
       parent: 1668
 - proto: AirlockBrigLocked
   entities:
-  - uid: 2300
-    components:
-    - type: Transform
-      pos: 21.5,22.5
-      parent: 1668
-  - uid: 2317
-    components:
-    - type: Transform
-      pos: 19.5,17.5
-      parent: 1668
   - uid: 2343
     components:
     - type: Transform
       pos: 33.5,20.5
       parent: 1668
-  - uid: 2344
-    components:
-    - type: Transform
-      pos: 21.5,18.5
-      parent: 1668
 - proto: AirlockCargoGlassLocked
   entities:
   - uid: 1191
@@ -3291,6 +3314,28 @@ entities:
     - type: Transform
       pos: -19.5,7.5
       parent: 1668
+- proto: AirlockChemistryGlassLocked
+  entities:
+  - uid: 731
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-8.5
+      parent: 1668
+- proto: AirlockChemistryLocked
+  entities:
+  - uid: 732
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,-6.5
+      parent: 1668
+  - uid: 734
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 8.5,-11.5
+      parent: 1668
 - proto: AirlockEngineeringGlassLocked
   entities:
   - uid: 5175
@@ -3372,16 +3417,6 @@ entities:
     - type: Transform
       pos: 33.5,-5.5
       parent: 1668
-  - uid: 1615
-    components:
-    - type: Transform
-      pos: -14.5,25.5
-      parent: 1668
-  - uid: 1616
-    components:
-    - type: Transform
-      pos: -14.5,27.5
-      parent: 1668
   - uid: 3970
     components:
     - type: Transform
@@ -3402,18 +3437,42 @@ entities:
     - type: Transform
       pos: 0.5,-44.5
       parent: 1668
-- proto: AirlockExternalGlassLocked
+- proto: AirlockExternalGlassCargoLocked
   entities:
-  - uid: 1673
+  - uid: 620
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,27.5
+      parent: 1668
+  - uid: 688
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -14.5,25.5
+      parent: 1668
+  - uid: 729
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -9.5,32.5
       parent: 1668
-  - uid: 2010
+- proto: AirlockExternalGlassEngineeringLocked
+  entities:
+  - uid: 730
     components:
     - type: Transform
+      rot: -1.5707963267948966 rad
       pos: -0.5,22.5
       parent: 1668
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        2011:
+        - DoorStatus: DoorBolt
+- proto: AirlockExternalGlassLocked
+  entities:
   - uid: 4243
     components:
     - type: Transform
@@ -3521,6 +3580,12 @@ entities:
     - type: Transform
       pos: -2.5,25.5
       parent: 1668
+    - type: DeviceLinkSink
+      invokeCounter: 1
+    - type: DeviceLinkSource
+      linkedPorts:
+        730:
+        - DoorStatus: DoorBolt
   - uid: 4242
     components:
     - type: Transform
@@ -3576,11 +3641,6 @@ entities:
     - type: Transform
       pos: 14.5,-3.5
       parent: 1668
-  - uid: 730
-    components:
-    - type: Transform
-      pos: 4.5,-8.5
-      parent: 1668
 - proto: AirlockMedicalLocked
   entities:
   - uid: 574
@@ -3588,16 +3648,6 @@ entities:
     - type: Transform
       pos: 16.5,-6.5
       parent: 1668
-  - uid: 729
-    components:
-    - type: Transform
-      pos: 4.5,-6.5
-      parent: 1668
-  - uid: 731
-    components:
-    - type: Transform
-      pos: 8.5,-11.5
-      parent: 1668
   - uid: 852
     components:
     - type: Transform
@@ -3625,25 +3675,22 @@ entities:
     - type: Transform
       pos: 23.5,-11.5
       parent: 1668
-  - uid: 2497
-    components:
-    - type: Transform
-      pos: 12.5,16.5
-      parent: 1668
-  - uid: 2498
+- proto: AirlockSecurityLawyerLocked
+  entities:
+  - uid: 349
     components:
     - type: Transform
-      pos: 11.5,16.5
+      pos: 19.5,17.5
       parent: 1668
-  - uid: 2499
+  - uid: 354
     components:
     - type: Transform
-      pos: 12.5,19.5
+      pos: 21.5,22.5
       parent: 1668
-  - uid: 2500
+  - uid: 356
     components:
     - type: Transform
-      pos: 11.5,19.5
+      pos: 21.5,18.5
       parent: 1668
 - proto: AirlockSecurityLocked
   entities:
@@ -3682,46 +3729,46 @@ entities:
     - type: Transform
       pos: 5.5,23.5
       parent: 1668
-- proto: APCBasic
+- proto: APCHyperCapacity
   entities:
-  - uid: 688
+  - uid: 905
     components:
     - type: Transform
       pos: -3.5,5.5
       parent: 1668
-  - uid: 856
+  - uid: 963
     components:
     - type: Transform
       pos: 20.5,6.5
       parent: 1668
-  - uid: 905
+  - uid: 977
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 20.5,-7.5
       parent: 1668
-  - uid: 963
+  - uid: 978
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 23.5,-10.5
       parent: 1668
-  - uid: 977
+  - uid: 979
     components:
     - type: Transform
-      pos: 10.5,-3.5
+      pos: 9.5,2.5
       parent: 1668
-  - uid: 978
+  - uid: 1088
     components:
     - type: Transform
       pos: 12.5,7.5
       parent: 1668
-  - uid: 979
+  - uid: 1185
     components:
     - type: Transform
-      pos: 9.5,2.5
+      pos: 10.5,-3.5
       parent: 1668
-  - uid: 1088
+  - uid: 1188
     components:
     - type: Transform
       pos: -2.5,2.5
@@ -3742,239 +3789,239 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-9.5
       parent: 1668
-  - uid: 1674
+  - uid: 1615
     components:
     - type: Transform
       pos: -14.5,18.5
       parent: 1668
-  - uid: 1675
+  - uid: 1616
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,17.5
       parent: 1668
-  - uid: 1676
+  - uid: 1673
     components:
     - type: Transform
       pos: -8.5,13.5
       parent: 1668
-  - uid: 1677
+  - uid: 1674
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -4.5,19.5
       parent: 1668
-  - uid: 1955
+  - uid: 1675
     components:
     - type: Transform
       pos: 1.5,17.5
       parent: 1668
-  - uid: 2013
+  - uid: 1676
     components:
     - type: Transform
       pos: -1.5,22.5
       parent: 1668
-  - uid: 2562
+  - uid: 1677
     components:
     - type: Transform
-      pos: 7.5,16.5
+      rot: -1.5707963267948966 rad
+      pos: 7.5,18.5
       parent: 1668
-  - uid: 2563
+  - uid: 1955
     components:
     - type: Transform
       pos: 17.5,17.5
       parent: 1668
-  - uid: 2564
+  - uid: 2010
     components:
     - type: Transform
       pos: 24.5,14.5
       parent: 1668
-  - uid: 2565
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 35.5,19.5
-      parent: 1668
-  - uid: 2566
+  - uid: 2235
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 21.5,21.5
       parent: 1668
-  - uid: 2944
+  - uid: 2300
     components:
     - type: Transform
       pos: 9.5,26.5
       parent: 1668
-  - uid: 2945
+  - uid: 2317
     components:
     - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 7.5,18.5
+      pos: 7.5,16.5
       parent: 1668
-  - uid: 2946
+  - uid: 2344
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,30.5
       parent: 1668
-  - uid: 3463
+  - uid: 2497
     components:
     - type: Transform
       pos: -22.5,7.5
       parent: 1668
-  - uid: 3464
+  - uid: 2498
     components:
     - type: Transform
       pos: -16.5,13.5
       parent: 1668
-  - uid: 3465
+  - uid: 2499
     components:
     - type: Transform
       pos: -22.5,13.5
       parent: 1668
-  - uid: 3466
+  - uid: 2500
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,6.5
       parent: 1668
-  - uid: 3986
+  - uid: 2556
     components:
     - type: Transform
       pos: -31.5,2.5
       parent: 1668
-  - uid: 3987
+  - uid: 2558
     components:
     - type: Transform
       pos: -31.5,7.5
       parent: 1668
-  - uid: 3988
+  - uid: 2562
     components:
     - type: Transform
       pos: -21.5,-2.5
       parent: 1668
-  - uid: 3989
+  - uid: 2563
     components:
     - type: Transform
       pos: -13.5,-2.5
       parent: 1668
-  - uid: 3990
+  - uid: 2564
     components:
     - type: Transform
       pos: -17.5,1.5
       parent: 1668
-  - uid: 4361
+  - uid: 2565
     components:
     - type: Transform
       pos: 34.5,-9.5
       parent: 1668
-  - uid: 4475
+  - uid: 2566
     components:
     - type: Transform
       pos: -2.5,-24.5
       parent: 1668
-  - uid: 4476
+  - uid: 2755
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 7.5,-24.5
       parent: 1668
-  - uid: 4477
+  - uid: 2771
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -8.5,-24.5
       parent: 1668
-  - uid: 4478
+  - uid: 2776
     components:
     - type: Transform
       pos: -9.5,-17.5
       parent: 1668
-  - uid: 4479
+  - uid: 2790
     components:
     - type: Transform
       pos: 8.5,-17.5
       parent: 1668
-  - uid: 4480
+  - uid: 2823
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 1.5,-20.5
       parent: 1668
-  - uid: 4977
+  - uid: 2832
     components:
     - type: Transform
       pos: 20.5,-12.5
       parent: 1668
-  - uid: 4992
+  - uid: 2858
     components:
     - type: Transform
       pos: 18.5,-19.5
       parent: 1668
-  - uid: 5133
+  - uid: 2859
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 22.5,-23.5
       parent: 1668
-  - uid: 5146
+  - uid: 2862
     components:
     - type: Transform
       pos: 29.5,-19.5
       parent: 1668
-  - uid: 5257
+  - uid: 2863
     components:
     - type: Transform
       pos: 30.5,-14.5
       parent: 1668
-  - uid: 5321
+  - uid: 2876
     components:
     - type: Transform
       pos: 32.5,-27.5
       parent: 1668
-  - uid: 5423
+  - uid: 2886
     components:
     - type: Transform
       pos: 16.5,-28.5
       parent: 1668
-  - uid: 5934
+  - uid: 2920
     components:
     - type: Transform
       pos: -16.5,-30.5
       parent: 1668
-  - uid: 6004
+  - uid: 2925
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -17.5,-22.5
       parent: 1668
-  - uid: 6103
+  - uid: 2926
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -15.5,-28.5
       parent: 1668
-  - uid: 6180
+  - uid: 2927
     components:
     - type: Transform
       pos: 7.5,-30.5
       parent: 1668
-  - uid: 6181
+  - uid: 2928
     components:
     - type: Transform
       pos: -8.5,-30.5
       parent: 1668
-  - uid: 6277
+  - uid: 2944
     components:
     - type: Transform
       pos: -2.5,-34.5
       parent: 1668
-  - uid: 6397
+  - uid: 2945
     components:
     - type: Transform
       pos: -2.5,-40.5
       parent: 1668
+  - uid: 6977
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 35.5,19.5
+      parent: 1668
 - proto: Ash
   entities:
   - uid: 3828
@@ -4180,8 +4227,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: Bed
   entities:
   - uid: 2718
@@ -4296,101 +4341,67 @@ entities:
     - type: Transform
       pos: -4.5,21.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1804
   - uid: 1607
     components:
     - type: Transform
       pos: -16.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1611
   - uid: 1608
     components:
     - type: Transform
       pos: -16.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1612
   - uid: 1609
     components:
     - type: Transform
       pos: -14.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1612
   - uid: 1610
     components:
     - type: Transform
       pos: -14.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1611
-  - uid: 2790
+  - uid: 3787
     components:
     - type: Transform
-      pos: 11.5,31.5
+      pos: -16.5,-7.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2928
-  - uid: 2886
+  - uid: 3788
     components:
     - type: Transform
-      pos: 14.5,31.5
+      pos: -16.5,-6.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2928
-  - uid: 2925
+  - uid: 3789
     components:
     - type: Transform
-      pos: 7.5,31.5
+      pos: -16.5,-5.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2927
-  - uid: 2926
+  - uid: 4762
     components:
     - type: Transform
-      pos: 4.5,31.5
+      pos: 18.5,-17.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2927
-  - uid: 3787
+- proto: BlastDoorCentralCommand
+  entities:
+  - uid: 2946
     components:
     - type: Transform
-      pos: -16.5,-7.5
+      pos: 4.5,31.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2920
-  - uid: 3788
+  - uid: 3420
     components:
     - type: Transform
-      pos: -16.5,-6.5
+      pos: 7.5,31.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2920
-  - uid: 3789
+  - uid: 3431
     components:
     - type: Transform
-      pos: -16.5,-5.5
+      pos: 11.5,31.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2920
-  - uid: 4762
+  - uid: 4476
     components:
     - type: Transform
-      pos: 18.5,-17.5
+      pos: 14.5,31.5
       parent: 1668
 - proto: BlastDoorExterior1Open
   entities:
@@ -4453,25 +4464,16 @@ entities:
     - type: Transform
       pos: -1.5,-7.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 789
   - uid: 787
     components:
     - type: Transform
       pos: -0.5,-7.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 789
   - uid: 788
     components:
     - type: Transform
       pos: 0.5,-7.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 789
   - uid: 1430
     components:
     - type: Transform
@@ -4517,41 +4519,26 @@ entities:
     - type: Transform
       pos: 4.5,10.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2712
   - uid: 2147
     components:
     - type: Transform
       pos: 4.5,11.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2712
   - uid: 2148
     components:
     - type: Transform
       pos: 4.5,12.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2712
   - uid: 2149
     components:
     - type: Transform
       pos: 4.5,13.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2712
   - uid: 2150
     components:
     - type: Transform
       pos: 4.5,14.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 2712
   - uid: 3865
     components:
     - type: Transform
@@ -4567,65 +4554,41 @@ entities:
     - type: Transform
       pos: 28.5,-25.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5235
     components:
     - type: Transform
       pos: 28.5,-24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5236
     components:
     - type: Transform
       pos: 28.5,-23.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5237
     components:
     - type: Transform
       pos: 28.5,-22.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5238
     components:
     - type: Transform
       pos: 28.5,-21.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5239
     components:
     - type: Transform
       pos: 31.5,-19.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5240
     components:
     - type: Transform
       pos: 33.5,-19.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5241
     components:
     - type: Transform
       pos: 32.5,-19.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5242
   - uid: 5951
     components:
     - type: Transform
@@ -4661,41 +4624,26 @@ entities:
     - type: Transform
       pos: -2.5,-39.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6442
   - uid: 6522
     components:
     - type: Transform
       pos: -1.5,-39.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6442
   - uid: 6523
     components:
     - type: Transform
       pos: -0.5,-39.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6442
   - uid: 6524
     components:
     - type: Transform
       pos: 0.5,-39.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6442
   - uid: 6525
     components:
     - type: Transform
       pos: 1.5,-39.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6442
 - proto: Bookshelf
   entities:
   - uid: 2370
@@ -4913,6 +4861,13 @@ entities:
     - type: Transform
       pos: -20.46677,5.55778
       parent: 1668
+- proto: BoxFolderNuclearCodes
+  entities:
+  - uid: 6994
+    components:
+    - type: Transform
+      pos: -10.309893,6.5837517
+      parent: 1668
 - proto: BoxFolderRed
   entities:
   - uid: 1398
@@ -5048,56 +5003,38 @@ entities:
     - type: Transform
       pos: 4.5,26.5
       parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2832:
-        - Start: Close
-        - Timer: AutoClose
-        - Timer: Open
   - uid: 3870
     components:
     - type: Transform
       pos: 14.5,29.5
       parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2863:
-        - Start: Close
-        - Timer: AutoClose
-        - Timer: Open
   - uid: 3906
     components:
     - type: Transform
       pos: 14.5,26.5
       parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2776:
-        - Start: Close
-        - Timer: AutoClose
-        - Timer: Open
   - uid: 6602
     components:
     - type: Transform
       pos: 4.5,29.5
       parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2862:
-        - Start: Close
-        - Timer: AutoClose
-        - Timer: Open
   - uid: 6649
     components:
     - type: Transform
       pos: 14.5,23.5
       parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2558:
-        - Start: Close
-        - Timer: AutoClose
-        - Timer: Open
+- proto: ButtonFrameCautionSecurity
+  entities:
+  - uid: 6578
+    components:
+    - type: Transform
+      pos: 4.5,32.5
+      parent: 1668
+  - uid: 6592
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 1668
 - proto: CableApcExtension
   entities:
   - uid: 857
@@ -16404,6 +16341,81 @@ entities:
     - type: Transform
       pos: -2.5,-40.5
       parent: 1668
+  - uid: 6515
+    components:
+    - type: Transform
+      pos: 5.5,30.5
+      parent: 1668
+  - uid: 6516
+    components:
+    - type: Transform
+      pos: 6.5,30.5
+      parent: 1668
+  - uid: 6517
+    components:
+    - type: Transform
+      pos: 7.5,29.5
+      parent: 1668
+  - uid: 6518
+    components:
+    - type: Transform
+      pos: 7.5,28.5
+      parent: 1668
+  - uid: 6519
+    components:
+    - type: Transform
+      pos: 7.5,27.5
+      parent: 1668
+  - uid: 6520
+    components:
+    - type: Transform
+      pos: 7.5,26.5
+      parent: 1668
+  - uid: 6547
+    components:
+    - type: Transform
+      pos: 8.5,26.5
+      parent: 1668
+  - uid: 6548
+    components:
+    - type: Transform
+      pos: 10.5,26.5
+      parent: 1668
+  - uid: 6549
+    components:
+    - type: Transform
+      pos: 11.5,26.5
+      parent: 1668
+  - uid: 6550
+    components:
+    - type: Transform
+      pos: 11.5,27.5
+      parent: 1668
+  - uid: 6551
+    components:
+    - type: Transform
+      pos: 11.5,28.5
+      parent: 1668
+  - uid: 6552
+    components:
+    - type: Transform
+      pos: 11.5,29.5
+      parent: 1668
+  - uid: 6553
+    components:
+    - type: Transform
+      pos: 11.5,30.5
+      parent: 1668
+  - uid: 6554
+    components:
+    - type: Transform
+      pos: 12.5,30.5
+      parent: 1668
+  - uid: 6577
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 1668
   - uid: 6849
     components:
     - type: Transform
@@ -17729,24 +17741,12 @@ entities:
     - type: Transform
       pos: -19.5,-4.5
       parent: 1668
-  - uid: 3883
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-5.5
-      parent: 1668
   - uid: 3884
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -18.5,-6.5
       parent: 1668
-  - uid: 3885
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: -18.5,-7.5
-      parent: 1668
   - uid: 3886
     components:
     - type: Transform
@@ -17806,18 +17806,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -0.5,-29.5
       parent: 1668
-- proto: chem_master
-  entities:
-  - uid: 825
-    components:
-    - type: Transform
-      pos: 4.5,-13.5
-      parent: 1668
-  - uid: 4425
-    components:
-    - type: Transform
-      pos: 10.5,-23.5
-      parent: 1668
 - proto: ChemDispenser
   entities:
   - uid: 824
@@ -17832,6 +17820,18 @@ entities:
     - type: Transform
       pos: 3.5,-10.5
       parent: 1668
+- proto: ChemMaster
+  entities:
+  - uid: 825
+    components:
+    - type: Transform
+      pos: 4.5,-13.5
+      parent: 1668
+  - uid: 4425
+    components:
+    - type: Transform
+      pos: 10.5,-23.5
+      parent: 1668
 - proto: ChessBoard
   entities:
   - uid: 3762
@@ -17878,9 +17878,6 @@ entities:
     - type: Transform
       pos: 11.5,-13.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 575
     - type: Construction
       containers:
       - machine_parts
@@ -18197,13 +18194,6 @@ entities:
     - type: Transform
       pos: -16.552616,8.708888
       parent: 1668
-- proto: ClothingHeadHatHairflower
-  entities:
-  - uid: 6605
-    components:
-    - type: Transform
-      pos: -11.182456,6.7149878
-      parent: 1668
 - proto: ClothingHeadHatWelding
   entities:
   - uid: 2197
@@ -19062,132 +19052,87 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -16.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1577
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -15.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1578
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -14.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1579
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -13.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1580
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -12.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1581
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -11.5,24.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1588
   - uid: 1582
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -16.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 1583
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -15.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 1584
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -14.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 1585
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -13.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 1586
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -12.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 1587
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -11.5,28.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 1589
   - uid: 5902
     components:
     - type: Transform
       pos: -19.5,-33.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5906
   - uid: 5903
     components:
     - type: Transform
       pos: -19.5,-32.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5906
   - uid: 5904
     components:
     - type: Transform
       pos: -19.5,-31.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5906
 - proto: CrateArmoryLaser
   entities:
   - uid: 6533
@@ -19286,6 +19231,13 @@ entities:
     - type: Transform
       pos: -7.5,26.5
       parent: 1668
+- proto: CrateParticleDecelerators
+  entities:
+  - uid: 6995
+    components:
+    - type: Transform
+      pos: -7.5,28.5
+      parent: 1668
 - proto: CrowbarRed
   entities:
   - uid: 515
@@ -19342,8 +19294,6 @@ entities:
     - type: Transform
       pos: 11.5,-4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: DeathsquadPDA
   entities:
   - uid: 298
@@ -20869,11 +20819,6 @@ entities:
     - type: Transform
       pos: 1.5,1.5
       parent: 1668
-  - uid: 816
-    components:
-    - type: Transform
-      pos: -6.5,-9.5
-      parent: 1668
   - uid: 3840
     components:
     - type: Transform
@@ -21402,6 +21347,13 @@ entities:
     - type: Transform
       pos: 0.5503339,-25.316061
       parent: 1668
+- proto: FoodPoppy
+  entities:
+  - uid: 6605
+    components:
+    - type: Transform
+      pos: -11.182456,6.7149878
+      parent: 1668
 - proto: FoodSaladColeslaw
   entities:
   - uid: 6937
@@ -21441,30 +21393,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 12.5,-5.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#990000FF'
-- proto: GasMinerNitrogenStation
+- proto: GasMinerNitrogenStationLarge
   entities:
-  - uid: 4715
+  - uid: 3466
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 25.5,-29.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
-- proto: GasMinerOxygenStation
+- proto: GasMinerOxygenStationLarge
   entities:
-  - uid: 4703
+  - uid: 3797
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 19.5,-29.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: GasMixer
   entities:
   - uid: 5070
@@ -21473,8 +21419,10 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 21.5,-30.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
+    - type: GasMixer
+      inletTwoConcentration: 0.22000003
+      inletOneConcentration: 0.78
+      targetPressure: 4500
 - proto: GasPassiveVent
   entities:
   - uid: 3430
@@ -21483,32 +21431,24 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 25.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 5399
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 24.5,-28.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 6141
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -21.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 6312
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 20.5,-28.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: GasPipeBend
   entities:
   - uid: 3660
@@ -21882,6 +21822,26 @@ entities:
       parent: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
+- proto: GasPipeSensorDistribution
+  entities:
+  - uid: 3883
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-30.5
+      parent: 1668
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+- proto: GasPipeSensorWaste
+  entities:
+  - uid: 3860
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 19.5,-31.5
+      parent: 1668
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeStraight
   entities:
   - uid: 3664
@@ -22024,14 +21984,6 @@ entities:
       parent: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5391
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 19.5,-31.5
-      parent: 1668
-    - type: AtmosPipeColor
-      color: '#990000FF'
   - uid: 5394
     components:
     - type: Transform
@@ -22040,14 +21992,6 @@ entities:
       parent: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 5401
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 19.5,-30.5
-      parent: 1668
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 5402
     components:
     - type: Transform
@@ -24864,46 +24808,34 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 20.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3577
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -14.5,4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3659
     components:
     - type: Transform
       pos: -14.5,6.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3662
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -16.5,4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 6655
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 12.5,-7.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 6705
     components:
     - type: Transform
       pos: 16.5,-31.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#990000FF'
   - uid: 6706
@@ -24911,8 +24843,6 @@ entities:
     - type: Transform
       pos: 17.5,-31.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasPressurePump
@@ -24923,16 +24853,14 @@ entities:
       rot: 3.141592653589793 rad
       pos: -14.5,5.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 5395
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 20.5,-30.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
+    - type: GasPressurePump
+      targetPressure: 385
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5400
@@ -24941,8 +24869,8 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 20.5,-31.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
+    - type: GasPressurePump
+      targetPressure: 4500
     - type: AtmosPipeColor
       color: '#990000FF'
 - proto: GasThermoMachineFreezer
@@ -24952,8 +24880,6 @@ entities:
     - type: Transform
       pos: 13.5,-4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: GasVentPump
   entities:
   - uid: 3687
@@ -24962,39 +24888,29 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -14.5,9.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3688
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -21.5,8.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3689
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -24.5,6.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 3694
     components:
     - type: Transform
       pos: -21.5,14.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 5474
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 16.5,-26.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5475
@@ -25002,8 +24918,6 @@ entities:
     - type: Transform
       pos: 20.5,-24.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5476
@@ -25012,8 +24926,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 26.5,-25.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5505
@@ -25022,8 +24934,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 20.5,-20.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5506
@@ -25031,8 +24941,6 @@ entities:
     - type: Transform
       pos: 25.5,-17.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5507
@@ -25041,8 +24949,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 32.5,-18.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5521
@@ -25050,8 +24956,6 @@ entities:
     - type: Transform
       pos: 7.5,-17.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5538
@@ -25059,8 +24963,6 @@ entities:
     - type: Transform
       pos: -8.5,-17.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5551
@@ -25069,8 +24971,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-26.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5554
@@ -25079,8 +24979,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 10.5,-22.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5565
@@ -25089,8 +24987,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -11.5,-22.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5566
@@ -25099,8 +24995,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-16.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5573
@@ -25109,8 +25003,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-12.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5581
@@ -25119,8 +25011,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-11.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5583
@@ -25129,8 +25019,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -5.5,-11.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5658
@@ -25138,8 +25026,6 @@ entities:
     - type: Transform
       pos: -30.5,4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5659
@@ -25148,8 +25034,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -30.5,-2.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5663
@@ -25158,8 +25042,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -22.5,-1.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5664
@@ -25168,8 +25050,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -20.5,-3.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5666
@@ -25177,8 +25057,6 @@ entities:
     - type: Transform
       pos: -6.5,0.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5667
@@ -25186,8 +25064,6 @@ entities:
     - type: Transform
       pos: 5.5,0.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5669
@@ -25196,8 +25072,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -3.5,0.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5670
@@ -25206,8 +25080,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,-5.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5671
@@ -25215,8 +25087,6 @@ entities:
     - type: Transform
       pos: -1.5,4.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5696
@@ -25225,8 +25095,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -1.5,12.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5697
@@ -25235,8 +25103,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -6.5,9.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5712
@@ -25245,8 +25111,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,27.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5713
@@ -25255,8 +25119,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,23.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5714
@@ -25265,8 +25127,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -9.5,16.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5742
@@ -25274,8 +25134,6 @@ entities:
     - type: Transform
       pos: 10.5,13.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5743
@@ -25284,8 +25142,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 28.5,11.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5744
@@ -25293,8 +25149,6 @@ entities:
     - type: Transform
       pos: 18.5,13.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5756
@@ -25302,8 +25156,6 @@ entities:
     - type: Transform
       pos: 11.5,24.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5763
@@ -25311,8 +25163,6 @@ entities:
     - type: Transform
       pos: 28.5,19.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5779
@@ -25321,8 +25171,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 12.5,-1.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5780
@@ -25331,8 +25179,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 19.5,-0.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5806
@@ -25341,8 +25187,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5814
@@ -25351,8 +25195,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 3.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5824
@@ -25361,8 +25203,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -12.5,-31.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5825
@@ -25371,8 +25211,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 12.5,-31.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 5887
@@ -25381,8 +25219,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -14.5,-23.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6003
@@ -25391,8 +25227,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -19.5,-25.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6227
@@ -25401,8 +25235,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -16.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6334
@@ -25410,8 +25242,6 @@ entities:
     - type: Transform
       pos: -0.5,-36.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 6335
@@ -25420,8 +25250,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-41.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
     - type: AtmosPipeColor
       color: '#0055CCFF'
 - proto: GasVentScrubber
@@ -25432,8 +25260,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.5,-32.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: GeneratorBasic15kW
   entities:
   - uid: 5176
@@ -26895,6 +26721,11 @@ entities:
     - type: Transform
       pos: 21.5,-23.5
       parent: 1668
+  - uid: 5079
+    components:
+    - type: Transform
+      pos: 20.5,6.5
+      parent: 1668
   - uid: 5114
     components:
     - type: Transform
@@ -27154,6 +26985,21 @@ entities:
     - type: Transform
       pos: 5.5,6.5
       parent: 1668
+  - uid: 6986
+    components:
+    - type: Transform
+      pos: 22.5,6.5
+      parent: 1668
+  - uid: 6992
+    components:
+    - type: Transform
+      pos: 30.5,6.5
+      parent: 1668
+  - uid: 6993
+    components:
+    - type: Transform
+      pos: 32.5,6.5
+      parent: 1668
 - proto: GroundTobacco
   entities:
   - uid: 3755
@@ -27238,16 +27084,6 @@ entities:
     - type: Transform
       pos: 3.5,0.5
       parent: 1668
-  - uid: 3797
-    components:
-    - type: Transform
-      pos: -20.5,-2.5
-      parent: 1668
-  - uid: 3860
-    components:
-    - type: Transform
-      pos: -22.5,-2.5
-      parent: 1668
   - uid: 3863
     components:
     - type: Transform
@@ -27265,6 +27101,16 @@ entities:
     - type: Transform
       pos: 32.5,-14.5
       parent: 1668
+  - uid: 3885
+    components:
+    - type: Transform
+      pos: -22.5,-2.5
+      parent: 1668
+  - uid: 3902
+    components:
+    - type: Transform
+      pos: -20.5,-2.5
+      parent: 1668
 - proto: HighSecDoor
   entities:
   - uid: 565
@@ -27400,6 +27246,53 @@ entities:
     - type: Transform
       pos: -18.379215,8.381029
       parent: 1668
+- proto: LockableButtonCentcomm
+  entities:
+  - uid: 3149
+    components:
+    - type: Transform
+      pos: 14.5,32.5
+      parent: 1668
+    - type: DeviceLinkSource
+      linkedPorts:
+        4476:
+        - Pressed: Toggle
+        6492:
+        - Pressed: Toggle
+        6397:
+        - Pressed: Toggle
+        3431:
+        - Pressed: Toggle
+  - uid: 4477
+    components:
+    - type: Transform
+      pos: 4.5,32.5
+      parent: 1668
+    - type: DeviceLinkSource
+      linkedPorts:
+        2946:
+        - Pressed: Toggle
+        5058:
+        - Pressed: Toggle
+        6314:
+        - Pressed: Toggle
+        3420:
+        - Pressed: Toggle
+- proto: LockableButtonCommand
+  entities:
+  - uid: 4475
+    components:
+    - type: Transform
+      pos: -16.5,-4.5
+      parent: 1668
+    - type: DeviceLinkSource
+      linkedPorts:
+        3789:
+        - Pressed: Toggle
+        3788:
+        - Pressed: Toggle
+        3787:
+        - Pressed: Toggle
 - proto: LockerAtmosphericsFilledHardsuit
   entities:
   - uid: 3790
@@ -27416,7 +27309,7 @@ entities:
       parent: 1668
 - proto: LockerChemistryFilled
   entities:
-  - uid: 2876
+  - uid: 3986
     components:
     - type: Transform
       pos: 5.5,-13.5
@@ -27511,6 +27404,13 @@ entities:
           showEnts: False
           occludes: True
           ent: null
+- proto: LockerHeadOfPersonnelFilled
+  entities:
+  - uid: 327
+    components:
+    - type: Transform
+      pos: -10.5,-5.5
+      parent: 1668
 - proto: LockerHeadOfSecurityFilled
   entities:
   - uid: 3153
@@ -27520,10 +27420,10 @@ entities:
       parent: 1668
 - proto: LockerQuarterMasterFilled
   entities:
-  - uid: 2235
+  - uid: 5080
     components:
     - type: Transform
-      pos: -8.5,19.5
+      pos: -10.5,-7.5
       parent: 1668
 - proto: LockerResearchDirectorFilled
   entities:
@@ -27532,6 +27432,13 @@ entities:
     - type: Transform
       pos: -11.5,-3.5
       parent: 1668
+- proto: LockerSalvageSpecialistFilledHardsuit
+  entities:
+  - uid: 3987
+    components:
+    - type: Transform
+      pos: -8.5,19.5
+      parent: 1668
 - proto: LockerSecurityFilled
   entities:
   - uid: 511
@@ -27549,6 +27456,22 @@ entities:
     - type: Transform
       pos: -6.5,-10.5
       parent: 1668
+- proto: LockerWallMedicalDoctorFilled
+  entities:
+  - uid: 6775
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,-15.5
+      parent: 1668
+- proto: LockerWallMedicalFilled
+  entities:
+  - uid: 2013
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 16.5,-7.5
+      parent: 1668
 - proto: LockerWardenFilled
   entities:
   - uid: 2713
@@ -27639,6 +27562,13 @@ entities:
     - type: Transform
       pos: 9.5,-7.5
       parent: 1668
+- proto: MedkitAdvancedFilled
+  entities:
+  - uid: 6610
+    components:
+    - type: Transform
+      pos: 14.536912,-7.5898757
+      parent: 1668
 - proto: MedkitBruteFilled
   entities:
   - uid: 622
@@ -27655,11 +27585,6 @@ entities:
       parent: 1668
 - proto: MedkitFilled
   entities:
-  - uid: 620
-    components:
-    - type: Transform
-      pos: 14.516341,-7.5759134
-      parent: 1668
   - uid: 1454
     components:
     - type: Transform
@@ -27724,8 +27649,6 @@ entities:
     - type: Transform
       pos: 25.5,-28.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: NTFlag
   entities:
   - uid: 1190
@@ -27764,6 +27687,13 @@ entities:
     - type: Transform
       pos: 9.5,-5.5
       parent: 1668
+- proto: OreProcessorIndustrial
+  entities:
+  - uid: 6978
+    components:
+    - type: Transform
+      pos: -5.5,29.5
+      parent: 1668
 - proto: OxygenCanister
   entities:
   - uid: 5415
@@ -27771,15 +27701,18 @@ entities:
     - type: Transform
       pos: 19.5,-28.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
   - uid: 6719
     components:
     - type: Transform
       pos: 12.5,-7.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
+- proto: OxygenTankFilled
+  entities:
+  - uid: 3901
+    components:
+    - type: Transform
+      pos: -12.625682,-7.0710163
+      parent: 1668
 - proto: PaintingAmogusTriptych
   entities:
   - uid: 3766
@@ -27926,6 +27859,84 @@ entities:
     - type: Transform
       pos: 17.5,-28.5
       parent: 1668
+- proto: PlasmaReinforcedWindowDirectional
+  entities:
+  - uid: 5934
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-28.5
+      parent: 1668
+  - uid: 6004
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 24.5,-29.5
+      parent: 1668
+  - uid: 6103
+    components:
+    - type: Transform
+      pos: 24.5,-29.5
+      parent: 1668
+  - uid: 6180
+    components:
+    - type: Transform
+      pos: 25.5,-29.5
+      parent: 1668
+  - uid: 6181
+    components:
+    - type: Transform
+      pos: 19.5,-29.5
+      parent: 1668
+  - uid: 6231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-29.5
+      parent: 1668
+  - uid: 6232
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 20.5,-28.5
+      parent: 1668
+  - uid: 6277
+    components:
+    - type: Transform
+      pos: 20.5,-29.5
+      parent: 1668
+- proto: PlasmaWindoorSecureSecurityLocked
+  entities:
+  - uid: 5410
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,22.5
+      parent: 1668
+  - uid: 5411
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,25.5
+      parent: 1668
+  - uid: 5416
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,28.5
+      parent: 1668
+  - uid: 5417
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 4.5,25.5
+      parent: 1668
+  - uid: 5423
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,28.5
+      parent: 1668
 - proto: PlasticFlapsAirtightClear
   entities:
   - uid: 1590
@@ -30431,13 +30442,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -22.5,-28.5
       parent: 1668
-- proto: Protolathe
-  entities:
-  - uid: 5311
-    components:
-    - type: Transform
-      pos: 24.5,-26.5
-      parent: 1668
 - proto: Rack
   entities:
   - uid: 1662
@@ -30840,9 +30844,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -19.5,-31.5
       parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 5907
 - proto: ReinforcedPlasmaWindow
   entities:
   - uid: 2791
@@ -30865,6 +30866,36 @@ entities:
     - type: Transform
       pos: 13.5,30.5
       parent: 1668
+  - uid: 3990
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,21.5
+      parent: 1668
+  - uid: 4179
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,24.5
+      parent: 1668
+  - uid: 4180
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,24.5
+      parent: 1668
+  - uid: 4251
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 14.5,27.5
+      parent: 1668
+  - uid: 4361
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 4.5,27.5
+      parent: 1668
   - uid: 5108
     components:
     - type: Transform
@@ -31885,21 +31916,6 @@ entities:
     - type: Transform
       pos: 8.5,16.5
       parent: 1668
-  - uid: 2556
-    components:
-    - type: Transform
-      pos: 14.5,21.5
-      parent: 1668
-  - uid: 2755
-    components:
-    - type: Transform
-      pos: 4.5,24.5
-      parent: 1668
-  - uid: 2771
-    components:
-    - type: Transform
-      pos: 14.5,24.5
-      parent: 1668
   - uid: 2777
     components:
     - type: Transform
@@ -31940,16 +31956,6 @@ entities:
     - type: Transform
       pos: 11.5,29.5
       parent: 1668
-  - uid: 2858
-    components:
-    - type: Transform
-      pos: 14.5,27.5
-      parent: 1668
-  - uid: 2859
-    components:
-    - type: Transform
-      pos: 4.5,27.5
-      parent: 1668
   - uid: 2906
     components:
     - type: Transform
@@ -32273,6 +32279,11 @@ entities:
     - type: Transform
       pos: 15.5,-22.5
       parent: 1668
+  - uid: 5321
+    components:
+    - type: Transform
+      pos: 30.5,6.5
+      parent: 1668
   - uid: 5333
     components:
     - type: Transform
@@ -32288,6 +32299,21 @@ entities:
     - type: Transform
       pos: 19.5,-23.5
       parent: 1668
+  - uid: 5386
+    components:
+    - type: Transform
+      pos: 22.5,6.5
+      parent: 1668
+  - uid: 5391
+    components:
+    - type: Transform
+      pos: 20.5,6.5
+      parent: 1668
+  - uid: 5397
+    components:
+    - type: Transform
+      pos: 32.5,6.5
+      parent: 1668
   - uid: 5880
     components:
     - type: Transform
@@ -32521,6 +32547,24 @@ entities:
       parent: 1668
 - proto: Screen
   entities:
+  - uid: 4479
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -32.5,-0.5
+      parent: 1668
+  - uid: 4480
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -21.5,-25.5
+      parent: 1668
+  - uid: 5311
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 3.5,-30.5
+      parent: 1668
   - uid: 6988
     components:
     - type: Transform
@@ -32531,6 +32575,47 @@ entities:
     - type: Transform
       pos: 33.5,-4.5
       parent: 1668
+  - uid: 6996
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -14.5,26.5
+      parent: 1668
+  - uid: 6997
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 5.5,-15.5
+      parent: 1668
+  - uid: 6998
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -6.5,-15.5
+      parent: 1668
+  - uid: 6999
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,-44.5
+      parent: 1668
+  - uid: 7000
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-30.5
+      parent: 1668
+  - uid: 7001
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -16.5,-9.5
+      parent: 1668
+  - uid: 7002
+    components:
+    - type: Transform
+      pos: -11.5,13.5
+      parent: 1668
 - proto: SecurityTechFab
   entities:
   - uid: 2874
@@ -32574,6 +32659,28 @@ entities:
     - type: Transform
       pos: 19.5,-23.5
       parent: 1668
+- proto: ShuttersWindowCentralCommand
+  entities:
+  - uid: 5058
+    components:
+    - type: Transform
+      pos: 5.5,30.5
+      parent: 1668
+  - uid: 6314
+    components:
+    - type: Transform
+      pos: 6.5,30.5
+      parent: 1668
+  - uid: 6397
+    components:
+    - type: Transform
+      pos: 12.5,30.5
+      parent: 1668
+  - uid: 6492
+    components:
+    - type: Transform
+      pos: 13.5,30.5
+      parent: 1668
 - proto: SignalButton
   entities:
   - uid: 789
@@ -32637,45 +32744,6 @@ entities:
         - Pressed: Toggle
         2146:
         - Pressed: Toggle
-  - uid: 2920
-    components:
-    - type: Transform
-      pos: -16.5,-4.5
-      parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        3789:
-        - Pressed: Toggle
-        3788:
-        - Pressed: Toggle
-        3787:
-        - Pressed: Toggle
-  - uid: 2927
-    components:
-    - type: MetaData
-      name: le funny admin button
-    - type: Transform
-      pos: 4.5,32.5
-      parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2926:
-        - Pressed: Toggle
-        2925:
-        - Pressed: Toggle
-  - uid: 2928
-    components:
-    - type: MetaData
-      name: le funny admin button
-    - type: Transform
-      pos: 14.5,32.5
-      parent: 1668
-    - type: DeviceLinkSource
-      linkedPorts:
-        2886:
-        - Pressed: Toggle
-        2790:
-        - Pressed: Toggle
   - uid: 5242
     components:
     - type: Transform
@@ -32734,7 +32802,7 @@ entities:
     - type: Transform
       pos: 8.5,4.5
       parent: 1668
-- proto: SignAtmosMinsky
+- proto: SignAtmos
   entities:
   - uid: 6888
     components:
@@ -32748,8 +32816,14 @@ entities:
     - type: Transform
       pos: -4.5,13.5
       parent: 1668
-- proto: SignChemistry1
+- proto: SignChem
   entities:
+  - uid: 4478
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 5.5,-6.5
+      parent: 1668
   - uid: 6764
     components:
     - type: Transform
@@ -32910,11 +32984,6 @@ entities:
       parent: 1668
 - proto: SignMedical
   entities:
-  - uid: 736
-    components:
-    - type: Transform
-      pos: 5.5,-6.5
-      parent: 1668
   - uid: 6762
     components:
     - type: Transform
@@ -33016,6 +33085,18 @@ entities:
     - type: Transform
       pos: -2.5,-38.5
       parent: 1668
+- proto: SignSecureMedRed
+  entities:
+  - uid: 3988
+    components:
+    - type: Transform
+      pos: 7.5,32.5
+      parent: 1668
+  - uid: 6615
+    components:
+    - type: Transform
+      pos: 11.5,32.5
+      parent: 1668
 - proto: SignSecureSmall
   entities:
   - uid: 3868
@@ -33055,16 +33136,6 @@ entities:
     - type: Transform
       pos: -17.5,-25.5
       parent: 1668
-  - uid: 6231
-    components:
-    - type: Transform
-      pos: -32.5,-0.5
-      parent: 1668
-  - uid: 6232
-    components:
-    - type: Transform
-      pos: -21.5,-25.5
-      parent: 1668
 - proto: Sink
   entities:
   - uid: 3425
@@ -33099,24 +33170,24 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 19.5,-24.5
       parent: 1668
-- proto: SMESBasic
+- proto: SMESAdvanced
   entities:
-  - uid: 327
+  - uid: 4703
     components:
     - type: Transform
       pos: 27.5,-30.5
       parent: 1668
-  - uid: 5078
+  - uid: 4715
     components:
     - type: Transform
       pos: 22.5,-17.5
       parent: 1668
-  - uid: 5079
+  - uid: 4977
     components:
     - type: Transform
       pos: 22.5,-15.5
       parent: 1668
-  - uid: 5080
+  - uid: 4992
     components:
     - type: Transform
       pos: 22.5,-16.5
@@ -33135,7 +33206,7 @@ entities:
     - type: Transform
       pos: -20.47715,15.560694
       parent: 1668
-- proto: soda_dispenser
+- proto: SodaDispenser
   entities:
   - uid: 4427
     components:
@@ -33148,13 +33219,6 @@ entities:
     - type: Transform
       pos: 7.5,-21.5
       parent: 1668
-- proto: SpawnVehicleSecway
-  entities:
-  - uid: 2823
-    components:
-    - type: Transform
-      pos: 11.5,25.5
-      parent: 1668
 - proto: SS13Memorial
   entities:
   - uid: 486
@@ -33171,17 +33235,17 @@ entities:
       parent: 1668
 - proto: StatueVenusBlue
   entities:
-  - uid: 4180
+  - uid: 3463
     components:
     - type: Transform
-      pos: -20.5,-6.5
+      pos: 31.5,7.5
       parent: 1668
 - proto: StatueVenusRed
   entities:
-  - uid: 4179
+  - uid: 5078
     components:
     - type: Transform
-      pos: -21.5,-6.5
+      pos: 21.5,7.5
       parent: 1668
 - proto: Stool
   entities:
@@ -33218,8 +33282,6 @@ entities:
     - type: Transform
       pos: -14.5,6.5
       parent: 1668
-    - type: AtmosDevice
-      joinedGrid: 1668
 - proto: Stunbaton
   entities:
   - uid: 2746
@@ -33279,30 +33341,18 @@ entities:
     - type: Transform
       pos: -16.5,-29.5
       parent: 1668
-- proto: SuitStorageBasic
+- proto: SuitStorageCaptain
   entities:
-  - uid: 1185
-    components:
-    - type: Transform
-      pos: -10.5,-7.5
-      parent: 1668
-  - uid: 1188
+  - uid: 3768
     components:
     - type: Transform
-      pos: -10.5,-5.5
+      pos: -11.5,4.5
       parent: 1668
-  - uid: 3431
+  - uid: 5146
     components:
     - type: Transform
       pos: -10.5,-6.5
       parent: 1668
-- proto: SuitStorageCaptain
-  entities:
-  - uid: 3768
-    components:
-    - type: Transform
-      pos: -11.5,4.5
-      parent: 1668
 - proto: SuitStorageCE
   entities:
   - uid: 6490
@@ -33331,6 +33381,13 @@ entities:
     - type: Transform
       pos: -10.5,-3.5
       parent: 1668
+- proto: SuitStorageSec
+  entities:
+  - uid: 3465
+    components:
+    - type: Transform
+      pos: -6.5,-9.5
+      parent: 1668
 - proto: SurveillanceCameraCommand
   entities:
   - uid: 6817
@@ -35390,9 +35447,9 @@ entities:
     - type: Transform
       pos: 7.5,21.5
       parent: 1668
-- proto: ToiletEmpty
+- proto: ToiletGoldenEmpty
   entities:
-  - uid: 3420
+  - uid: 5257
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
@@ -35433,6 +35490,11 @@ entities:
     - type: Transform
       pos: -12.035681,6.6117244
       parent: 1668
+  - uid: 6985
+    components:
+    - type: Transform
+      pos: -19.5,-6.5
+      parent: 1668
 - proto: ToyFigurineCargoTech
   entities:
   - uid: 6897
@@ -35468,6 +35530,11 @@ entities:
     - type: Transform
       pos: 27.221512,-23.216656
       parent: 1668
+  - uid: 6982
+    components:
+    - type: Transform
+      pos: -21.5,-7.5
+      parent: 1668
 - proto: ToyFigurineChiefMedicalOfficer
   entities:
   - uid: 6900
@@ -35475,6 +35542,11 @@ entities:
     - type: Transform
       pos: 13.343676,-12.106804
       parent: 1668
+  - uid: 6980
+    components:
+    - type: Transform
+      pos: -20.5,-7.5
+      parent: 1668
 - proto: ToyFigurineClown
   entities:
   - uid: 6907
@@ -35484,10 +35556,10 @@ entities:
       parent: 1668
 - proto: ToyFigurineDetective
   entities:
-  - uid: 2145
+  - uid: 6508
     components:
     - type: Transform
-      pos: 8.249651,23.679073
+      pos: 4.5357866,22.481915
       parent: 1668
 - proto: ToyFigurineEngineer
   entities:
@@ -35496,6 +35568,13 @@ entities:
     - type: Transform
       pos: 26.955887,-23.01353
       parent: 1668
+- proto: ToyFigurineFootsoldier
+  entities:
+  - uid: 6510
+    components:
+    - type: Transform
+      pos: 3.5129395,25.168112
+      parent: 1668
 - proto: ToyFigurineGreytider
   entities:
   - uid: 2142
@@ -35503,6 +35582,11 @@ entities:
     - type: Transform
       pos: -1.5147417,19.684673
       parent: 1668
+  - uid: 6509
+    components:
+    - type: Transform
+      pos: 16.351696,22.083393
+      parent: 1668
 - proto: ToyFigurineHamlet
   entities:
   - uid: 6503
@@ -35517,6 +35601,11 @@ entities:
     - type: Transform
       pos: 2.714695,-2.0789247
       parent: 1668
+  - uid: 6981
+    components:
+    - type: Transform
+      pos: -19.5,-5.5
+      parent: 1668
 - proto: ToyFigurineHeadOfSecurity
   entities:
   - uid: 592
@@ -35524,6 +35613,11 @@ entities:
     - type: Transform
       pos: 8.675076,17.818161
       parent: 1668
+  - uid: 6983
+    components:
+    - type: Transform
+      pos: -19.5,-7.5
+      parent: 1668
 - proto: ToyFigurineJanitor
   entities:
   - uid: 6905
@@ -35566,6 +35660,27 @@ entities:
     - type: Transform
       pos: 0.78786826,-28.113647
       parent: 1668
+- proto: ToyFigurineNukie
+  entities:
+  - uid: 6512
+    components:
+    - type: Transform
+      pos: 3.1101613,28.112556
+      parent: 1668
+- proto: ToyFigurineNukieCommander
+  entities:
+  - uid: 6511
+    components:
+    - type: Transform
+      pos: 2.8740501,28.668112
+      parent: 1668
+- proto: ToyFigurineNukieElite
+  entities:
+  - uid: 6507
+    components:
+    - type: Transform
+      pos: 2.3733406,28.503387
+      parent: 1668
 - proto: ToyFigurineParamedic
   entities:
   - uid: 3427
@@ -35587,6 +35702,11 @@ entities:
     - type: Transform
       pos: -15.016072,14.885906
       parent: 1668
+  - uid: 6979
+    components:
+    - type: Transform
+      pos: -20.5,-5.5
+      parent: 1668
 - proto: ToyFigurineRatKing
   entities:
   - uid: 6906
@@ -35601,6 +35721,11 @@ entities:
     - type: Transform
       pos: -32.494865,6.5819006
       parent: 1668
+  - uid: 6984
+    components:
+    - type: Transform
+      pos: -21.5,-5.5
+      parent: 1668
 - proto: ToyFigurineSalvage
   entities:
   - uid: 6895
@@ -35620,6 +35745,13 @@ entities:
     - type: Transform
       pos: 27.445951,-11.38564
       parent: 1668
+- proto: ToyFigurineThief
+  entities:
+  - uid: 6513
+    components:
+    - type: Transform
+      pos: 15.358348,28.515333
+      parent: 1668
 - proto: ToyFigurineWarden
   entities:
   - uid: 6894
@@ -35627,6 +35759,20 @@ entities:
     - type: Transform
       pos: 4.3459373,19.764877
       parent: 1668
+- proto: ToyFigurineWizard
+  entities:
+  - uid: 6514
+    components:
+    - type: Transform
+      pos: 16.312458,25.32646
+      parent: 1668
+- proto: ToyOwlman
+  entities:
+  - uid: 3464
+    components:
+    - type: Transform
+      pos: -24.5,-6.5
+      parent: 1668
 - proto: ToyRubberDuck
   entities:
   - uid: 3423
@@ -35732,13 +35878,6 @@ entities:
         - Left: Forward
         - Right: Reverse
         - Middle: Off
-- proto: VehicleKeySecway
-  entities:
-  - uid: 3149
-    components:
-    - type: Transform
-      pos: 10.387553,25.600338
-      parent: 1668
 - proto: VendingMachineAmmo
   entities:
   - uid: 2821
@@ -36661,11 +36800,6 @@ entities:
     - type: Transform
       pos: 19.5,6.5
       parent: 1668
-  - uid: 349
-    components:
-    - type: Transform
-      pos: 22.5,6.5
-      parent: 1668
   - uid: 350
     components:
     - type: Transform
@@ -36686,16 +36820,6 @@ entities:
     - type: Transform
       pos: 29.5,6.5
       parent: 1668
-  - uid: 354
-    components:
-    - type: Transform
-      pos: 30.5,6.5
-      parent: 1668
-  - uid: 356
-    components:
-    - type: Transform
-      pos: 32.5,6.5
-      parent: 1668
   - uid: 357
     components:
     - type: Transform
@@ -37374,11 +37498,6 @@ entities:
     - type: Transform
       pos: -13.5,10.5
       parent: 1668
-  - uid: 898
-    components:
-    - type: Transform
-      pos: 20.5,6.5
-      parent: 1668
   - uid: 1080
     components:
     - type: Transform
@@ -41651,6 +41770,20 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,10.5
       parent: 1668
+- proto: WindoorSecureChemistryLocked
+  entities:
+  - uid: 5398
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-12.5
+      parent: 1668
+  - uid: 5401
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 2.5,-11.5
+      parent: 1668
 - proto: WindoorSecureCommandLocked
   entities:
   - uid: 4230
@@ -41685,18 +41818,6 @@ entities:
       parent: 1668
 - proto: WindoorSecureMedicalLocked
   entities:
-  - uid: 732
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-11.5
-      parent: 1668
-  - uid: 734
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 2.5,-12.5
-      parent: 1668
   - uid: 1198
     components:
     - type: Transform
@@ -41735,51 +41856,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-12.5
       parent: 1668
-  - uid: 2558
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,22.5
-      parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6649
-  - uid: 2776
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,25.5
-      parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 3906
-  - uid: 2832
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,25.5
-      parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 3723
-  - uid: 2862
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 4.5,28.5
-      parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 6602
-  - uid: 2863
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 14.5,28.5
-      parent: 1668
-    - type: DeviceLinkSink
-      links:
-      - 3870
 - proto: WindowReinforcedDirectional
   entities:
   - uid: 485
@@ -41972,44 +42048,6 @@ entities:
     - type: Transform
       pos: 4.5,-17.5
       parent: 1668
-  - uid: 5386
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-28.5
-      parent: 1668
-  - uid: 5397
-    components:
-    - type: Transform
-      pos: 19.5,-29.5
-      parent: 1668
-  - uid: 5398
-    components:
-    - type: Transform
-      pos: 20.5,-29.5
-      parent: 1668
-  - uid: 5410
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 20.5,-29.5
-      parent: 1668
-  - uid: 5411
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-28.5
-      parent: 1668
-  - uid: 5416
-    components:
-    - type: Transform
-      pos: 24.5,-29.5
-      parent: 1668
-  - uid: 5417
-    components:
-    - type: Transform
-      pos: 25.5,-29.5
-      parent: 1668
   - uid: 5453
     components:
     - type: Transform
@@ -42034,12 +42072,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -18.5,-32.5
       parent: 1668
-  - uid: 6314
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 24.5,-29.5
-      parent: 1668
   - uid: 6787
     components:
     - type: Transform
@@ -42053,11 +42085,4 @@ entities:
     - type: Transform
       pos: 9.506623,-4.4162817
       parent: 1668
-- proto: YellowOxygenTankFilled
-  entities:
-  - uid: 3901
-    components:
-    - type: Transform
-      pos: -12.625682,-7.0710163
-      parent: 1668
 ...

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/access.yml
new file mode 100644 (file)
index 0000000..9304880
--- /dev/null
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/access.yml
@@ -0,0 +1,23 @@
+#Blast door
+
+- type: entity
+  parent: BlastDoor
+  id: BlastDoorCentralCommand
+  suffix: Central Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+
+#Window shutters
+
+- type: entity
+  parent: ShuttersWindow
+  id: ShuttersWindowCentralCommand
+  suffix: Central Command, Locked
+  components:
+  - type: ContainerFill
+    containers:
+      board: [ DoorElectronicsCentralCommand ]
+  - type: AccessReader
+    containerAccessProvider: board

diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
index 7239dd7eed5a89c9b1e4600ab4feece0fbe64bb2..ef25bea8c8faff8e0dbd7724d34906418e185ffc 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml
@@ -5,6 +5,7 @@
   description: This one says 'BLAST DONGER'.
   components:
   - type: AccessReader
+    containerAccessProvider: board
   - type: Sprite
     sprite: Structures/Doors/Shutters/blastdoor.rsi
     layers:

diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
index 19233ba69a50b54b555df8ae34ab781d75497ff8..556d3d430a546a4a0dc032df3e1705887afee726 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml
@@ -494,6 +494,14 @@
   - type: AccessReader
     access: [["Atmospherics"]]
 
+- type: entity
+  id: LockableButtonCentcomm
+  suffix: CentComm
+  parent: LockableButton
+  components:
+  - type: AccessReader
+    access: [["CentralCommand"]]
+
 # button frames
 
 - type: entity