Merge remote-tracking branch 'upstream/stable' into ed-29-10-2024-upstream

# Conflicts: # Content.Server/Chat/Managers/ChatSanitizationManager.cs # Content.Server/Temperature/Systems/TemperatureSystem.cs # Content.Shared/Localizations/ContentLocalizationManager.cs
2024-10-29 11:16:56 +03:00
parent b14c75390c 0468c0f6bb
commit ae3cbd6092
388 changed files with 34535 additions and 18822 deletions
--- a/Resources/Maps/Shuttles/emergency_omega.yml
+++ b/Resources/Maps/Shuttles/emergency_omega.yml
@@ -17,7 +17,7 @@ entities:
  - uid: 603
    components:
    - type: MetaData
-      name: NT Evac Box
+      name: NT Evac Omega
    - type: Transform
      pos: 2.2710133,-2.4148211
      parent: invalid
@@ -3155,6 +3155,38 @@ entities:
    - type: Transform
      pos: -1.5,0.5
      parent: 603
+- proto: Screen
+  entities:
+  - uid: 606
+    components:
+    - type: Transform
+      pos: -2.5,10.5
+      parent: 603
+  - uid: 607
+    components:
+    - type: Transform
+      pos: 5.5,4.5
+      parent: 603
+  - uid: 608
+    components:
+    - type: Transform
+      pos: 5.5,8.5
+      parent: 603
+  - uid: 609
+    components:
+    - type: Transform
+      pos: -10.5,8.5
+      parent: 603
+  - uid: 610
+    components:
+    - type: Transform
+      pos: -10.5,4.5
+      parent: 603
+  - uid: 611
+    components:
+    - type: Transform
+      pos: -2.5,1.5
+      parent: 603
 - proto: SheetSteel
  entities:
  - uid: 573
--- a/Resources/Maps/box.yml
+++ b/Resources/Maps/box.yml
@@ -10019,6 +10019,11 @@ entities:
    - type: Transform
      pos: -14.5,-67.5
      parent: 8364
+    - type: DeviceList
+      devices:
+      - 5463
+      - 5462
+      - 1860
  - uid: 26908
    components:
    - type: Transform
@@ -11579,7 +11584,7 @@ entities:
      pos: 24.5,16.5
      parent: 8364
    - type: Door
-      secondsUntilStateChange: -16708.217
+      secondsUntilStateChange: -18243.016
      state: Opening
    - type: DeviceLinkSource
      lastSignals:
@@ -13271,6 +13276,9 @@ entities:
    - type: Transform
      pos: -11.5,-68.5
      parent: 8364
+    - type: DeviceNetwork
+      deviceLists:
+      - 26707
  - uid: 14486
    components:
    - type: Transform
@@ -19614,6 +19622,11 @@ entities:
    - type: Transform
      pos: 2.5,-13.5
      parent: 8364
+  - uid: 8185
+    components:
+    - type: Transform
+      pos: 3.5,-35.5
+      parent: 8364
  - uid: 8383
    components:
    - type: Transform
@@ -81253,11 +81266,6 @@ entities:
    - type: Transform
      pos: 70.5,-43.5
      parent: 8364
-  - uid: 21936
-    components:
-    - type: Transform
-      pos: 2.5,-36.5
-      parent: 8364
  - uid: 25921
    components:
    - type: Transform
@@ -81280,6 +81288,11 @@ entities:
    - type: Transform
      pos: 11.5,-68.5
      parent: 8364
+  - uid: 27920
+    components:
+    - type: Transform
+      pos: 2.5,-36.5
+      parent: 8364
 - proto: DisposalYJunction
  entities:
  - uid: 6145
@@ -84418,7 +84431,7 @@ entities:
      pos: -34.5,-14.5
      parent: 8364
    - type: Door
-      secondsUntilStateChange: -10896.755
+      secondsUntilStateChange: -12431.553
      state: Closing
  - uid: 15010
    components:
@@ -84911,7 +84924,7 @@ entities:
      pos: -4.5,-71.5
      parent: 8364
    - type: Door
-      secondsUntilStateChange: -2644.4858
+      secondsUntilStateChange: -4179.284
      state: Closing
 - proto: Fireplace
  entities:
@@ -110589,6 +110602,9 @@ entities:
    - type: Transform
      pos: -15.5,-68.5
      parent: 8364
+    - type: DeviceNetwork
+      deviceLists:
+      - 26707
    - type: AtmosPipeColor
      color: '#0055CCFF'
  - uid: 7282
@@ -112049,6 +112065,9 @@ entities:
      rot: 3.141592653589793 rad
      pos: -13.5,-69.5
      parent: 8364
+    - type: DeviceNetwork
+      deviceLists:
+      - 26707
  - uid: 7284
    components:
    - type: Transform
@@ -133757,6 +133776,11 @@ entities:
    - type: Transform
      pos: 17.5,-51.5
      parent: 8364
+  - uid: 17697
+    components:
+    - type: Transform
+      pos: 10.5,-81.5
+      parent: 8364
  - uid: 17718
    components:
    - type: Transform
@@ -133777,6 +133801,11 @@ entities:
    - type: Transform
      pos: 17.5,-50.5
      parent: 8364
+  - uid: 21936
+    components:
+    - type: Transform
+      pos: 10.5,-80.5
+      parent: 8364
  - uid: 22830
    components:
    - type: Transform
@@ -137215,12 +137244,6 @@ entities:
    - type: Transform
      pos: -3.5,-20.5
      parent: 8364
-  - uid: 8185
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-81.5
-      parent: 8364
  - uid: 8207
    components:
    - type: Transform
@@ -138045,12 +138068,6 @@ entities:
    - type: Transform
      pos: 25.5,-75.5
      parent: 8364
-  - uid: 17697
-    components:
-    - type: Transform
-      rot: 3.141592653589793 rad
-      pos: 10.5,-80.5
-      parent: 8364
  - uid: 17787
    components:
    - type: Transform
--- a/Resources/Maps/centcomm.yml
+++ b/Resources/Maps/centcomm.yml
@@ -18851,6 +18851,8 @@ entities:
      linkedPorts:
        722:
        - CloningPodSender: CloningPodReceiver
+        723:
+        - MedicalScannerSender: MedicalScannerReceiver
 - proto: ComputerComms
  entities:
  - uid: 652
@@ -27708,6 +27710,13 @@ entities:
    - type: Transform
      pos: -17.485325,-31.461966
      parent: 1668
+- proto: NetworkConfigurator
+  entities:
+  - uid: 1461
+    components:
+    - type: Transform
+      pos: 13.484868,-12.584605
+      parent: 1668
 - proto: NitrogenCanister
  entities:
  - uid: 5413
--- a/Resources/Maps/cog.yml
+++ b/Resources/Maps/cog.yml
--- a/Resources/Maps/fland.yml
+++ b/Resources/Maps/fland.yml
@@ -50444,12 +50444,12 @@ entities:
  - uid: 30017
    components:
    - type: Transform
-      pos: 97.5,49.5
+      pos: 101.5,44.5
      parent: 13329
  - uid: 30018
    components:
    - type: Transform
-      pos: 98.5,49.5
+      pos: 101.5,45.5
      parent: 13329
  - uid: 30019
    components:
@@ -78864,6 +78864,13 @@ entities:
    - type: Transform
      pos: 62.3291,-2.5415568
      parent: 13329
+- proto: CaptainIDCard
+  entities:
+  - uid: 35821
+    components:
+    - type: Transform
+      pos: 81.9281,44.575443
+      parent: 13329
 - proto: CarbonDioxideCanister
  entities:
  - uid: 15424
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -174,7 +174,7 @@ entities:
          version: 6
        -1,3:
          ind: -1,3
-          tiles: AAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAHwAAAAABHwAAAAAA
+          tiles: AAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAHwAAAAABHwAAAAAA
          version: 6
        1,1:
          ind: 1,1
@@ -27213,6 +27213,21 @@ entities:
    - type: Transform
      pos: 13.5,11.5
      parent: 30
+  - uid: 17777
+    components:
+    - type: Transform
+      pos: -5.5,83.5
+      parent: 30
+  - uid: 17778
+    components:
+    - type: Transform
+      pos: 4.5,83.5
+      parent: 30
+  - uid: 17779
+    components:
+    - type: Transform
+      pos: -0.5,88.5
+      parent: 30
  - uid: 17811
    components:
    - type: Transform
@@ -52056,6 +52071,18 @@ entities:
    - type: Transform
      pos: -39.575058,56.668564
      parent: 30
+- proto: ClothingHeadHelmetEVALarge
+  entities:
+  - uid: 17784
+    components:
+    - type: Transform
+      pos: -44.636612,58.69058
+      parent: 30
+  - uid: 17786
+    components:
+    - type: Transform
+      pos: -44.478813,58.559113
+      parent: 30
 - proto: ClothingHeadHelmetTemplar
  entities:
  - uid: 16772
@@ -60264,6 +60291,11 @@ entities:
    - type: Transform
      pos: 32.5,39.5
      parent: 30
+  - uid: 17783
+    components:
+    - type: Transform
+      pos: 14.5,-17.5
+      parent: 30
  - uid: 19407
    components:
    - type: Transform
@@ -96877,6 +96909,24 @@ entities:
      parent: 30
 - proto: IntercomAll
  entities:
+  - uid: 17780
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -1.5,82.5
+      parent: 30
+  - uid: 17781
+    components:
+    - type: Transform
+      rot: -1.5707963267948966 rad
+      pos: 0.5,82.5
+      parent: 30
+  - uid: 17782
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,81.5
+      parent: 30
  - uid: 22231
    components:
    - type: Transform
@@ -118343,6 +118393,14 @@ entities:
      - SurveillanceCameraCommand
      nameSet: True
      id: Bridge Airlock
+  - uid: 16403
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: -0.5,88.5
+      parent: 30
+    - type: SurveillanceCamera
+      id: AI Core Core North
  - uid: 20280
    components:
    - type: Transform
@@ -118353,7 +118411,7 @@ entities:
      setupAvailableNetworks:
      - SurveillanceCameraCommand
      nameSet: True
-      id: AI Core Core
+      id: AI Core Core South
  - uid: 20283
    components:
    - type: Transform
@@ -118750,16 +118808,13 @@ entities:
      - SurveillanceCameraEngineering
      nameSet: True
      id: Anchor Room
-  - uid: 16403
+  - uid: 17774
    components:
    - type: Transform
      rot: 3.141592653589793 rad
-      pos: -9.5,-27.5
+      pos: -10.5,-27.5
      parent: 30
    - type: SurveillanceCamera
-      setupAvailableNetworks:
-      - SurveillanceCameraEngineering
-      nameSet: True
      id: Telecomms
  - uid: 21211
    components:
--- a/Resources/Maps/packed.yml
+++ b/Resources/Maps/packed.yml