]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
projects / space-station-14.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c327ad3)
[Map] Bagel Update 17.5 (#15555)
authorEmisse <99158783+Emisse@users.noreply.github.com>
Thu, 20 Apr 2023 03:27:34 +0000 (21:27 -0600)
committerGitHub <noreply@github.com>
Thu, 20 Apr 2023 03:27:34 +0000 (21:27 -0600)
Resources/Maps/bagel.yml patch | blob | history

diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml
index 39e86a5e440faadb9658b4501d823b6312f8252a..71b7d0f9949785720cecde8928f24dfe15b3991d 100644 (file)
--- a/Resources/Maps/bagel.yml
+++ b/Resources/Maps/bagel.yml
@@ -504,7 +504,7 @@ entities:
         tiles: XgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABPAAAAXgAAAF4AAABeAAAAXgAAAF4AAABbAAADWwAAAV4AAABeAAAAXgAAAE4AAABeAAAAMQAAADEAAAAxAAAAMQAAAFsAAABeAAAATgAAAF4AAABeAAAAXgAAAEMAAAheAAAAXgAAAF4AAABOAAAAXgAAADEAAAAxAAAAMQAAADEAAABbAAACXgAAAE4AAABeAAAAXgAAAF4AAABDAAAAXQAAAF4AAABeAAAATgAAAF4AAAAxAAAAMQAAADEAAAAxAAAAWwAAAF4AAABOAAAAXgAAAF4AAABbAAACXgAAAF0AAABeAAAAXgAAAE4AAABeAAAAMQAAADEAAAAxAAAAMQAAAFsAAAFeAAAATgAAAF4AAABeAAAAXgAAAF4AAABdAAAAXgAAAF4AAABOAAAAXgAAAFsAAAFbAAAAWwAAAFsAAAJcAAACXgAAAE4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABPAAAAXgAAAF4AAABeAAAAXgAAABYAAAFeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAEQAAAFEAAADRAAAAEQAAAFEAAACOAAAAUQAAAJEAAACRAAAAEQAAANEAAAARAAAAUQAAAJEAAACRAAAAUQAAANEAAADRAAAA0QAAAJEAAAARAAAAzgAAAJEAAADRAAAAEQAAANEAAADRAAAA0QAAANEAAACRAAAA0QAAAJEAAABRAAAAkQAAAJEAAAARAAAAkQAAAM4AAAARAAAA0QAAANEAAACRAAAA0QAAAJEAAADRAAAAUQAAAJEAAADRAAAAl4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAAEQAAANEAAAAXgAAAEQAAAJeAAAARAAAAEQAAAFEAAAARAAAAUQAAANEAAABRAAAAkQAAAAWAAADRAAAA0QAAANEAAAARAAAAUQAAANEAAAAFgAAAUQAAAJEAAAARAAAAkQAAANEAAACRAAAA0QAAANEAAADFgAAAV4AAABEAAACRAAAAEQAAABEAAAARAAAAF4AAABEAAAARAAAAEQAAANEAAABRAAAA0QAAAJEAAAARAAAABYAAAFEAAAARAAAAkQAAANEAAABRAAAAkQAAANeAAAAXgAAAF4AAABeAAAARAAAAl4AAABEAAABXgAAAF4AAABeAAAAXgAAAF4AAABEAAACXgAAAF4AAAA4AAACFgAAAkQAAABEAAABRAAAA0QAAABEAAABRAAAAkQAAAFEAAACRAAAA14AAAAWAAAAFgAAABYAAAJeAAAARAAAAw==\r
       -2,-1:\r
         ind: -2,-1\r
-        tiles: XgAAAEQAAANEAAACRAAAAkQAAABEAAADRAAAAkQAAAFEAAADRAAAABYAAAAWAAABFgAAAxYAAAFeAAAARAAAA0QAAABEAAAARAAAAUQAAANEAAABRAAAAEQAAABEAAABRAAAAEQAAABEAAADXgAAAF4AAABeAAAAXgAAAEQAAABEAAADRAAAAUQAAABEAAAARAAAA0QAAAJEAAABRAAAAUQAAANEAAABRAAAAl4AAAAWAAAAFgAAAV4AAABEAAADRAAAAUQAAAJEAAADXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAA0QAAANEAAABFgAAARYAAABeAAAARAAAAUQAAABEAAACRAAAAl4AAAAWAAACFgAAAxYAAABeAAAARAAAAkQAAANEAAAAXgAAAF4AAABeAAAAXgAAAEQAAAJEAAABRAAAAV4AAABeAAAAFgAAARYAAAAWAAACXgAAAF4AAABEAAACRAAAAl4AAAAWAAABFgAAAV4AAABEAAADRAAAAUQAAAIWAAAAFgAAAxYAAAIWAAADFgAAAxYAAAMWAAAARAAAAEQAAAFEAAAAFgAAAxYAAABeAAAARAAAAUQAAAJEAAACXgAAAF4AAAAWAAACFgAAABYAAANeAAAAXgAAAEQAAAFEAAACXgAAAF4AAABeAAAAXgAAAEQAAAJEAAACRAAAAkQAAAFeAAAAFgAAABYAAAAWAAADXgAAAEQAAAFEAAAARAAAAF4AAABRAAACUQAAA14AAABEAAACRAAAAUQAAANEAAAAXgAAAF4AAAAWAAAAXgAAAF4AAABEAAAARAAAAkQAAAJEAAABUQAAA1EAAAFeAAAARAAAAEQAAABEAAACRAAAA0QAAAJEAAACRAAAA0QAAAJEAAADRAAAAkQAAAJEAAABXgAAABYAAAAWAAABXgAAAEQAAABeAAAARAAAAkQAAAFEAAADRAAAA0QAAABEAAAARAAAAkQAAABEAAAARAAAAV4AAABEAAAARAAAA1EAAANEAAACFgAAAEQAAAJEAAABRAAAAUQAAABEAAACRAAAAUQAAANEAAACRAAAAEQAAAAWAAABRAAAA0QAAABeAAAARAAAAV4AAABEAAACRAAAAkQAAABEAAADRAAAAUQAAANEAAACRAAAAkQAAABEAAADXgAAABYAAAEWAAACXgAAADgAAAFeAAAAPAAAAEQAAAJEAAADXgAAABYAAAJeAAAARAAAAEQAAABeAAAAFgAAA14AAABeAAAAXgAAAF4AAABEAAACPAAAADwAAABEAAACOgAAADoAAAA6AAAAOgAAADoAAABEAAACFgAAARYAAAIWAAADFgAAAl4AAABEAAABRAAAAQ==\r
+        tiles: XgAAAEQAAANEAAACRAAAAkQAAABEAAADRAAAAkQAAAFEAAADRAAAABYAAAAWAAABFgAAAxYAAAFeAAAARAAAA0QAAABEAAAARAAAAUQAAANEAAABRAAAAEQAAABEAAABRAAAAEQAAABEAAADXgAAAF4AAABeAAAAXgAAAEQAAABEAAADRAAAAUQAAABEAAAARAAAA0QAAAJEAAABRAAAAUQAAANEAAABRAAAAl4AAAAWAAAAFgAAAV4AAABEAAADRAAAAUQAAAJEAAADXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAA0QAAANEAAABFgAAARYAAABeAAAARAAAAUQAAABEAAACRAAAAl4AAAAWAAACFgAAAxYAAABeAAAARAAAAkQAAANEAAAAXgAAAF4AAABeAAAAXgAAAEQAAAJEAAABRAAAAV4AAABeAAAAFgAAARYAAAAWAAACXgAAAF4AAABEAAACRAAAAl4AAAAWAAABFgAAAV4AAABEAAADRAAAAUQAAAJeAAAAFgAAAxYAAAIWAAADFgAAAxYAAANeAAAARAAAAEQAAAFEAAAAFgAAAxYAAABeAAAARAAAAUQAAAJEAAACXgAAAF4AAAAWAAACFgAAABYAAANeAAAAXgAAAEQAAAFEAAACXgAAAF4AAABeAAAAXgAAAEQAAAJEAAACRAAAAkQAAAFeAAAAFgAAABYAAAAWAAADXgAAAEQAAAFEAAAARAAAAF4AAABRAAACUQAAA14AAABEAAACRAAAAUQAAANEAAAAXgAAAF4AAAAWAAAAXgAAAF4AAABEAAAARAAAAkQAAAJEAAABUQAAA1EAAAFeAAAARAAAAEQAAABEAAACRAAAA0QAAAJEAAACRAAAA0QAAAJEAAADRAAAAkQAAAJEAAABXgAAABYAAAAWAAABXgAAAEQAAABeAAAARAAAAkQAAAFEAAADRAAAA0QAAABEAAAARAAAAkQAAABEAAAARAAAAV4AAABEAAAARAAAA1EAAANEAAACFgAAAEQAAAJEAAABRAAAAUQAAABEAAACRAAAAUQAAANEAAACRAAAAEQAAAAWAAABRAAAA0QAAABeAAAARAAAAV4AAABEAAACRAAAAkQAAABEAAADRAAAAUQAAANEAAACRAAAAkQAAABEAAADXgAAABYAAAEWAAACXgAAADgAAAFeAAAAPAAAAEQAAAJEAAADXgAAABYAAAJeAAAARAAAAEQAAABeAAAAFgAAA14AAABeAAAAXgAAAF4AAABEAAACPAAAADwAAABEAAACOgAAADoAAAA6AAAAOgAAADoAAABEAAACFgAAARYAAAIWAAADFgAAAl4AAABEAAABRAAAAQ==\r
       -2,0:\r
         ind: -2,0\r
         tiles: PAAAADwAAABEAAACOgAAADoAAAA6AAAAOgAAADoAAABEAAACWwAAAVsAAAJbAAABWwAAAF4AAABEAAAARAAAADwAAAA8AAAARAAAADoAAAA6AAAAOgAAADoAAAA6AAAARAAAAFsAAANbAAADWwAAAlsAAABeAAAARAAAAkQAAAE8AAAAPAAAAEQAAAA6AAAAOgAAADoAAAA6AAAAOgAAAEQAAAMWAAACFgAAABYAAAIWAAACXgAAAEQAAAFEAAADXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAARAAAARYAAAIWAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAATwAAAEQAAAAWAAAAFgAAAU8AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAE4AAABOAAAATgAAAF4AAABEAAACXgAAAF4AAABeAAAAXgAAAF4AAABPAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAOAAAAEQAAANEAAAARAAAA0QAAAJEAAADRAAAA0QAAAFEAAABRAAAA0QAAANEAAACRAAAA0QAAAFEAAAARAAAAkQAAANEAAABRAAAAUQAAAFEAAABRAAAAEQAAANEAAADRAAAAkQAAABEAAACRAAAAEQAAAFEAAABRAAAAUQAAAFEAAACRAAAAUQAAAJEAAAARAAAAkQAAABEAAACRAAAAkQAAAJEAAADRAAAAkQAAAJEAAAARAAAAkQAAAJEAAABRAAAAhYAAANeAAAAXgAAAF4AAABeAAAARAAAAkQAAANEAAACXgAAAF4AAABeAAAAXgAAAF4AAABeAAAAXgAAADgAAAJEAAACFgAAAF4AAAAXAAACWwAAA1sAAAJbAAACWwAAA1sAAAIXAAAAXgAAAF0AAABdAAAAXQAAAF4AAABEAAADDwAAABYAAAJeAAAAFwAAAlsAAANbAAAAWwAAAFsAAAFbAAABFwAAAV4AAAAAAAAAAAAAAAAAAABeAAAARAAAAw8AAABEAAABXgAAABcAAAFbAAAAWwAAAFsAAANbAAADWwAAABcAAAJeAAAAXQAAAF0AAABdAAAAXgAAAEQAAAEPAAAAFgAAAF4AAAAXAAABWwAAAFsAAAFbAAAAWwAAAFsAAAEXAAADXgAAAF4AAABeAAAAXgAAAF4AAABEAAADRAAAARYAAANeAAAAFwAAAFsAAAJbAAABWwAAAVsAAABbAAACFwAAAl4AAAAWAAABFgAAAxYAAABeAAAARAAAAQ==\r
@@ -9111,7 +9111,7 @@ entities:
     type: GridAtmosphere\r
   - type: OccluderTree\r
   - type: Shuttle\r
-  - nextUpdate: 238.9200166\r
+  - nextUpdate: 1208.4511172\r
     type: GridPathfinding\r
   - nextUpdate: 1\r
     type: SpreaderGrid\r
@@ -9201,6 +9201,14 @@ entities:
     pos: -20.5,-12.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 6972\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 73\r
   type: MedkitToxinFilled\r
   components:\r
@@ -9257,9 +9265,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 82\r
-  type: Table\r
+  type: Grille\r
   components:\r
-  - pos: -23.5,-9.5\r
+  - pos: -29.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 83\r
@@ -9544,9 +9552,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 6972\r
-      - port: Pressed\r
-        uid: 1488\r
+        uid: 1471\r
     type: SignalReceiver\r
 - uid: 124\r
   type: ReinforcedWindow\r
@@ -9695,6 +9701,8 @@ entities:
 - uid: 144\r
   type: AirlockBrigGlassLocked\r
   components:\r
+  - name: Security Lobby\r
+    type: MetaData\r
   - pos: -21.5,-18.5\r
     parent: 60\r
     type: Transform\r
@@ -9746,7 +9754,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 6972\r
+        uid: 1489\r
     type: SignalReceiver\r
 - uid: 149\r
   type: ReinforcedWindow\r
@@ -9768,6 +9776,14 @@ entities:
     pos: -20.5,-9.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 1488\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 152\r
   type: WallReinforced\r
   components:\r
@@ -10005,7 +10021,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1488\r
+        uid: 1471\r
     type: SignalReceiver\r
 - uid: 186\r
   type: WallReinforced\r
@@ -10032,7 +10048,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 6972\r
+        uid: 1489\r
     type: SignalReceiver\r
 - uid: 189\r
   type: WallReinforced\r
@@ -10400,6 +10416,14 @@ entities:
     pos: -32.5,-6.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 1468\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 231\r
   type: ReinforcedWindow\r
   components:\r
@@ -10485,9 +10509,19 @@ entities:
     pos: -32.5,-12.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 1486\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 244\r
   type: AirlockBrigGlassLocked\r
   components:\r
+  - name: Brig\r
+    type: MetaData\r
   - pos: -27.5,-17.5\r
     parent: 60\r
     type: Transform\r
@@ -10665,6 +10699,14 @@ entities:
     pos: -32.5,-9.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 1485\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 269\r
   type: ReinforcedWindow\r
   components:\r
@@ -10954,6 +10996,8 @@ entities:
 - uid: 307\r
   type: AirlockBrigGlassLocked\r
   components:\r
+  - name: Security Lobby\r
+    type: MetaData\r
   - pos: -21.5,-20.5\r
     parent: 60\r
     type: Transform\r
@@ -12873,7 +12917,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1485\r
+        uid: 8521\r
     type: SignalReceiver\r
 - uid: 553\r
   type: WallReinforced\r
@@ -14806,6 +14850,8 @@ entities:
 - uid: 827\r
   type: HighSecCommandLocked\r
   components:\r
+  - name: Gravity Generator\r
+    type: MetaData\r
   - pos: -13.5,3.5\r
     parent: 60\r
     type: Transform\r
@@ -14914,6 +14960,14 @@ entities:
     pos: -20.5,-6.5\r
     parent: 60\r
     type: Transform\r
+  - inputs:\r
+      Open: []\r
+      Close: []\r
+      Toggle:\r
+      - port: Timer\r
+        uid: 6971\r
+      AutoClose: []\r
+    type: SignalReceiver\r
 - uid: 844\r
   type: Grille\r
   components:\r
@@ -14928,12 +14982,20 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 846\r
-  type: WindoorArmoryLocked\r
+  type: SignalButton\r
   components:\r
-  - rot: 1.5707963267948966 rad\r
-    pos: -29.5,-9.5\r
+  - name: Cell 5 Shutters\r
+    type: MetaData\r
+  - pos: -27.5,-11.5\r
     parent: 60\r
     type: Transform\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 6206\r
+      - port: Toggle\r
+        uid: 6733\r
+    type: SignalTransmitter\r
 - uid: 847\r
   type: WallSolid\r
   components:\r
@@ -18168,9 +18230,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1195\r
-  type: MopBucket\r
+  type: WaterTankHighCapacity\r
   components:\r
-  - pos: -2.5178943,-28.468857\r
+  - pos: -2.5,-28.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1196\r
@@ -20308,15 +20370,11 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1461\r
-  type: WeaponCapacitorRecharger\r
+  type: SpawnPointWarden\r
   components:\r
-  - pos: -25.5,-7.5\r
+  - pos: -26.5,-9.5\r
     parent: 60\r
     type: Transform\r
-  - canCollide: False\r
-    type: Physics\r
-  - fixtures: []\r
-    type: Fixtures\r
 - uid: 1462\r
   type: ClosetL3SecurityFilled\r
   components:\r
@@ -20342,9 +20400,10 @@ entities:
       - 0\r
     type: EntityStorage\r
 - uid: 1463\r
-  type: SpawnMobMcGriff\r
+  type: Table\r
   components:\r
-  - pos: -27.5,-10.5\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -25.5,-7.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1464\r
@@ -20360,30 +20419,31 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1466\r
-  type: WindoorSecure\r
+  type: WindoorArmoryLocked\r
   components:\r
   - rot: -1.5707963267948966 rad\r
-    pos: -29.5,-9.5\r
+    pos: -23.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1467\r
   type: AirlockArmoryGlassLocked\r
   components:\r
+  - name: Warden's Office\r
+    type: MetaData\r
   - pos: -26.5,-6.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1468\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
   - pos: -32.5,-5.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
-      - port: Toggle\r
-        uid: 6746\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 6203\r
+        uid: 230\r
     type: SignalTransmitter\r
 - uid: 1469\r
   type: ReinforcedWindow\r
@@ -20399,16 +20459,24 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1471\r
-  type: Table\r
+  type: SignalButton\r
   components:\r
-  - pos: -29.5,-9.5\r
+  - name: Cell 1 Shutters\r
+    type: MetaData\r
+  - pos: -25.5,-10.5\r
     parent: 60\r
     type: Transform\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 123\r
+      - port: Toggle\r
+        uid: 185\r
+    type: SignalTransmitter\r
 - uid: 1472\r
-  type: WindoorArmoryLocked\r
+  type: TableReinforced\r
   components:\r
-  - rot: -1.5707963267948966 rad\r
-    pos: -23.5,-9.5\r
+  - pos: -23.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1473\r
@@ -20492,30 +20560,28 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1485\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
-  - pos: -20.5,-11.5\r
+  - pos: -32.5,-8.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 8002\r
-      - port: Toggle\r
-        uid: 552\r
+        uid: 268\r
     type: SignalTransmitter\r
 - uid: 1486\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
   - pos: -32.5,-11.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
-      - port: Toggle\r
-        uid: 6206\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 6733\r
+        uid: 243\r
     type: SignalTransmitter\r
 - uid: 1487\r
   type: AirlockBrigGlassLocked\r
@@ -20526,24 +20592,32 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1488\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
   - pos: -20.5,-8.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 185\r
-      - port: Toggle\r
-        uid: 123\r
+        uid: 151\r
     type: SignalTransmitter\r
 - uid: 1489\r
-  type: Table\r
+  type: SignalButton\r
   components:\r
+  - name: Med Cell Shutters\r
+    type: MetaData\r
   - pos: -25.5,-7.5\r
     parent: 60\r
     type: Transform\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 188\r
+      - port: Toggle\r
+        uid: 148\r
+    type: SignalTransmitter\r
 - uid: 1490\r
   type: SpawnPointSecurityCadet\r
   components:\r
@@ -21022,7 +21096,7 @@ entities:
 - uid: 1556\r
   type: Wrench\r
   components:\r
-  - pos: -25.456688,-11.384605\r
+  - pos: -27.514538,-11.083304\r
     parent: 60\r
     type: Transform\r
 - uid: 1557\r
@@ -21280,9 +21354,9 @@ entities:
   - enabled: True\r
     type: AmbientSound\r
 - uid: 1593\r
-  type: AirlockSecurityGlassLocked\r
+  type: AirlockDetectiveGlassLocked\r
   components:\r
-  - name: detective office\r
+  - name: Detective's Office\r
     type: MetaData\r
   - pos: -24.5,-25.5\r
     parent: 60\r
@@ -21607,9 +21681,9 @@ entities:
       stash: !type:ContainerSlot {}\r
     type: ContainerContainer\r
 - uid: 1632\r
-  type: CrowbarRed\r
+  type: DrinkShinyFlask\r
   components:\r
-  - pos: -25.487938,-11.52523\r
+  - pos: -25.315727,-7.4930058\r
     parent: 60\r
     type: Transform\r
 - uid: 1633\r
@@ -22450,7 +22524,7 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1732\r
-  type: Table\r
+  type: ComputerCriminalRecords\r
   components:\r
   - pos: -27.5,-8.5\r
     parent: 60\r
@@ -22512,7 +22586,8 @@ entities:
 - uid: 1741\r
   type: Table\r
   components:\r
-  - pos: -27.5,-7.5\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -25.5,-10.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1742\r
@@ -22998,9 +23073,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1796\r
-  type: ClusterBangFull\r
+  type: ComputerStationRecords\r
   components:\r
-  - pos: -27.50749,-8.399244\r
+  - pos: -25.5,-8.5\r
     parent: 60\r
     type: Transform\r
 - uid: 1797\r
@@ -23178,7 +23253,7 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 1821\r
-  type: TableReinforced\r
+  type: GunSafeShotgunKammerer\r
   components:\r
   - pos: -28.5,0.5\r
     parent: 60\r
@@ -23302,8 +23377,10 @@ entities:
   - bodyType: Static\r
     type: Physics\r
 - uid: 1835\r
-  type: AirlockSecurityLocked\r
+  type: AirlockSecurityGlassLocked\r
   components:\r
+  - name: Security Locker Room\r
+    type: MetaData\r
   - pos: -31.5,-16.5\r
     parent: 60\r
     type: Transform\r
@@ -24021,7 +24098,7 @@ entities:
 - uid: 1911\r
   type: BoxFolderRed\r
   components:\r
-  - pos: -20.476631,-16.393358\r
+  - pos: -20.313402,-16.57666\r
     parent: 60\r
     type: Transform\r
 - uid: 1912\r
@@ -24582,6 +24659,8 @@ entities:
 - uid: 1970\r
   type: AirlockSecurityGlassLocked\r
   components:\r
+  - name: Brig Med\r
+    type: MetaData\r
   - pos: -20.5,-3.5\r
     parent: 60\r
     type: Transform\r
@@ -25975,9 +26054,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 2133\r
-  type: ChairOfficeDark\r
+  type: AcousticGuitarInstrument\r
   components:\r
-  - pos: -26.5,-10.5\r
+  - pos: -25.453274,-10.973929\r
     parent: 60\r
     type: Transform\r
 - uid: 2134\r
@@ -26346,9 +26425,9 @@ entities:
   - unspawnedCount: 12\r
     type: BallisticAmmoProvider\r
 - uid: 2179\r
-  type: WeaponDisabler\r
+  type: DogBed\r
   components:\r
-  - pos: -27.5802,-8.028072\r
+  - pos: -24.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 2180\r
@@ -33414,9 +33493,9 @@ entities:
   - bodyType: Static\r
     type: Physics\r
 - uid: 3070\r
-  type: TableReinforced\r
+  type: ChairOfficeDark\r
   components:\r
-  - pos: -25.5,-11.5\r
+  - pos: -26.5,-10.5\r
     parent: 60\r
     type: Transform\r
 - uid: 3071\r
@@ -33426,10 +33505,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 3072\r
-  type: ComputerStationRecords\r
+  type: WeaponCapacitorRecharger\r
   components:\r
-  - rot: 3.141592653589793 rad\r
-    pos: -27.5,-11.5\r
+  - pos: -20.5,-16.5\r
     parent: 60\r
     type: Transform\r
 - uid: 3073\r
@@ -34477,6 +34555,8 @@ entities:
 - uid: 3212\r
   type: GasPressurePump\r
   components:\r
+  - name: Air Intake\r
+    type: MetaData\r
   - rot: 1.5707963267948966 rad\r
     pos: 47.5,-13.5\r
     parent: 60\r
@@ -52309,10 +52389,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 5567\r
-  type: ComputerSurveillanceCameraMonitor\r
+  type: Multitool\r
   components:\r
-  - rot: -1.5707963267948966 rad\r
-    pos: -25.5,-10.5\r
+  - pos: -27.675102,-7.45018\r
     parent: 60\r
     type: Transform\r
 - uid: 5568\r
@@ -55344,9 +55423,9 @@ entities:
   - bodyType: Static\r
     type: Physics\r
 - uid: 5932\r
-  type: AcousticGuitarInstrument\r
+  type: PowerCellRecharger\r
   components:\r
-  - pos: -25.723814,-11.4154625\r
+  - pos: -23.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 5933\r
@@ -56444,9 +56523,9 @@ entities:
   - bodyType: Static\r
     type: Physics\r
 - uid: 6038\r
-  type: BoxZiptie\r
+  type: LockerWardenFilled\r
   components:\r
-  - pos: -27.595825,-7.2780724\r
+  - pos: -28.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 6039\r
@@ -56470,15 +56549,16 @@ entities:
   - bodyType: Static\r
     type: Physics\r
 - uid: 6041\r
-  type: Multitool\r
+  type: CrowbarRed\r
   components:\r
-  - pos: -25.489801,-11.618805\r
+  - pos: -27.436413,-11.161429\r
     parent: 60\r
     type: Transform\r
 - uid: 6042\r
-  type: SpawnPointWarden\r
+  type: Table\r
   components:\r
-  - pos: -26.5,-9.5\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -27.5,-7.5\r
     parent: 60\r
     type: Transform\r
 - uid: 6043\r
@@ -57779,7 +57859,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1468\r
+        uid: 6467\r
     type: SignalReceiver\r
 - uid: 6204\r
   type: CableHV\r
@@ -57809,7 +57889,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1486\r
+        uid: 846\r
     type: SignalReceiver\r
 - uid: 6207\r
   type: WallReinforced\r
@@ -59177,9 +59257,10 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 6387\r
-  type: DrinkShinyFlask\r
+  type: ComputerSurveillanceCameraMonitor\r
   components:\r
-  - pos: -27.408325,-7.5280724\r
+  - rot: 3.141592653589793 rad\r
+    pos: -26.5,-11.5\r
     parent: 60\r
     type: Transform\r
 - uid: 6388\r
@@ -59758,29 +59839,20 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 6467\r
-  type: LockerWardenFilled\r
+  type: SignalButton\r
   components:\r
-  - pos: -25.5,-8.5\r
+  - name: Cell 3 Shutters\r
+    type: MetaData\r
+  - pos: -27.5,-7.5\r
     parent: 60\r
     type: Transform\r
-  - air:\r
-      volume: 200\r
-      immutable: False\r
-      temperature: 293.1496\r
-      moles:\r
-      - 1.6495836\r
-      - 6.2055764\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-      - 0\r
-    type: EntityStorage\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 6203\r
+      - port: Toggle\r
+        uid: 6746\r
+    type: SignalTransmitter\r
 - uid: 6468\r
   type: RandomPosterLegit\r
   components:\r
@@ -61445,7 +61517,7 @@ entities:
   type: Poweredlight\r
   components:\r
   - rot: -1.5707963267948966 rad\r
-    pos: -2.5,-27.5\r
+    pos: -2.5,-26.5\r
     parent: 60\r
     type: Transform\r
   - powerLoad: 0\r
@@ -61592,13 +61664,12 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1486\r
+        uid: 846\r
     type: SignalReceiver\r
 - uid: 6734\r
-  type: WindoorSecure\r
+  type: FirelockGlass\r
   components:\r
-  - rot: 1.5707963267948966 rad\r
-    pos: -23.5,-9.5\r
+  - pos: -23.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 6735\r
@@ -61687,7 +61758,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1468\r
+        uid: 6467\r
     type: SignalReceiver\r
 - uid: 6747\r
   type: CableApcExtension\r
@@ -62086,7 +62157,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 6971\r
+        uid: 7032\r
     type: SignalReceiver\r
 - uid: 6797\r
   type: WallReinforced\r
@@ -63272,32 +63343,28 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 6971\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
-  - pos: -32.5,-8.5\r
+  - pos: -20.5,-5.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
-      - port: Toggle\r
-        uid: 6796\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 7045\r
+        uid: 843\r
     type: SignalTransmitter\r
 - uid: 6972\r
-  type: SignalButton\r
+  type: BrigTimer\r
   components:\r
-  - pos: -20.5,-5.5\r
+  - pos: -20.5,-11.5\r
     parent: 60\r
     type: Transform\r
   - outputs:\r
-      Pressed:\r
-      - port: Toggle\r
-        uid: 148\r
+      Start: []\r
+      Timer:\r
       - port: Toggle\r
-        uid: 188\r
-      - port: Toggle\r
-        uid: 123\r
+        uid: 72\r
     type: SignalTransmitter\r
 - uid: 6973\r
   type: GasPassiveVent\r
@@ -63709,15 +63776,20 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 7032\r
-  type: PowerCellRecharger\r
+  type: SignalButton\r
   components:\r
-  - pos: -23.5,-9.5\r
+  - name: Cell 4 Shutters\r
+    type: MetaData\r
+  - pos: -27.5,-10.5\r
     parent: 60\r
     type: Transform\r
-  - canCollide: False\r
-    type: Physics\r
-  - fixtures: []\r
-    type: Fixtures\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 7045\r
+      - port: Toggle\r
+        uid: 6796\r
+    type: SignalTransmitter\r
 - uid: 7033\r
   type: GasPipeBend\r
   components:\r
@@ -63827,7 +63899,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 6971\r
+        uid: 7032\r
     type: SignalReceiver\r
 - uid: 7046\r
   type: WallReinforced\r
@@ -69339,16 +69411,15 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 7792\r
-  type: DogBed\r
+  type: SpawnMobMcGriff\r
   components:\r
-  - pos: -27.5,-10.5\r
+  - pos: -24.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 7793\r
-  type: ComputerCriminalRecords\r
+  type: BoxFlashbang\r
   components:\r
-  - rot: 3.141592653589793 rad\r
-    pos: -26.5,-11.5\r
+  - pos: -25.348616,-10.845438\r
     parent: 60\r
     type: Transform\r
 - uid: 7794\r
@@ -70080,6 +70151,8 @@ entities:
 - uid: 7901\r
   type: AirlockBrigGlassLocked\r
   components:\r
+  - name: Brig\r
+    type: MetaData\r
   - pos: -25.5,-17.5\r
     parent: 60\r
     type: Transform\r
@@ -70745,7 +70818,7 @@ entities:
       Close: []\r
       Toggle:\r
       - port: Pressed\r
-        uid: 1485\r
+        uid: 8521\r
     type: SignalReceiver\r
 - uid: 8003\r
   type: CableHV\r
@@ -72586,6 +72659,8 @@ entities:
 - uid: 8242\r
   type: AirlockSecurityLocked\r
   components:\r
+  - name: Security Locker Room\r
+    type: MetaData\r
   - pos: -31.5,-19.5\r
     parent: 60\r
     type: Transform\r
@@ -74355,9 +74430,9 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 8502\r
-  type: FirelockGlass\r
+  type: ReinforcedWindow\r
   components:\r
-  - pos: -23.5,-9.5\r
+  - pos: -29.5,-9.5\r
     parent: 60\r
     type: Transform\r
 - uid: 8503\r
@@ -74469,11 +74544,20 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 8521\r
-  type: FirelockGlass\r
+  type: SignalButton\r
   components:\r
-  - pos: -29.5,-9.5\r
+  - name: Cell 2 Shutters\r
+    type: MetaData\r
+  - pos: -25.5,-11.5\r
     parent: 60\r
     type: Transform\r
+  - outputs:\r
+      Pressed:\r
+      - port: Toggle\r
+        uid: 8002\r
+      - port: Toggle\r
+        uid: 552\r
+    type: SignalTransmitter\r
 - uid: 8522\r
   type: AirlockExternalGlassLocked\r
   components:\r
@@ -76874,13 +76958,23 @@ entities:
     parent: 60\r
     type: Transform\r
 - uid: 8889\r
-  type: VendingMachineWallMedical\r
+  type: FireAlarm\r
   components:\r
-  - flags: SessionSpecific\r
-    type: MetaData\r
-  - pos: 46.5,-23.5\r
+  - rot: -1.5707963267948966 rad\r
+    pos: 46.5,-23.5\r
     parent: 60\r
     type: Transform\r
+  - devices:\r
+    - 5466\r
+    - 5486\r
+    - 5488\r
+    - 94\r
+    - 8968\r
+    - 21579\r
+    - 8961\r
+    - 3110\r
+    - 18825\r
+    type: DeviceList\r
 - uid: 8890\r
   type: VendingMachineMedical\r
   components:\r
@@ -77818,6 +77912,8 @@ entities:
 - uid: 9016\r
   type: GasFilter\r
   components:\r
+  - name: Exhalation Filter\r
+    type: MetaData\r
   - pos: 49.5,-14.5\r
     parent: 60\r
     type: Transform\r
@@ -85141,9 +85237,9 @@ entities:
   - enabled: True\r
     type: AmbientSound\r
 - uid: 9989\r
-  type: AirlockMaintSecLocked\r
+  type: AirlockMaintDetectiveLocked\r
   components:\r
-  - name: detective office\r
+  - name: Detective's Office\r
     type: MetaData\r
   - pos: -23.5,-31.5\r
     parent: 60\r
@@ -158015,6 +158111,13 @@ entities:
     pos: 41.5,18.5\r
     parent: 60\r
     type: Transform\r
+- uid: 19863\r
+  type: Table\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -27.5,-11.5\r
+    parent: 60\r
+    type: Transform\r
 - uid: 19864\r
   type: CableApcExtension\r
   components:\r
@@ -158027,6 +158130,100 @@ entities:
   - pos: 25.5,1.5\r
     parent: 60\r
     type: Transform\r
+- uid: 19866\r
+  type: Table\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -27.5,-10.5\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19867\r
+  type: Table\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -25.5,-11.5\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19868\r
+  type: AirAlarm\r
+  components:\r
+  - rot: 1.5707963267948966 rad\r
+    pos: 42.5,-11.5\r
+    parent: 60\r
+    type: Transform\r
+  - devices:\r
+    - 21579\r
+    - 8961\r
+    - 3110\r
+    - 7030\r
+    - 12623\r
+    - 5404\r
+    type: DeviceList\r
+- uid: 19869\r
+  type: BoxZiptie\r
+  components:\r
+  - pos: -27.52049,-10.939188\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19870\r
+  type: RemoteSignaller\r
+  components:\r
+  - pos: -27.27049,-7.363508\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19871\r
+  type: ExtinguisherCabinetFilled\r
+  components:\r
+  - pos: 42.5,-10.5\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19872\r
+  type: FloorDrain\r
+  components:\r
+  - pos: 40.5,-5.5\r
+    parent: 60\r
+    type: Transform\r
+  - fixtures: []\r
+    type: Fixtures\r
+- uid: 19873\r
+  type: MopBucket\r
+  components:\r
+  - pos: -3.4904737,-27.546751\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19874\r
+  type: FloorDrain\r
+  components:\r
+  - pos: -3.5,-26.5\r
+    parent: 60\r
+    type: Transform\r
+  - fixtures: []\r
+    type: Fixtures\r
+- uid: 19875\r
+  type: RadioHandheld\r
+  components:\r
+  - pos: 42.07676,-1.444672\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19876\r
+  type: SinkWide\r
+  components:\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -2.5,-27.5\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19877\r
+  type: TrackingImplanter\r
+  components:\r
+  - pos: -25.516588,-10.33648\r
+    parent: 60\r
+    type: Transform\r
+- uid: 19878\r
+  type: TrackingImplanter\r
+  components:\r
+  - pos: -25.516588,-10.33648\r
+    parent: 60\r
+    type: Transform\r
 - uid: 19889\r
   type: SignSecureMed\r
   components:\r
@@ -165480,12 +165677,6 @@ entities:
   - pos: 41.5,26.5\r
     parent: 60\r
     type: Transform\r
-- uid: 21010\r
-  type: WeaponShotgunKammerer\r
-  components:\r
-  - pos: -28.48172,0.6445763\r
-    parent: 60\r
-    type: Transform\r
 - uid: 21011\r
   type: BoxBeanbag\r
   components:\r
@@ -165550,18 +165741,6 @@ entities:
   - pos: -28.497345,1.6445763\r
     parent: 60\r
     type: Transform\r
-- uid: 21022\r
-  type: WeaponShotgunKammerer\r
-  components:\r
-  - pos: -28.466095,1.0352013\r
-    parent: 60\r
-    type: Transform\r
-- uid: 21023\r
-  type: WeaponShotgunKammerer\r
-  components:\r
-  - pos: -28.466095,0.8477013\r
-    parent: 60\r
-    type: Transform\r
 - uid: 21024\r
   type: ComputerCargoShuttle\r
   components:\r
@@ -170376,23 +170555,17 @@ entities:
     parent: 60\r
     type: Transform\r
   - devices:\r
-    - 12623\r
-    - 5404\r
-    - 114\r
-    - 337\r
-    - invalid\r
-    - 5831\r
-    - 5439\r
-    - 3123\r
-    - 2878\r
-    - 21581\r
-    - 4336\r
-    - 4154\r
-    - 7030\r
+    - 5466\r
+    - 5486\r
+    - 5488\r
+    - 94\r
+    - 8968\r
     - 21579\r
     - 8961\r
     - 3110\r
     - 18825\r
+    - 5831\r
+    - 5439\r
     type: DeviceList\r
 - uid: 21579\r
   type: FirelockGlass\r
@@ -172050,12 +172223,13 @@ entities:
   - devices:\r
     - 5565\r
     - 5562\r
-    - 8521\r
-    - 8502\r
+    - invalid\r
+    - invalid\r
     - 5563\r
     - 8466\r
     - 21733\r
     - 21734\r
+    - 6734\r
     type: DeviceList\r
 - uid: 21737\r
   type: ExtinguisherCabinetFilled\r
@@ -172081,12 +172255,6 @@ entities:
   - pos: 36.5,-32.5\r
     parent: 60\r
     type: Transform\r
-- uid: 21741\r
-  type: ExtinguisherCabinetFilled\r
-  components:\r
-  - pos: 42.5,-11.5\r
-    parent: 60\r
-    type: Transform\r
 - uid: 21742\r
   type: DisposalPipe\r
   components:\r
@@ -184171,13 +184339,10 @@ entities:
     parent: 60\r
     type: Transform\r
   - devices:\r
-    - 7030\r
     - 21579\r
     - 8961\r
     - 3110\r
-    - 5488\r
-    - 5486\r
-    - 5466\r
+    - 7030\r
     type: DeviceList\r
 - uid: 23423\r
   type: IntercomEngineering\r
Форк Space Station 14 с переводами на русский