[map] marathon brig timers (#15614)

diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml
index 52e73487782e917a988bdb627599ef98bce429a4..d2c30408eaa51e8a2fad4c5474c7c625aed4943f 100644 (file)
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -19541,18 +19541,54 @@ entities:
   - pos: -43.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - inputs:\r
+      Open:\r
+      - port: Timer\r
+        uid: 1982\r
+      Close:\r
+      - port: Start\r
+        uid: 1982\r
+      Toggle: []\r
+      AutoClose:\r
+      - port: Timer\r
+        uid: 1982\r
+    type: SignalReceiver\r
 - uid: 1760\r
   type: WindoorSecurityLocked\r
   components:\r
   - pos: -39.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - inputs:\r
+      Open:\r
+      - port: Timer\r
+        uid: 1993\r
+      Close:\r
+      - port: Start\r
+        uid: 1993\r
+      Toggle: []\r
+      AutoClose:\r
+      - port: Timer\r
+        uid: 1993\r
+    type: SignalReceiver\r
 - uid: 1761\r
   type: WindoorSecurityLocked\r
   components:\r
   - pos: -47.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - inputs:\r
+      Open:\r
+      - port: Timer\r
+        uid: 1981\r
+      Close:\r
+      - port: Start\r
+        uid: 1981\r
+      Toggle: []\r
+      AutoClose:\r
+      - port: Timer\r
+        uid: 1981\r
+    type: SignalReceiver\r
 - uid: 1762\r
   type: WardrobePrisonFilled\r
   components:\r
@@ -20768,7 +20804,7 @@ entities:
     parent: 30\r
     type: Transform\r
 - uid: 1940\r
-  type: TableReinforced\r
+  type: GunSafeRifleLecter\r
   components:\r
   - pos: -41.5,53.5\r
     parent: 30\r
@@ -20780,7 +20816,7 @@ entities:
     parent: 30\r
     type: Transform\r
 - uid: 1942\r
-  type: Rack\r
+  type: GunSafeLaserCarbine\r
   components:\r
   - pos: -37.5,54.5\r
     parent: 30\r
@@ -21035,23 +21071,56 @@ entities:
   - unspawnedCount: 4\r
     type: BallisticAmmoProvider\r
 - uid: 1980\r
-  type: WeaponLaserCarbine\r
+  type: FireAlarm\r
   components:\r
-  - pos: -37.501694,54.356064\r
+  - rot: 1.5707963267948966 rad\r
+    pos: -49.5,42.5\r
     parent: 30\r
     type: Transform\r
+  - devices:\r
+    - 2223\r
+    - 2222\r
+    - 2221\r
+    - 2646\r
+    - 2647\r
+    - 2648\r
+    - 1443\r
+    - 21911\r
+    type: DeviceList\r
 - uid: 1981\r
-  type: WeaponLaserCarbine\r
+  type: BrigTimer\r
   components:\r
-  - pos: -37.501694,54.481064\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -45.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - outputs:\r
+      Start:\r
+      - port: Close\r
+        uid: 1761\r
+      Timer:\r
+      - port: AutoClose\r
+        uid: 1761\r
+      - port: Open\r
+        uid: 1761\r
+    type: SignalTransmitter\r
 - uid: 1982\r
-  type: WeaponLaserCarbine\r
+  type: BrigTimer\r
   components:\r
-  - pos: -37.501694,54.606064\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -41.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - outputs:\r
+      Start:\r
+      - port: Close\r
+        uid: 1759\r
+      Timer:\r
+      - port: AutoClose\r
+        uid: 1759\r
+      - port: Open\r
+        uid: 1759\r
+    type: SignalTransmitter\r
 - uid: 1983\r
   type: ClosetBombFilled\r
   components:\r
@@ -21131,17 +21200,22 @@ entities:
     parent: 30\r
     type: Transform\r
 - uid: 1993\r
-  type: WeaponRifleLecter\r
+  type: BrigTimer\r
   components:\r
-  - pos: -41.502182,53.48419\r
-    parent: 30\r
-    type: Transform\r
-- uid: 1994\r
-  type: WeaponRifleLecter\r
-  components:\r
-  - pos: -41.502182,53.312317\r
+  - rot: -1.5707963267948966 rad\r
+    pos: -37.5,41.5\r
     parent: 30\r
     type: Transform\r
+  - outputs:\r
+      Start:\r
+      - port: Close\r
+        uid: 1760\r
+      Timer:\r
+      - port: AutoClose\r
+        uid: 1760\r
+      - port: Open\r
+        uid: 1760\r
+    type: SignalTransmitter\r
 - uid: 1995\r
   type: MagazineRifle\r
   components:\r
@@ -21160,12 +21234,6 @@ entities:
   - pos: -4.5,-15.5\r
     parent: 30\r
     type: Transform\r
-- uid: 1998\r
-  type: WeaponRifleLecter\r
-  components:\r
-  - pos: -41.517807,53.656067\r
-    parent: 30\r
-    type: Transform\r
 - uid: 1999\r
   type: MagazinePistolSubMachineGunTopMounted\r
   components:\r
@@ -117929,6 +117997,62 @@ entities:
     pos: 53.5,22.5\r
     parent: 30\r
     type: Transform\r
+  - fixtures:\r
+    - shape: !type:PolygonShape\r
+        radius: 0.01\r
+        vertices:\r
+        - -0.55,-0.55\r
+        - 0.55,-0.55\r
+        - 0.55,0.55\r
+        - -0.55,0.55\r
+      mask: []\r
+      layer:\r
+      - Impassable\r
+      - MidImpassable\r
+      - LowImpassable\r
+      density: 1\r
+      hard: False\r
+      restitution: 0\r
+      friction: 0.4\r
+      id: conveyor\r
+    - shape: !type:PolygonShape\r
+        radius: 0.01\r
+        vertices:\r
+        - 0.15,-0.15\r
+        - 0.15,0.15\r
+        - -0.15,0.15\r
+        - -0.15,-0.15\r
+      mask: []\r
+      layer:\r
+      - MidImpassable\r
+      - HighImpassable\r
+      - LowImpassable\r
+      - BulletImpassable\r
+      - InteractImpassable\r
+      - Opaque\r
+      density: 1\r
+      hard: False\r
+      restitution: 0\r
+      friction: 0.4\r
+      id: brrt\r
+    - shape: !type:PolygonShape\r
+        radius: 0.01\r
+        vertices:\r
+        - 0.49,-0.49\r
+        - 0.49,0.49\r
+        - -0.49,0.49\r
+        - -0.49,-0.49\r
+      mask:\r
+      - Impassable\r
+      layer:\r
+      - BulletImpassable\r
+      - Opaque\r
+      density: 1\r
+      hard: True\r
+      restitution: 0\r
+      friction: 0.4\r
+      id: collision\r
+    type: Fixtures\r
   - inputs:\r
       Off:\r
       - port: Middle\r
@@ -170863,42 +170987,6 @@ entities:
   - pos: -39.5,47.5\r
     parent: 30\r
     type: Transform\r
-- uid: 21909\r
-  type: FireAlarm\r
-  components:\r
-  - rot: 3.141592653589793 rad\r
-    pos: -41.5,41.5\r
-    parent: 30\r
-    type: Transform\r
-  - devices:\r
-    - 2646\r
-    - 2647\r
-    - 2648\r
-    - 1443\r
-    - 2223\r
-    - 2222\r
-    - 2221\r
-    - 21911\r
-    type: DeviceList\r
-- uid: 21910\r
-  type: AirAlarm\r
-  components:\r
-  - rot: 3.141592653589793 rad\r
-    pos: -45.5,41.5\r
-    parent: 30\r
-    type: Transform\r
-  - devices:\r
-    - 2646\r
-    - 2647\r
-    - 2648\r
-    - 1443\r
-    - 2223\r
-    - 2222\r
-    - 2221\r
-    - 21911\r
-    - 2644\r
-    - 2645\r
-    type: DeviceList\r
 - uid: 21911\r
   type: AirSensor\r
   components:\r