Merge remote-tracking branch 'upstream/master'

Resources/Changelog/ChangelogWhite.yml

@@ -6785,3 +6785,32 @@
   id: 419
   time: '2024-07-26T13:53:25.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/499
+- author: Warete
+  changes:
+  - message: "\u041A\u0430\u043C\u0435\u0440\u044B \u0441\u0442\u0430\u043B\u0438\
+      \ \u0431\u043E\u043B\u0435\u0435 \u043F\u0440\u0438\u044F\u0442\u043D\u044B\u043C\
+      \u0438 \u0432 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\
+      \u0438\u0438"
+    type: Tweak
+  id: 420
+  time: '2024-07-27T15:47:27.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/501
+- author: PuroSlavKing
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\u0435\
+      \u043A\u043B\u044F\u043D\u043D\u044B\u0435 \u0448\u043B\u044E\u0437\u044B \u0440\
+      \u0430\u0437\u043C\u0435\u0440\u0430\u043C\u0438 \u0432 2\u04451 \u0438 3\u0445\
+      1 \u0442\u0430\u0439\u043B\u0430."
+    type: Add
+  id: 421
+  time: '2024-07-27T15:46:53.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/504
+- author: ThereDrD
+  changes:
+  - message: "\u0420\u0430\u0437\u0433\u0435\u0440\u043C\u044B \u0441\u0442\u0430\u043B\
+      \u0438 \u044D\u0444\u0444\u0435\u043A\u0442\u043D\u0435\u0435 \u0438 \u0441\u043C\
+      \u0435\u0448\u043D\u0435\u0435"
+    type: Tweak
+  id: 422
+  time: '2024-07-27T15:48:25.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/492

Resources/Locale/ru-RU/ss14-ru/prototypes/white/entities/structures/door/airlocks.ftl

@@ -0,0 +1,7 @@
+ent-DoubleGlassAirlock = двойной стеклянный шлюз
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = 2x1
+
+ent-ThreepleGlassAirlock = тройной стеклянный шлюз
+    .desc = { ent-AirlockGlass.desc }
+    .suffix = 3x1

Resources/Locale/ru-RU/surveillance-camera/surveillance-camera-ui.ftl

@@ -11,3 +11,6 @@ surveillance-camera-setup = Настроить
 surveillance-camera-setup-ui-set = Установить
 surveillance-body-camera-on = { $item } начинает мигать
 surveillance-body-camera-off = { $item } перестает мигать
+
+surveillance-camera-monitor-ui-flavor-left = Большой брат смотрит.
+surveillance-camera-monitor-ui-flavor-right = v1.984

Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml

@@ -38,6 +38,7 @@
         - SurveillanceCameraGeneral
         - SurveillanceCameraMedical
         - SurveillanceCameraCommand
+      subnetColor: "#088743"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -46,6 +47,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraEngineering
+      subnetColor: "#EFB341"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -54,6 +56,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraSecurity
+      subnetColor: "#DE3A3A"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -62,6 +65,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraScience
+      subnetColor: "#D381C9"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -70,6 +74,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraSupply
+      subnetColor: "#A46106"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -78,6 +83,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraCommand
+      subnetColor: "#052EED"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -86,6 +92,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraService
+      subnetColor: "#9FED58"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -94,6 +101,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraMedical
+      subnetColor: "#52B4E9"
 
 - type: entity
   parent: SurveillanceCameraRouterBase
@@ -102,6 +110,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraGeneral
+      subnetColor: "#088743"
 
 - type: entity
   parent: [ BaseMachinePowered, ConstructibleMachine ]
@@ -136,6 +145,7 @@
       setupAvailableNetworks:
         - SurveillanceCameraEntertainment
         - SurveillanceCameraSecurity
+      subnetColor: "#088743"
 
 - type: entity
   parent: SurveillanceCameraWirelessRouterBase
@@ -144,6 +154,7 @@
   components:
     - type: SurveillanceCameraRouter
       subnetFrequency: SurveillanceCameraEntertainment
+      subnetColor: "#088743"
 
 # Body Camera Separate Router
 - type: entity

Resources/Prototypes/_White/Entities/Structures/Doors/Airlocks/Glass/glass_airlock_2x1.yml

@@ -0,0 +1,44 @@
+- type: entity
+  parent: Airlock
+  id: DoubleGlassAirlock
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite
+    sprite: White/Structures/Doors/Airlocks/Glass/Wide/glass_2x1.rsi
+    snapCardinals: false
+    offset: 0.5,0
+  - type: AnimationPlayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.49,-0.49,1.49,0.49" # 2x1
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - GlassAirlockLayer
+  - type: LayerChangeOnWeld
+    unWeldedLayer: GlassAirlockLayer
+    weldedLayer: GlassLayer
+  - type: Rotatable
+    rotateWhileAnchored: true
+  - type: Transform
+    noRot: false
+  - type: Construction
+    graph: Airlock
+    node: glassAirlock
+  - type: PaintableAirlock
+    group: Glass
+    department: null
+  - type: Tag
+    tags:
+      - GlassAirlock

Resources/Prototypes/_White/Entities/Structures/Doors/Airlocks/Glass/glass_airlock_3x1.yml

@@ -0,0 +1,43 @@
+- type: entity
+  parent: Airlock
+  id: ThreepleGlassAirlock
+  components:
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmack
+  - type: Door
+    occludes: false
+  - type: Occluder
+    enabled: false
+  - type: Sprite # TODO: NORMAL 3x1 AIRLOCK SPRITE
+    sprite: White/Structures/Doors/Airlocks/Glass/Wide/glass_3x1.rsi
+    snapCardinals: false
+  - type: AnimationPlayer
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-1.5,-0.49,1.5,0.49" # 3x1
+        density: 100
+        mask:
+        - FullTileMask
+        layer:
+        - GlassAirlockLayer
+  - type: LayerChangeOnWeld
+    unWeldedLayer: GlassAirlockLayer
+    weldedLayer: GlassLayer
+  - type: Rotatable
+    rotateWhileAnchored: true
+  - type: Transform
+    noRot: false
+  - type: Construction
+    graph: Airlock
+    node: glassAirlock
+  - type: PaintableAirlock
+    group: Glass
+    department: null
+  - type: Tag
+    tags:
+      - GlassAirlock

Resources/Textures/White/Structures/Doors/Airlocks/Glass/Wide/glass_2x1.rsi/meta.json

@@ -0,0 +1,264 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from IDINa_Huy.dmi | Edited by PuroSlavKing (Github)",
+  "size": {
+    "x": 64,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "assembly-fill"
+    },
+    {
+      "name": "assembly-glass"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closed-fill"
+    },
+    {
+      "name": "closed-glass"
+    },
+    {
+      "name": "panel_closed"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-fill",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-glass",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-panel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-fill",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-glass",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-panel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          1.2,
+          1.2
+        ]
+      ]
+    },
+    {
+      "name": "emergency_open_unlit"
+    }
+  ]
+}

Resources/Textures/White/Structures/Doors/Airlocks/Glass/Wide/glass_3x1.rsi/meta.json

@@ -0,0 +1,264 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from IDINa_Huy.dmi | Edited by PuroSlavKing (Github)",
+  "size": {
+    "x": 96,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "assembly"
+    },
+    {
+      "name": "assembly-fill"
+    },
+    {
+      "name": "assembly-glass"
+    },
+    {
+      "name": "bolted_unlit"
+    },
+    {
+      "name": "bolted_open_unlit"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "closed_unlit"
+    },
+    {
+      "name": "closed-fill"
+    },
+    {
+      "name": "closed-glass"
+    },
+    {
+      "name": "panel_closed"
+    },
+    {
+      "name": "closing",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-fill",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-glass",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "closing-panel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "deny_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "open_unlit"
+    },
+    {
+      "name": "panel_open"
+    },
+    {
+      "name": "opening",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening_unlit",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-fill",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-glass",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "opening-panel",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.07,
+          0.07,
+          0.07,
+          0.2
+        ]
+      ]
+    },
+    {
+      "name": "sparks",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_broken",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          1.7
+        ]
+      ]
+    },
+    {
+      "name": "sparks_damaged",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "sparks_open",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "welded"
+    },
+    {
+      "name": "emergency_unlit",
+      "delays": [
+        [
+          1.2,
+          1.2
+        ]
+      ]
+    },
+    {
+      "name": "emergency_open_unlit"
+    }
+  ]
+}

Resources/Textures/_Sunrise/Entities/Objects/Devices/portable_camera_viewer.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC-BY-SA-3.0",
+    "copyright": "",
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}