From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com>
Date: Wed, 2 Oct 2024 01:45:54 +0000 (-0700)
Subject: Cog update (#32585)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=20aa14e4f7c9907b8c96acde38dae2a2dd6264e5;p=space-station-14.git

Cog update (#32585)

* ai core upgrades

* fix distro color
---

diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml
index 562b27f87f..7bc328d798 100644
--- a/Resources/Maps/cog.yml
+++ b/Resources/Maps/cog.yml
@@ -805,8 +805,6 @@ entities:
             5555: -28,58
             5779: 31,-8
             5786: 31,-2
-            5798: 0,-4
-            5799: -2,-4
             6198: 3,-46
             6200: 3,-40
             6258: 58,-27
@@ -13373,6 +13371,29 @@ entities:
       - 4266
       - 32067
       - 32069
+  - uid: 32231
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -4.5,-1.5
+      parent: 12
+    - type: DeviceList
+      devices:
+      - 32227
+      - 32226
+      - 32234
+      - 32225
+      - 32224
+      - 32235
+  - uid: 32232
+    components:
+    - type: Transform
+      pos: -3.5,-9.5
+      parent: 12
+    - type: DeviceList
+      devices:
+      - 32229
+      - 10069
 - proto: AirAlarmVox
   entities:
   - uid: 7822
@@ -13412,16 +13433,6 @@ entities:
     - type: Transform
       pos: 38.5,-32.5
       parent: 12
-  - uid: 7195
-    components:
-    - type: Transform
-      anchored: True
-      pos: 0.5,-3.5
-      parent: 12
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
   - uid: 8863
     components:
     - type: Transform
@@ -18395,6 +18406,12 @@ entities:
     - type: Transform
       pos: -9.5,-16.5
       parent: 12
+  - uid: 145
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-5.5
+      parent: 12
   - uid: 247
     components:
     - type: Transform
@@ -24190,17 +24207,12 @@ entities:
   - uid: 2217
     components:
     - type: Transform
-      pos: -0.5,-10.5
+      pos: -0.5,0.5
       parent: 12
   - uid: 2218
     components:
     - type: Transform
-      pos: -0.5,-9.5
-      parent: 12
-  - uid: 2219
-    components:
-    - type: Transform
-      pos: -0.5,-8.5
+      pos: -0.5,-0.5
       parent: 12
   - uid: 2220
     components:
@@ -24215,7 +24227,7 @@ entities:
   - uid: 2222
     components:
     - type: Transform
-      pos: -0.5,-4.5
+      pos: -1.5,-1.5
       parent: 12
   - uid: 2223
     components:
@@ -24265,18 +24277,13 @@ entities:
   - uid: 2232
     components:
     - type: Transform
-      pos: -0.5,-3.5
+      pos: 0.5,-1.5
       parent: 12
   - uid: 2233
     components:
     - type: Transform
       pos: -0.5,-2.5
       parent: 12
-  - uid: 2234
-    components:
-    - type: Transform
-      pos: -0.5,-1.5
-      parent: 12
   - uid: 2262
     components:
     - type: Transform
@@ -36062,6 +36069,11 @@ entities:
     - type: Transform
       pos: -20.5,-62.5
       parent: 12
+  - uid: 20074
+    components:
+    - type: Transform
+      pos: -0.5,-1.5
+      parent: 12
   - uid: 20257
     components:
     - type: Transform
@@ -43702,6 +43714,11 @@ entities:
     - type: Transform
       pos: -63.5,-53.5
       parent: 12
+  - uid: 32230
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 12
 - proto: CableApcStack
   entities:
   - uid: 16561
@@ -56175,6 +56192,11 @@ entities:
     - type: Transform
       pos: -2.5,-9.5
       parent: 12
+  - uid: 2234
+    components:
+    - type: Transform
+      pos: 1.5,-5.5
+      parent: 12
   - uid: 2246
     components:
     - type: Transform
@@ -62365,11 +62387,6 @@ entities:
     - type: Transform
       pos: -47.5,17.5
       parent: 12
-  - uid: 20074
-    components:
-    - type: Transform
-      pos: 2.5,-5.5
-      parent: 12
   - uid: 20343
     components:
     - type: Transform
@@ -103019,6 +103036,13 @@ entities:
       rot: 3.141592653589793 rad
       pos: 0.5,67.5
       parent: 12
+  - uid: 32228
+    components:
+    - type: Transform
+      pos: -4.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeBend
   entities:
   - uid: 928
@@ -103223,12 +103247,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2124
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -2.5,-1.5
-      parent: 12
   - uid: 2168
     components:
     - type: Transform
@@ -103907,23 +103925,22 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 37.5,-32.5
       parent: 12
-  - uid: 7188
-    components:
-    - type: Transform
-      pos: -1.5,-1.5
-      parent: 12
   - uid: 7189
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
-      pos: 1.5,-1.5
+      pos: 0.5,-3.5
       parent: 12
-  - uid: 7190
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7194
     components:
     - type: Transform
       rot: 1.5707963267948966 rad
-      pos: 0.5,-1.5
+      pos: -0.5,-3.5
       parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7205
     components:
     - type: Transform
@@ -106210,6 +106227,14 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 0.5,68.5
       parent: 12
+  - uid: 32223
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -4.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeFourway
   entities:
   - uid: 2577
@@ -106259,6 +106284,20 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7188
+    components:
+    - type: Transform
+      pos: -1.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7190
+    components:
+    - type: Transform
+      pos: -0.5,-6.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 10894
     components:
     - type: Transform
@@ -107744,6 +107783,13 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 2124
+    components:
+    - type: Transform
+      pos: -1.5,-2.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 2128
     components:
     - type: Transform
@@ -112564,6 +112610,41 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 7185
+    components:
+    - type: Transform
+      pos: -0.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7186
+    components:
+    - type: Transform
+      pos: 0.5,-2.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7192
+    components:
+    - type: Transform
+      pos: -1.5,-3.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 7193
+    components:
+    - type: Transform
+      pos: 0.5,-0.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7196
+    components:
+    - type: Transform
+      pos: -0.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 7204
     components:
     - type: Transform
@@ -114582,6 +114663,13 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 10033
+    components:
+    - type: Transform
+      pos: -1.5,-0.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 10034
     components:
     - type: Transform
@@ -114766,13 +114854,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10066
-    components:
-    - type: Transform
-      pos: -0.5,-7.5
-      parent: 12
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10067
     components:
     - type: Transform
@@ -129244,6 +129325,65 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 32216
+    components:
+    - type: Transform
+      pos: -1.5,-4.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32217
+    components:
+    - type: Transform
+      pos: -1.5,-6.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32218
+    components:
+    - type: Transform
+      pos: -1.5,-7.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32219
+    components:
+    - type: Transform
+      pos: -1.5,-8.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32220
+    components:
+    - type: Transform
+      pos: -1.5,-9.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32221
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -2.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32222
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -3.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32233
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-5.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasPipeTJunction
   entities:
   - uid: 103
@@ -130207,6 +130347,22 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 7191
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: 0.5,-1.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 7195
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: -1.5,-1.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#990000FF'
   - uid: 7206
     components:
     - type: Transform
@@ -130611,13 +130767,6 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 10033
-    components:
-    - type: Transform
-      pos: -0.5,-6.5
-      parent: 12
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 10064
     components:
     - type: Transform
@@ -130634,6 +130783,14 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 10066
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -0.5,-7.5
+      parent: 12
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 10070
     components:
     - type: Transform
@@ -132652,18 +132809,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 36.5,-32.5
       parent: 12
-  - uid: 7191
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: -1.5,-3.5
-      parent: 12
-  - uid: 7192
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-3.5
-      parent: 12
   - uid: 9038
     components:
     - type: Transform
@@ -132994,19 +133139,6 @@ entities:
       targetPressure: 4500
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7193
-    components:
-    - type: Transform
-      pos: -1.5,-2.5
-      parent: 12
-    - type: GasPressurePump
-      targetPressure: 4500
-  - uid: 7194
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 0.5,-2.5
-      parent: 12
   - uid: 7212
     components:
     - type: Transform
@@ -133638,11 +133770,6 @@ entities:
       - 32066
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 7186
-    components:
-    - type: Transform
-      pos: 1.5,-0.5
-      parent: 12
   - uid: 7327
     components:
     - type: Transform
@@ -133819,6 +133946,9 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-10.5
       parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32232
     - type: AtmosPipeColor
       color: '#0055CCFF'
   - uid: 10073
@@ -135226,6 +135356,38 @@ entities:
       - 32066
     - type: AtmosPipeColor
       color: '#0055CCFF'
+  - uid: 32224
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 1.5,-1.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 32225
+    components:
+    - type: Transform
+      pos: 0.5,0.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
+  - uid: 32235
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-7.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
 - proto: GasVentPumpVox
   entities:
   - uid: 6688
@@ -135634,11 +135796,6 @@ entities:
       - 28365
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 7185
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 12
   - uid: 7519
     components:
     - type: Transform
@@ -136864,6 +137021,49 @@ entities:
       parent: 12
     - type: AtmosPipeColor
       color: '#990000FF'
+  - uid: 32226
+    components:
+    - type: Transform
+      pos: -1.5,0.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32227
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -2.5,-1.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32229
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -1.5,-10.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32232
+    - type: AtmosPipeColor
+      color: '#990000FF'
+  - uid: 32234
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,-5.5
+      parent: 12
+    - type: DeviceNetwork
+      deviceLists:
+      - 32231
+    - type: AtmosPipeColor
+      color: '#990000FF'
 - proto: GasVentScrubberVox
   entities:
   - uid: 7844
@@ -147563,7 +147763,7 @@ entities:
     - type: Transform
       pos: -0.5,-8.5
       parent: 12
-  - uid: 145
+  - uid: 2219
     components:
     - type: Transform
       pos: -0.5,-4.5
@@ -159531,7 +159731,7 @@ entities:
   - uid: 24354
     components:
     - type: Transform
-      pos: 39.5,45.5
+      pos: 39.5,46.5
       parent: 12
   - uid: 24355
     components:
@@ -173430,16 +173630,6 @@ entities:
     - type: Transform
       pos: 36.5,-32.5
       parent: 12
-  - uid: 7196
-    components:
-    - type: Transform
-      anchored: True
-      pos: -1.5,-3.5
-      parent: 12
-    - type: Physics
-      bodyType: Static
-    - type: Lock
-      locked: True
   - uid: 20776
     components:
     - type: Transform
@@ -174058,7 +174248,7 @@ entities:
       setupAvailableNetworks:
       - SurveillanceCameraCommand
       nameSet: True
-      id: AI core entrance
+      id: AI core entrance hall
   - uid: 32075
     components:
     - type: Transform
@@ -174070,6 +174260,20 @@ entities:
       - SurveillanceCameraCommand
       nameSet: True
       id: Gravity Gen
+  - uid: 32214
+    components:
+    - type: Transform
+      pos: -10.5,-6.5
+      parent: 12
+    - type: SurveillanceCamera
+      id: AI core entrance
+  - uid: 32215
+    components:
+    - type: Transform
+      pos: 3.5,-7.5
+      parent: 12
+    - type: SurveillanceCamera
+      id: AI core power room
 - proto: SurveillanceCameraEngineering
   entities:
   - uid: 4167
@@ -181447,6 +181651,13 @@ entities:
     - type: Transform
       pos: -0.5,-44.5
       parent: 12
+- proto: VendingMachineHappyHonk
+  entities:
+  - uid: 32236
+    components:
+    - type: Transform
+      pos: 39.5,45.5
+      parent: 12
 - proto: VendingMachineHydrobe
   entities:
   - uid: 10333