Fix rxbzz (Rxup#618)

* Update NT-CC-SRV-013.yml * extra fix
nomad0260 · May 20, 2024 · 386df62 · 386df62
1 parent 48414a0
commit 386df62
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 88 deletions.
diff --git a/Resources/Maps/Backmen/Grids/NT-CC-SRV-013.yml b/Resources/Maps/Backmen/Grids/NT-CC-SRV-013.yml
@@ -168,15 +168,60 @@ entities:
     - type: Transform
       pos: -1.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 411
     components:
     - type: Transform
       pos: -2.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
+- proto: AirlockEGovLocked
+  entities:
+  - uid: 72
+    components:
+    - type: Transform
+      pos: -3.5,-0.5
+      parent: 1
+  - uid: 145
+    components:
+    - type: Transform
+      pos: 4.5,1.5
+      parent: 1
+  - uid: 146
+    components:
+    - type: Transform
+      pos: 3.5,-3.5
+      parent: 1
+  - uid: 148
+    components:
+    - type: Transform
+      pos: 2.5,-3.5
+      parent: 1
+  - uid: 162
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 1
+  - uid: 163
+    components:
+    - type: Transform
+      pos: -2.5,-3.5
+      parent: 1
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 4.5,-0.5
+      parent: 1
+  - uid: 168
+    components:
+    - type: Transform
+      pos: -3.5,1.5
+      parent: 1
+- proto: AirlockEGovLockedCommand
+  entities:
+  - uid: 147
+    components:
+    - type: Transform
+      pos: 0.5,3.5
+      parent: 1
 - proto: AirlockExternalGlassShuttleLocked
   entities:
   - uid: 139
@@ -1470,16 +1515,12 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 382
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 5.5,-2.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasPipeBend
   entities:
   - uid: 349
@@ -1756,56 +1797,42 @@ entities:
       rot: 3.141592653589793 rad
       pos: -1.5,-7.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasVentPump
   entities:
   - uid: 369
     components:
     - type: Transform
       pos: -1.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 370
     components:
     - type: Transform
       pos: 2.5,4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 371
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: -0.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 372
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-1.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 3.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 374
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: -2.5,-6.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasVentScrubber
   entities:
   - uid: 375
@@ -1814,46 +1841,34 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -0.5,-0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 376
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
       pos: 1.5,-0.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 377
     components:
     - type: Transform
       pos: -0.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 378
     components:
     - type: Transform
       pos: 1.5,5.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 379
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: -2.5,-4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 380
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 3.5,-4.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GeneratorRTG
   entities:
   - uid: 155
@@ -1966,53 +1981,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,-4.5
       parent: 1
-- proto: HighSecCentComLocked
-  entities:
-  - uid: 145
-    components:
-    - type: Transform
-      pos: -1.5,-3.5
-      parent: 1
-  - uid: 146
-    components:
-    - type: Transform
-      pos: 2.5,-3.5
-      parent: 1
-  - uid: 147
-    components:
-    - type: Transform
-      pos: -3.5,-0.5
-      parent: 1
-  - uid: 148
-    components:
-    - type: Transform
-      pos: -3.5,1.5
-      parent: 1
-  - uid: 162
-    components:
-    - type: Transform
-      pos: -2.5,-3.5
-      parent: 1
-  - uid: 163
-    components:
-    - type: Transform
-      pos: 0.5,3.5
-      parent: 1
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 4.5,1.5
-      parent: 1
-  - uid: 168
-    components:
-    - type: Transform
-      pos: 4.5,-0.5
-      parent: 1
-  - uid: 169
-    components:
-    - type: Transform
-      pos: 3.5,-3.5
-      parent: 1
 - proto: Holoprojector
   entities:
   - uid: 445
@@ -2061,11 +2029,6 @@ entities:
     - type: Transform
       pos: 2.5,2.5
       parent: 1
-  - uid: 477
-    components:
-    - type: Transform
-      pos: 0.5,5.5
-      parent: 1
   - uid: 478
     components:
     - type: Transform

diff --git a/Resources/Prototypes/Backmen/specforces.yml b/Resources/Prototypes/Backmen/specforces.yml
@@ -26,8 +26,6 @@
   announcementTitle: spec-forces-system-RXBZZ-title
   maxRolesAmount: 8
   guaranteedSpawn:
-    - id: SpawnMobHumanSFOfficer
-      prob: 0.5
     - id: SpawnMobHumanRXBZZLeader
     - id: SpawnMobHumanRXBZZFlamer
   specForceSpawn: