Merge remote-tracking branch 'upstream/master' into ups

Resources/Changelog/ChangelogWhite.yml

@@ -6106,3 +6106,142 @@
   id: 394
   time: '2024-07-19T12:52:57.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/463
+- author: Spatison
+  changes:
+  - message: "\u0421\u043F\u0430\u0432\u043D \u043C\u0430\u0433\u0430 \u0447\u0435\
+      \u0440\u0435\u0437 \u0430\u0434\u043C\u0438\u043D\u0432\u0435\u0440\u0431 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442\
+      \ \u0431\u043E\u043B\u0435\u0435 \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\
+      \u043E"
+    type: Fix
+  id: 395
+  time: '2024-07-19T14:42:32.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/465
+- author: Aviu
+  changes:
+  - message: "\u0420\u0430\u0431\u043E\u0447\u0438\u0435 \u0442\u0435\u0440\u043C\u0430\
+      \u043B\u043A\u0438."
+    type: Add
+  - message: "\u0410\u0443\u0433\u043C\u0435\u043D\u0442\u0430\u0446\u0438\u044F \u0437\
+      \u0440\u0435\u043D\u0438\u044F \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\
+      \u0430 \u0434\u0430\u0435\u0442 \u0442\u0435\u0440\u043C\u0430\u043B\u044C\u043D\
+      \u043E\u0435 \u0437\u0440\u0435\u043D\u0438\u0435."
+    type: Add
+  - message: "\u0423\u0431\u0440\u0430\u043D\u0430 \u043C\u0430\u0433\u0438\u0447\u0435\
+      \u0441\u043A\u0430\u044F \u043B\u0430\u043C\u043F\u0430 \u0441 \u044D\u043A\u0441\
+      \u043F\u0435\u0434\u0438\u0446\u0438\u0439."
+    type: Remove
+  id: 396
+  time: '2024-07-19T16:27:02.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/466
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u044B\
+      \ \u0441\u0432\u0435\u0442\u043E\u0448\u0443\u043C\u043E\u0432\u044B\u0435 \u0433\
+      \u0440\u0430\u043D\u0430\u0442\u044B. \u0422\u0435\u043F\u0435\u0440\u044C \u043E\
+      \u043D\u0438 \u0441\u0442\u0430\u043D\u044F\u0442 \u0438\u0433\u0440\u043E\u043A\
+      \u043E\u0432 \u0432 \u0440\u0430\u0434\u0438\u0443\u0441\u0435, \u0435\u0441\
+      \u043B\u0438 \u043D\u0435 \u043D\u043E\u0441\u0438\u0442\u044C \u043F\u043E\u043B\
+      \u043D\u043E\u0440\u0430\u0437\u043C\u0435\u0440\u043D\u0443\u044E \u0433\u0430\
+      \u0440\u043D\u0438\u0442\u0443\u0440\u0443. \u042D\u0442\u0438 \u0433\u0430\u0440\
+      \u043D\u0438\u0442\u0443\u0440\u044B \u043F\u043E\u043B\u0443\u0447\u0438\u043B\
+      \u043E \u0432\u0441\u0435 \u0421\u0411 \u0438 \u0432\u0441\u0435 \u0413\u043B\
+      \u0430\u0432\u044B."
+    type: Tweak
+  - message: "\u0421\u043E\u043A\u0438 \u0431\u043E\u043B\u044C\u0448\u0435 \u0441\
+      \u043A\u043E\u043B\u044C\u0437\u043A\u0438\u0435"
+    type: Tweak
+  - message: "\u041A\u0430\u0440\u043C\u0430\u043D\u043D\u0430\u044F \u0444\u043B\u0435\
+      \u0448\u043A\u0430 \u0441\u0442\u0430\u043B\u0430 \u0437\u0430\u043D\u0438\u043C\
+      \u0430\u0442\u044C \u043C\u0435\u043D\u044C\u0448\u0435 \u043C\u0435\u0441\u0442\
+      \u0430 \u0438 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\
+      \u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0439 \u0443\
+      \u0432\u0435\u043B\u0438\u0447\u0438\u043B\u043E\u0441\u044C \u043D\u0430 2"
+    type: Tweak
+  - message: "\u0418\u043A\u043E\u043D\u043A\u0430 \u0442\u0435\u0440\u043C\u0430\u043B\
+      \u043E\u043A \u0440\u0435\u0441\u043F\u0440\u0430\u0442\u043D\u0443\u0442\u0430"
+    type: Tweak
+  - message: "\u0421\u043F\u0440\u0430\u0439\u0442 \u041F\u041D\u0412 \u043D\u0430\
+      \ \u043F\u0435\u0440\u0441\u043E\u043D\u0430\u0436\u0435 \u0440\u0435\u0441\u043F\
+      \u0440\u0430\u0439\u0442\u043D\u0443\u0442"
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0437\u0432\u0443\
+      \u043A\u0438 \u0432\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u0438 \u043E\
+      \u0442\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F \u041F\u041D\u0412 \u0438\
+      \ \u0422\u0435\u0440\u043C\u0430\u043B\u043E\u043A"
+    type: Add
+  - message: "\u0421\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u044B \u0421\u0411\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u0437\u0430\u0449\u0438\u0449\u0430\u044E\
+      \u0442 \u043E\u0442 \u0441\u0432\u0435\u0442\u043E\u0448\u0443\u043C\u043E\u0432\
+      \u044B\u0445 \u0433\u0440\u0430\u043D\u0430\u0442, \u043F\u043E\u043A\u0430\
+      \ \u0433\u0435\u0440\u043C\u0435\u0442\u0438\u0447\u043D\u044B."
+    type: Tweak
+  - message: "\u0421\u043E\u043B\u043D\u0446\u0435\u0437\u0430\u0449\u0438\u0442\u043D\
+      \u044B\u0435 \u043E\u0447\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u0437\
+      \u0430\u0449\u0438\u0449\u0430\u044E\u0442 \u043E\u0442 \u0441\u0432\u0430\u0440\
+      \u043A\u0438, \u043A\u0430\u043A \u0432 \u0441\u044113!"
+    type: Tweak
+  - message: "\u0428\u043B\u0435\u043C \u0438\u043D\u0436\u0435\u043D\u0435\u0440\u043D\
+      \u044B\u0445 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u0437\u0430\u0449\u0438\u0449\u0430\u0435\u0442\
+      \ \u043E\u0442 \u0432\u0441\u043F\u044B\u0448\u0435\u043A"
+    type: Tweak
+  id: 397
+  time: '2024-07-20T02:08:01.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/467
+- author: Spatison
+  changes:
+  - message: "\u041D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0446\u0435\u043B\
+      \u0435\u0432\u043E\u0439 \u043F\u0438\u043D\u043F\u043E\u0438\u043D\u0442\u0435\
+      \u0440 \u0434\u043B\u044F \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\u043D\
+      \u0438\u043A\u043E\u0432 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\u0442\u0430"
+    type: Add
+  - message: "\u0411\u043E\u0435\u0433\u043E\u043B\u043E\u0432\u043A\u0430 \u043D\u0430\
+      \ \u0448\u0430\u0442\u0442\u043B\u0435 \u0441\u0438\u043D\u0434\u0438\u043A\u0430\
+      \u0442\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0432\u0441\u0435\u0433\u0434\
+      \u0430 \u0441\u043E \u0441\u0432\u043E\u0438\u043C\u0438 \u043A\u043E\u0434\u0430\
+      \u043C\u0438 \u0430\u043A\u0442\u0438\u0432\u0430\u0446\u0438\u0438"
+    type: Tweak
+  - message: "\u0415\u0441\u043B\u0438 \u043F\u0440\u0438 \u0432\u0437\u0440\u044B\
+      \u0432\u0435 \u0431\u043E\u0435\u0433\u043E\u043B\u043E\u0432\u043A\u0438 \u043D\
+      \u0435 \u043E\u0434\u0438\u043D \u043E\u043F\u0435\u0440\u0430\u0442\u0438\u0432\
+      \u043D\u0438\u043A \u043D\u0435 \u043F\u043E\u043A\u0438\u043D\u0443\u043B \u0441\
+      \u0442\u0430\u043D\u0446\u0438\u044E, \u0442\u043E \u0437\u0430\u0441\u0447\u0438\
+      \u0442\u044B\u0432\u0430\u0435\u0442\u0441\u044F \u043C\u0438\u043D\u043E\u0440\
+      \u043D\u0430\u044F \u043F\u043E\u0431\u0435\u0434\u0430"
+    type: Tweak
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043E \u043C\u043E\
+      \u043C\u0435\u043D\u0442\u0430\u043B\u044C\u043D\u043E\u0435 \u043E\u0442\u043A\
+      \u0440\u044B\u0442\u0438\u0435 \u043E\u0431\u0435\u0441\u0442\u043E\u0447\u0435\
+      \u043D\u043D\u043E\u0433\u043E \u0448\u043B\u044E\u0437\u0430 \u0440\u0443\u043A\
+      \u043E\u0439"
+    type: Fix
+  id: 398
+  time: '2024-07-20T02:33:14.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/468
+- author: ThereDrD
+  changes:
+  - message: "\u0420\u0435\u0441\u043F\u0440\u0430\u0439\u0442 \u0432\u0441\u0435\u0445\
+      \ \u043A\u0430\u043D\u0438\u0441\u0442\u0440"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\
+      \u044B\u0435 \u043A\u0440\u0430\u0441\u0438\u0432\u044B\u0435 \u0432\u0438\u0434\
+      \u044B \u043F\u043B\u0430\u0449\u0435\u0439 \u0434\u043B\u044F \u041A\u0430\u043F\
+      \u0438\u0442\u0430\u043D\u0430, \u0421\u0415 \u0438 \u0420\u0414. \u0414\u043E\
+      \u0441\u0442\u0443\u043F\u043D\u044B \u0432 \u043B\u043E\u0430\u0434\u0430\u0443\
+      \u0442\u0430\u0445"
+    type: Add
+  id: 399
+  time: '2024-07-20T02:32:32.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/469
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u043B\u043D\u043E\u0440\u0430\u0437\u043C\u0435\u0440\u043D\
+      \u044B\u0435 \u0433\u0430\u0440\u043D\u0438\u0442\u0443\u0440\u044B \u0434\u043E\
+      \u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0432 \u0448\u043A\u0430\u0444\u044B\
+      \ \u043E\u0444\u0438\u0446\u0435\u0440\u043E\u0432 \u0438 \u0432\u0435\u043D\
+      \u0434\u043E\u043C\u0430\u0442\u044B \u0421\u0411"
+    type: Fix
+  id: 400
+  time: '2024-07-20T15:28:44.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/470

Resources/Locale/ru-RU/research/technologies.ftl

@@ -70,4 +70,5 @@ research-technology-advanced-spray = Продвинутые спреи
 research-technology-bluespace-cargo-transport = Блюспейс-транспортировка грузов
 research-technology-quantum-fiber-weaving = Плетение квантового волокна
 research-technology-night-vision = Технологии ночного видения
+research-technology-thermal-vision = Технологии термального видения
 research-technology-bluespace-chemistry = Блюспейс химия

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/clothing/ears/headsets_alt.ftl

@@ -13,6 +13,9 @@ ent-ClothingHeadsetAltMedical = полноразмерная медицинск
 ent-ClothingHeadsetAltSecurity = полноразмерная охранная гарнитура
     .desc = { ent-ClothingHeadsetAlt.desc }
     .suffix = { "" }
+ent-ClothingHeadsetAltSecurityCommand = { ent-ClothingHeadsetAltSecurity }
+    .desc = { ent-ClothingHeadsetAlt.desc }
+    .suffix = { "" }
 ent-ClothingHeadsetAltEngineering = полноразмерная инженерная гарнитура
     .desc = { ent-ClothingHeadsetAlt.desc }
     .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/devices/nuke.ftl

@@ -4,6 +4,9 @@ ent-NuclearBomb = ядерная боеголовка
 ent-NuclearBombUnanchored = { ent-NuclearBomb }
     .suffix = незакрепленный
     .desc = { ent-NuclearBomb.desc }
+ent-NuclearBombSyndicate = { ent-NuclearBomb }
+    .suffix = синдикат
+    .desc = { ent-NuclearBomb.desc }
 ent-NuclearBombKeg = ядерная боеголовка
     .desc = Вам, вероятно, не стоит оставаться здесь, чтобы проверить, запущена ли она. Сбоку имеется кран.
     .suffix = кег

Resources/Locale/ru-RU/store/uplink-catalog.ftl

@@ -444,6 +444,9 @@ uplink-blood-dagger-desc = Критическая жажда: Кинжал Жа
 uplink-night-vision-name = ПНВ [Хамелеон]
 uplink-night-vision-desc = Теперь ты видишь во тьме!
 
+uplink-thermal-vision-name = Оптический термальный сканер [Хамелеон]
+uplink-thermal-vision-desc = Позволяет вам видеть существ через стены.
+
 uplink-betrayal-knife-name = Предательский нож
 uplink-betrayal-knife-desc = Предательский нож позволяет пользователю телепортироваться на короткое расстояние, а также наносит значительные повреждения, пробивая броню противника, при ударе в спину.
 

Resources/Locale/ru-RU/white/actions/thermal-vision.ftl

@@ -0,0 +1,2 @@
+ent-ToggleThermalVision = Переключить термальное зрение.
+    .desc = Переключает термальное зрение.

Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl

@@ -5,7 +5,7 @@ changeling-ability-biodegrade = Биоразложение
 changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы. Стоит 30 химикатов.
 
 changeling-ability-eyesight = Аугментация зрения
-changeling-ability-eyesight-desc = Развивает переключаемое ночное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки.
+changeling-ability-eyesight-desc = Развивает переключаемое ночное и термальное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки.
 
 changeling-ability-dissonant-shriek = Диссонирующий вопль
 changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг. Стоит 20 химикатов.

Resources/Maps/Dungeon/snowy_labs.yml

@@ -7034,13 +7034,6 @@ entities:
     - type: Transform
       pos: 10.480986,45.607067
       parent: 1653
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 800
-    components:
-    - type: Transform
-      pos: 6.5116234,25.568321
-      parent: 1653
 - proto: ClothingHandsGlovesLeather
   entities:
   - uid: 719
@@ -10731,14 +10724,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 52.5,14.5
       parent: 1653
-- proto: MagicalLamp
-  entities:
-  - uid: 1204
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 1.5085075,47.438328
-      parent: 1653
 - proto: MaintenanceFluffSpawner
   entities:
   - uid: 1245

Resources/Maps/Shuttles/infiltrator.yml

@@ -165,6 +165,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -180,6 +188,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.14996
           moles:
@@ -195,6 +211,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -210,6 +234,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -225,6 +257,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         - volume: 2500
           temperature: 293.15
           moles:
@@ -240,6 +280,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: DecalGrid
       chunkCollection:
@@ -2650,8 +2698,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,-27.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasMinerOxygen
   entities:
   - uid: 369
@@ -2660,8 +2706,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-27.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasMixer
   entities:
   - uid: 370
@@ -2675,8 +2719,6 @@ entities:
     - type: GasMixer
       inletTwoConcentration: 0.78
       inletOneConcentration: 0.22
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasPassiveVent
@@ -2687,24 +2729,18 @@ entities:
       rot: 3.141592653589793 rad
       pos: 3.5,-26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 372
     components:
     - type: Transform
       rot: 3.141592653589793 rad
       pos: 5.5,-26.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
   - uid: 373
     components:
     - type: Transform
       rot: -1.5707963267948966 rad
       pos: 6.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
 - proto: GasPipeBend
   entities:
   - uid: 374
@@ -3268,8 +3304,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 2.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasPressurePump
@@ -3282,8 +3316,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: 4.5,-19.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GasVentPump
@@ -3294,8 +3326,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 0.5,-11.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 450
@@ -3304,8 +3334,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 451
@@ -3314,8 +3342,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 4.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 452
@@ -3324,8 +3350,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -4.5,-21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 453
@@ -3334,8 +3358,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 454
@@ -3344,8 +3366,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-16.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
   - uid: 455
@@ -3353,8 +3373,6 @@ entities:
     - type: Transform
       pos: 0.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#0335FCFF'
 - proto: GasVentScrubber
@@ -3365,8 +3383,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 1.5,-12.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 457
@@ -3375,8 +3391,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 3.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 458
@@ -3385,8 +3399,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 2.5,-20.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 459
@@ -3395,8 +3407,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -4.5,-17.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 460
@@ -3405,8 +3415,6 @@ entities:
       rot: 1.5707963267948966 rad
       pos: -3.5,-21.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
   - uid: 461
@@ -3414,8 +3422,6 @@ entities:
     - type: Transform
       pos: -0.5,-3.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
     - type: AtmosPipeColor
       color: '#FF1212FF'
 - proto: GeneratorBasic15kW
@@ -3635,6 +3641,9 @@ entities:
     - type: Transform
       pos: 4.5,-5.5
       parent: 1
+    - type: PointLight
+      color: '#D56C6CFF'
+      enabled: True
     - type: EntityStorage
       air:
         volume: 200
@@ -3653,6 +3662,14 @@ entities:
         - 0
         - 0
         - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
+        - 0
     - type: ContainerContainer
       containers:
         entity_storage: !type:Container
@@ -3726,19 +3743,19 @@ entities:
     - type: Transform
       pos: 5.6633797,-17.565443
       parent: 1
-- proto: NuclearBombUnanchored
+- proto: NuclearBombSyndicate
   entities:
   - uid: 509
     components:
     - type: Transform
       pos: -2.5,-12.5
       parent: 1
-- proto: NukeCodePaper
+- proto: NukeCodePaperStation
   entities:
   - uid: 510
     components:
     - type: Transform
-      pos: -2.5286522,-11.44479
+      pos: -2.4890966,-11.441471
       parent: 1
 - proto: Ointment
   entities:
@@ -3766,8 +3783,8 @@ entities:
     - type: Transform
       pos: -1.5,-24.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
+    - type: PolymorphableCanister
+      currentPrototype: OxygenCanister
 - proto: OxygenTankFilled
   entities:
   - uid: 515
@@ -4551,8 +4568,8 @@ entities:
     - type: Transform
       pos: 2.5,-23.5
       parent: 1
-    - type: AtmosDevice
-      joinedGrid: 1
+    - type: PolymorphableCanister
+      currentPrototype: StorageCanister
 - proto: SubstationBasic
   entities:
   - uid: 628

Resources/Maps/Shuttles/striker.yml

@@ -184,6 +184,14 @@ entities:
           - 0
           - 0
           - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
+          - 0
         chunkSize: 4
     - type: GasTileOverlay
     - type: RadiationGridResistance
@@ -191,6 +199,7 @@ entities:
       shakeTimes: 10
     - type: SpreaderGrid
     - type: GridPathfinding
+    - type: NukeOpsShuttle
 - proto: AirCanister
   entities:
   - uid: 91
@@ -198,8 +207,8 @@ entities:
     - type: Transform
       pos: -0.5,-8.5
       parent: 325
-    - type: AtmosDevice
-      joinedGrid: 325
+    - type: PolymorphableCanister
+      currentPrototype: AirCanister
 - proto: AirlockExternalShuttleSyndicateLocked
   entities:
   - uid: 142
@@ -825,6 +834,10 @@ entities:
           occludes: True
           ents:
           - 245
+        disk_slot: !type:ContainerSlot
+          showEnts: False
+          occludes: True
+          ent: null
 - proto: CyberPen
   entities:
   - uid: 77
@@ -1041,8 +1054,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.5,-8.5
       parent: 325
-    - type: AtmosDevice
-      joinedGrid: 325
 - proto: GasVentPump
   entities:
   - uid: 218
@@ -1054,8 +1065,6 @@ entities:
       address: Vnt-5f41a0ae
       transmitFrequency: 1621
       receiveFrequency: 1621
-    - type: AtmosDevice
-      joinedGrid: 325
   - uid: 219
     components:
     - type: Transform
@@ -1066,8 +1075,6 @@ entities:
       address: Vnt-129c27d2
       transmitFrequency: 1621
       receiveFrequency: 1621
-    - type: AtmosDevice
-      joinedGrid: 325
   - uid: 220
     components:
     - type: Transform
@@ -1078,8 +1085,6 @@ entities:
       address: Vnt-11c4609d
       transmitFrequency: 1621
       receiveFrequency: 1621
-    - type: AtmosDevice
-      joinedGrid: 325
   - uid: 221
     components:
     - type: Transform
@@ -1090,8 +1095,6 @@ entities:
       address: Vnt-6859729f
       transmitFrequency: 1621
       receiveFrequency: 1621
-    - type: AtmosDevice
-      joinedGrid: 325
   - uid: 222
     components:
     - type: Transform
@@ -1102,8 +1105,6 @@ entities:
       address: Vnt-19d24c7f
       transmitFrequency: 1621
       receiveFrequency: 1621
-    - type: AtmosDevice
-      joinedGrid: 325
 - proto: GeneratorBasic15kW
   entities:
   - uid: 41
@@ -1457,6 +1458,13 @@ entities:
     - type: Transform
       pos: 1.561105,-2.5567772
       parent: 325
+- proto: OxygenTankFilled
+  entities:
+  - uid: 167
+    components:
+    - type: Transform
+      pos: 1.60798,-0.3062118
+      parent: 325
 - proto: PinpointerNuclear
   entities:
   - uid: 162
@@ -2379,11 +2387,4 @@ entities:
           occludes: True
           ents:
           - 346
-- proto: YellowOxygenTankFilled
-  entities:
-  - uid: 167
-    components:
-    - type: Transform
-      pos: 1.60798,-0.3062118
-      parent: 325
 ...

Resources/Maps/atlas.yml

@@ -18251,15 +18251,6 @@ entities:
       parent: 30
     - type: Physics
       canCollide: False
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 7267
-    components:
-    - type: Transform
-      pos: -31.624142,-1.1191435
-      parent: 30
-    - type: Physics
-      canCollide: False
 - proto: ClothingHandsGlovesColorYellow
   entities:
   - uid: 1668

Resources/Maps/bagel.yml

@@ -58677,23 +58677,6 @@ entities:
     - type: Transform
       pos: 14.470102,-43.56056
       parent: 60
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 15400
-    components:
-    - type: Transform
-      pos: -17.455568,32.420967
-      parent: 60
-  - uid: 15402
-    components:
-    - type: Transform
-      pos: -17.455568,32.624092
-      parent: 60
-  - uid: 23570
-    components:
-    - type: Transform
-      pos: -62.52358,41.396984
-      parent: 60
 - proto: ClothingHandsGlovesBoxingBlue
   entities:
   - uid: 19920

Resources/Maps/fland.yml

@@ -93553,28 +93553,6 @@ entities:
     - type: Transform
       pos: 102.52885,13.515509
       parent: 13329
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 31732
-    components:
-    - type: Transform
-      pos: 65.539406,-14.949457
-      parent: 13329
-  - uid: 31733
-    components:
-    - type: Transform
-      pos: 70.49054,-5.808993
-      parent: 13329
-  - uid: 31734
-    components:
-    - type: Transform
-      pos: 70.47884,-26.373547
-      parent: 13329
-  - uid: 31735
-    components:
-    - type: Transform
-      pos: 70.57259,-26.498547
-      parent: 13329
 - proto: ClothingEyesHudBeer
   entities:
   - uid: 31731

Resources/Maps/marathon.yml

@@ -51820,18 +51820,6 @@ entities:
     - type: Transform
       pos: 47.465996,44.649086
       parent: 30
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 9441
-    components:
-    - type: Transform
-      pos: 5.522977,-23.530071
-      parent: 30
-  - uid: 10010
-    components:
-    - type: Transform
-      pos: -13.542964,-45.170254
-      parent: 30
 - proto: ClothingEyesHudDiagnostic
   entities:
   - uid: 11291

Resources/Maps/meta.yml

@@ -60170,18 +60170,6 @@ entities:
     - type: Transform
       pos: 66.56803,33.64219
       parent: 5350
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 23947
-    components:
-    - type: Transform
-      pos: 55.407906,-5.421943
-      parent: 5350
-  - uid: 23948
-    components:
-    - type: Transform
-      pos: 55.501656,-5.562568
-      parent: 5350
 - proto: ClothingEyesHudMedical
   entities:
   - uid: 14922

Resources/Maps/packed.yml

@@ -32339,13 +32339,6 @@ entities:
     - type: Transform
       pos: 86.49675,1.6024053
       parent: 2
-- proto: ClothingEyesGlassesThermal
-  entities:
-  - uid: 12673
-    components:
-    - type: Transform
-      pos: 32.51945,-30.628448
-      parent: 2
 - proto: ClothingEyesHudDiagnostic
   entities:
   - uid: 11439

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -332,6 +332,17 @@
       - id: PinpointerSyndicateNuclear
       - id: DeathAcidifierImplanter
 
+- type: entity
+  parent: ClothingBackpackDuffelSyndicateBundle
+  id: ClothingBackpackDuffelSyndicateLonelyOperative
+  name: operative duffelbag
+  components:
+  - type: StorageFill
+    contents:
+      - id: BoxSurvivalSyndicate
+      - id: WeaponPistolViper
+      - id: PinpointerStationNuclear
+      - id: DeathAcidifierImplanter
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle

Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml

@@ -93,7 +93,7 @@
       - id: ClothingHandsGlovesCombat
       - id: ClothingShoesBootsJack
       - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHeadsetAltSecurityCommand
       - id: ClothingMaskGasSwat
       - id: ClothingOuterCoatHoSTrench
 

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -324,5 +324,5 @@
         - id: ClothingUniformJumpskirtInspector
         - id: ClothingUniformJumpskirtInspectorFormal
         - id: ClothingHandsGlovesInspector
-        - id: ClothingHeadsetAltSecurity
+        - id: ClothingHeadsetAltSecurityCommand
         - id: RubberStampInspector

Resources/Prototypes/Catalog/Fills/Lockers/security.yml

@@ -56,7 +56,7 @@
       - id: Flash
         prob: 0.5
       - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetSecurity
+      - id: ClothingHeadsetAltSecurity # WD
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
       - id: WeaponMeleeNeedle

Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml

@@ -7,7 +7,7 @@
     ClothingHeadHatBeret: 4
     ClothingHeadHatSecsoft: 4
     ClothingHeadBandRed: 4
-    ClothingHeadsetSecurity: 4
+    ClothingHeadsetAltSecurity: 4
     ClothingEyesGlassesSecurity: 4
     ClothingOuterWinterSec: 4
     ClothingUniformJumpsuitSec: 4

Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: ClothingHeadset
   id: ClothingHeadsetAlt
@@ -9,6 +9,7 @@
     state: icon_alt
   - type: Clothing
     equippedPrefix: alt
+  - type: FlashSoundSuppression # WD
 
 - type: entity
   parent: ClothingHeadsetAlt
@@ -108,13 +109,28 @@
     containers:
       key_slots:
       - EncryptionKeySecurity
-      - EncryptionKeyCommand
       - EncryptionKeyCommon
   - type: Sprite
     sprite: Clothing/Ears/Headsets/security.rsi
   - type: Clothing
     sprite: Clothing/Ears/Headsets/security.rsi
 
+- type: entity # WD
+  parent: ClothingHeadsetAlt
+  id: ClothingHeadsetAltSecurityCommand
+  name: head of security's over-ear headset
+  components:
+  - type: ContainerFill
+    containers:
+      key_slots:
+      - EncryptionKeySecurity
+      - EncryptionKeyCommand
+      - EncryptionKeyCommon
+  - type: Sprite
+    sprite: Clothing/Ears/Headsets/command.rsi
+  - type: Clothing
+    sprite: Clothing/Ears/Headsets/command.rsi
+
 - type: entity
   parent: ClothingHeadsetAlt
   id: ClothingHeadsetAltScience

Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

@@ -148,7 +148,6 @@
   components:
   - type: FlashImmunity
   - type: EyeProtection
-    protectionTime: 5
   - type: Tag
     tags:
     - Sunglasses
@@ -167,7 +166,6 @@
     sprite: Clothing/Eyes/Glasses/secglasses.rsi
   - type: FlashImmunity
   - type: EyeProtection
-    protectionTime: 5
   - type: Construction
     graph: GlassesSecHUD
     node: glassesSec
@@ -232,14 +230,33 @@
   description: Thermals in the shape of glasses.
   components:
   - type: Sprite
-    sprite: Clothing/Eyes/Glasses/thermal.rsi
+    sprite: White/Clothing/Eyes/Glasses/thermal.rsi
   - type: Clothing
-    sprite: Clothing/Eyes/Glasses/thermal.rsi
-  - type: Armor
-    modifiers:
-      coefficients:
-        Heat: 0.95
-  - type: GroupExamine
+    sprite: White/Clothing/Eyes/Glasses/thermal.rsi
+  - type: ClothingGrantComponent
+    component:
+    - type: ThermalVision
+
+- type: entity
+  parent: ClothingEyesGlassesThermal
+  id: ClothingEyesGlassesThermalSyndie
+  suffix: "Хамелеон"
+  components:
+  - type: ChameleonClothing
+    slot: [ eyes ]
+    default: ClothingEyesGlassesSunglasses
+  - type: UserInterface
+    interfaces:
+    - key: enum.ChameleonUiKey.Key
+      type: ChameleonBoundUserInterface
+
+- type: entity
+  parent: ClothingEyesGlassesThermalSyndie
+  id: ClothingEyesGlassesThermalNukie
+  suffix: "Хамелеон, Ядерные Оперативники"
+  components:
+  - type: ShowSyndicateIcons
+  - type: ShowSecurityIcons
 
 - type: entity
   parent: ClothingEyesBase

Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml

@@ -61,6 +61,7 @@
   - type: TemperatureProtection
     coefficient: 0.005
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Engineering Hardsuit
 - type: entity
@@ -80,6 +81,7 @@
     highPressureMultiplier: 0.1
     lowPressureMultiplier: 1000
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Spationaut Hardsuit
 - type: entity
@@ -183,6 +185,7 @@
         Piercing: 0.9
         Heat: 0.9
   - type: FlashImmunity # WD edit
+  - type: FlashSoundSuppression # WD edit
 
 #Brigmedic Hardsuit
 - type: entity
@@ -210,6 +213,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.6
     lowPressureMultiplier: 1000
+  - type: FlashImmunity # WD edit
+  - type: FlashSoundSuppression # WD edit
 
 #Warden's Hardsuit
 - type: entity
@@ -236,6 +241,7 @@
         Piercing: 0.9
         Heat: 0.9
   - type: FlashImmunity # WD edit
+  - type: FlashSoundSuppression # WD edit
 
 #Captain's Hardsuit
 - type: entity
@@ -252,6 +258,8 @@
   - type: PressureProtection
     highPressureMultiplier: 0.3
     lowPressureMultiplier: 1000
+  - type: FlashImmunity # WD edit
+  - type: FlashSoundSuppression # WD edit
 
 #Inspector's Hardsuit
 - type: entity
@@ -287,6 +295,7 @@
     highPressureMultiplier: 0.08
     lowPressureMultiplier: 1000
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Chief Medical Officer's Hardsuit
 - type: entity
@@ -349,6 +358,7 @@
         Piercing: 0.9
         Heat: 0.9
   - type: FlashImmunity
+  - type: FlashSoundSuppression
 
 #Luxury Mining Hardsuit
 - type: entity
@@ -368,6 +378,7 @@
   - type: PointLight
     radius: 7
     energy: 3
+  - type: EyeProtection # WD edit
 
 #Head of Personnel's Hardsuit WD
 - type: entity
@@ -410,8 +421,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Blood-red Medic Hardsuit
 - type: entity
@@ -437,8 +448,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Syndicate Elite Hardsuit
 - type: entity
@@ -466,8 +477,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Syndicate Commander Hardsuit
 - type: entity
@@ -493,8 +504,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Cybersun Juggernaut Hardsuit
 - type: entity
@@ -518,8 +529,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Wizard Hardsuit
 - type: entity
@@ -546,8 +557,6 @@
         Piercing: 0.9
         Heat: 0.9
   - type: WizardClothes
-  - type: FlashImmunity
-  - type: EyeProtection
 
 #Organic Space Suit
 - type: entity
@@ -621,8 +630,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #ERT Chaplain Hardsuit
 - type: entity
@@ -660,8 +669,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #ERT Medical Hardsuit
 - type: entity
@@ -677,8 +686,8 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertmedical.rsi
   - type: PointLight
     color: "#adffec"
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #ERT Security Hardsuit
 - type: entity
@@ -701,8 +710,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #ERT Janitor Hardsuit
 - type: entity
@@ -718,8 +727,8 @@
     sprite: Clothing/Head/Hardsuits/ERThelmets/ertjanitor.rsi
   - type: PointLight
     color: "#cbadff"
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #CBURN Hardsuit
 - type: entity
@@ -759,8 +768,8 @@
         Slash: 0.9
         Piercing: 0.9
         Heat: 0.9
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
 
 #Deathsquad Hardsuit
 - type: entity
@@ -786,8 +795,8 @@
         Heat: 0.80
         Radiation: 0.80
         Caustic: 0.95
-  - type: FlashImmunity # WD edit
   - type: EyeProtection # WD edit
+  - type: FlashImmunity # WD
   - type: ShowHealthBars
     damageContainers:
     - Biological
@@ -798,6 +807,7 @@
   - type: ClothingGrantComponent
     component:
     - type: NightVision
+    - type: ThermalVision
 
 #MISC. HARDSUITS
 #Clown Hardsuit

Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml

@@ -20,6 +20,15 @@
   - type: StealTarget
     stealGroup: HeadCloak
 
+- type: entity # WD
+  parent: ClothingNeckCloakCap
+  id: ClothingNeckCloakCapLuxurious
+  name: captain's cloak
+  description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Neck/Cloaks/cap.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakHos
@@ -42,6 +51,15 @@
   - type: StealTarget
     stealGroup: HeadCloak
 
+- type: entity # WD
+  parent: ClothingNeckCloakCe
+  id: ClothingNeckCloakCeLuxurious
+  name: chief engineer's cloak
+  description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Neck/Cloaks/ce.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingCloakCmo
@@ -64,6 +82,15 @@
   - type: StealTarget
     stealGroup: HeadCloak
 
+- type: entity # WD
+  parent: ClothingNeckCloakRd
+  id: ClothingNeckCloakRdLuxurious
+  name: research director's cloak
+  description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology.
+  components:
+  - type: Sprite
+    sprite: White/Clothing/Neck/Cloaks/rd.rsi
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckCloakQm

Resources/Prototypes/Entities/Markers/Spawners/Random/salvage.yml

@@ -47,7 +47,7 @@
     - type: Sprite
       layers:
         - state: red
-        - sprite: Structures/Storage/canister.rsi
+        - sprite: White/Structures/Storage/canister.rsi
           state: blue
     - type: RandomSpawner
       rarePrototypes:

Resources/Prototypes/Entities/Markers/Spawners/techspawner.yml

@@ -601,6 +601,7 @@
         - ExGrenade
         - SyndieMiniBomb
         - ClothingEyesNightVisionGogglesSyndie
+        - ClothingEyesGlassesThermalSyndie
         - ClothingOuterVestWeb
         - ClothingBackpackChameleonFill
         - CigPackSyndicate

Resources/Prototypes/Entities/Mobs/NPCs/carp.yml

@@ -84,7 +84,8 @@
         path: /Audio/Effects/bite.ogg
     - type: Penetrated
     - type: NightVision
-      toggleSound: null
+      activateSound: null
+      deactivateSound: null
       color: "#404040"
     - type: Tool
       speed: 2

Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml

@@ -121,7 +121,8 @@
     attributes:
       gender: male
   - type: NightVision
-    toggleSound: null
+    activateSound: null
+    deactivateSound: null
     color: "#404040"
   - type: GlobalAntagonist
     antagonistPrototype: globalAntagonistRats

Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml

@@ -124,7 +124,8 @@
   - type: Speech
     speechVerb: LargeMob
   - type: NightVision
-    toggleSound: null
+    activateSound: null
+    deactivateSound: null
     color: "#404040"
 
 - type: entity

Resources/Prototypes/Entities/Mobs/Player/dragon.yml

@@ -131,7 +131,8 @@
     - CannotSuicide
     - DoorBumpOpener
   - type: NightVision
-    toggleSound: null
+    activateSound: null
+    deactivateSound: null
     color: "#404040"
   - type: Tool
     speed: 3

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml

@@ -4,6 +4,8 @@
   id: DrinkCanBaseFull
   abstract: true
   components:
+  - type: Item
+    size: Tiny
   - type: Drink
   - type: Openable
   - type: Shakeable

Resources/Prototypes/Entities/Objects/Devices/pinpointer.yml

@@ -63,6 +63,26 @@
   - type: Pinpointer
     component: NukeDisk
     targetName: nuclear authentication disk
+    updateTargetName: true
+
+  - type: MultiplePinpointer
+    modes:
+    - Off
+    - NukeDisk
+    - NuclearBombSyndicate
+    - NukeOpsShuttle
+
+- type: entity
+  parent: PinpointerSyndicateNuclear
+  id: PinpointerStationNuclear
+  suffix: Station bomb
+  components:
+  - type: MultiplePinpointer
+    modes:
+    - Off
+    - NukeDisk
+    - Nuke
+    - NukeOpsShuttle
 
 - type: entity
   name: universal pinpointer

Resources/Prototypes/Entities/Objects/Misc/paper.yml

@@ -303,6 +303,7 @@
   suffix: Station Only
   components:
   - type: NukeCodePaper
+    allNukesAvailable: false
 
 - type: entity
   name: pen

Resources/Prototypes/Entities/Objects/Tools/gps.yml

@@ -11,6 +11,7 @@
     - state: active
   - type: Item
     sprite: Objects/Devices/gps.rsi
+    size: Tiny
   - type: HandheldGPS
   - type: Tag
     tags:

Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml

@@ -67,6 +67,7 @@
     sprite: Objects/Weapons/Grenades/flashbang.rsi
   - type: FlashOnTrigger
     range: 7
+    forceStun: true # WD
   - type: SoundOnTrigger
     sound:
       path: "/Audio/Effects/flash_bang.ogg"
@@ -350,7 +351,7 @@
   parent: GrenadeBase
   id: SmokeGrenade
   name: smoke grenade
-  description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. 
+  description: A tactical grenade that releases a large, long-lasting cloud of smoke when used.
   components:
   - type: Sprite
     sprite: Objects/Weapons/Grenades/smoke.rsi

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -138,8 +138,8 @@
         shader: unshaded
     - type: Flash
     - type: LimitedCharges
-      maxCharges: 5
-      charges: 5
+      maxCharges: 7
+      charges: 7
     - type: MeleeWeapon
       canHeavyAttack: false
       wideAnimationRotation: 180
@@ -148,7 +148,7 @@
           Blunt: 0 # melee weapon to allow flashing individual targets
       angle: 10
     - type: Item
-      size: Small
+      size: Tiny
       sprite: Objects/Weapons/Melee/flash.rsi
     - type: UseDelay
     - type: StaticPrice

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

@@ -344,6 +344,7 @@
       - FauxTileAstroSnow
       - OreBagOfHolding
       - ClothingEyesNightVisionGoggles # WD EDIT
+      - ClothingEyesGlassesThermal # WD EDIT
       - KitchenKnife # WD EDIT
       - ButchCleaver # WD EDIT
       - WeaponTempGun # WD EDIT

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

@@ -94,6 +94,15 @@
   - type: Physics
     bodyType: Dynamic
 
+- type: entity
+  parent: NuclearBombUnanchored
+  id: NuclearBombSyndicate
+  suffix: syndicate
+  components:
+  - type: NuclearBombSyndicate
+  - type: NukeLabel
+    prefix: nuke-label-syndicate
+
 - type: entity
   parent: StorageTank
   id: NuclearBombKeg

Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml

@@ -9,7 +9,7 @@
     - type: Transform
       noRot: true
     - type: Sprite
-      sprite: Structures/Storage/canister.rsi
+      sprite: White/Structures/Storage/canister.rsi
       noRot: true
       layers:
         - state: grey

Resources/Prototypes/Loadouts/Jobs/Command/captain.yml

@@ -73,6 +73,14 @@
   equipment:
     neck: ClothingNeckCloakCapFormal
 
+- type: itemLoadout # WD
+  id: CaptainCloakLuxurious
+  equipment: CaptainCloakLuxurious
+- type: startingGear
+  id: CaptainCloakLuxurious
+  equipment:
+    neck: ClothingNeckCloakCapLuxurious
+
 - type: itemLoadout
   id: CaptainMantle
   equipment: CaptainMantle

Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml

@@ -59,6 +59,14 @@
   equipment:
     neck: ClothingNeckCloakCe
 
+- type: itemLoadout # WD
+  id: ChiefEngineerCloakLuxurious
+  equipment: ChiefEngineerCloakLuxurious
+- type: startingGear
+  id: ChiefEngineerCloakLuxurious
+  equipment:
+    neck: ClothingNeckCloakCeLuxurious
+
 - type: itemLoadout
   id: ChiefEngineerMantle
   equipment: ChiefEngineerMantle

Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml

@@ -24,6 +24,14 @@
   equipment:
     neck: ClothingNeckCloakRd
 
+- type: itemLoadout # WD
+  id: ResearchDirectorCloakLuxurious
+  equipment: ResearchDirectorCloakLuxurious
+- type: startingGear
+  id: ResearchDirectorCloakLuxurious
+  equipment:
+    neck: ClothingNeckCloakRdLuxurious
+
 # Jumpsuit
 - type: itemLoadout
   id: ResearchDirectorJumpsuit

Resources/Prototypes/Loadouts/Jobs/Security/common.yml

@@ -22,6 +22,14 @@
   equipment: SecurityCommandHeadset
 - type: startingGear
   id: SecurityCommandHeadset
+  equipment:
+    ears: ClothingHeadsetAltSecurityCommand
+
+- type: itemLoadout
+  id: SecurityHeadsetFull
+  equipment: SecurityHeadsetFull
+- type: startingGear
+  id: SecurityHeadsetFull
   equipment:
     ears: ClothingHeadsetAltSecurity
 

Resources/Prototypes/Loadouts/loadout_groups.yml

@@ -56,6 +56,7 @@
   loadouts:
   - CaptainCloak
   - CaptainCloakFormal
+  - CaptainCloakLuxurious # WD
   - CaptainMantle
 
 - type: loadoutGroup
@@ -161,7 +162,6 @@
   id: CommonCommandHeadset
   name: loadout-group-ears
   loadouts:
-  - CommandHeadset
   - CommandHeadsetAlt
 
 # Civilian
@@ -767,7 +767,6 @@
   id: QuartermasterHeadset
   name: loadout-group-ears
   loadouts:
-  - QuartermasterHeadset
   - QuartermasterHeadsetAlt
 
 - type: loadoutGroup
@@ -985,9 +984,17 @@
   id: ChiefEngineerHeadset
   name: loadout-group-ears
   loadouts:
-  - ChiefEngineerHeadset
   - ChiefEngineerHeadsetAlt
 
+- type: loadoutGroup
+  id: ChiefEngineerNeck
+  name: loadout-group-neck
+  minLimit: 0
+  loadouts:
+  - ChiefEngineerCloak
+  - ChiefEngineerCloakLuxurious # WD
+  - ChiefEngineerMantle
+
 - type: loadoutGroup
   id: ChiefEngineerJumpsuit
   name: loadout-group-jumpsuit
@@ -1006,14 +1013,6 @@
   - ChiefEngineerDuffel
   - CommonSatchelLeather # WD
 
-- type: loadoutGroup
-  id: ChiefEngineerNeck
-  name: loadout-group-neck
-  minLimit: 0
-  loadouts:
-  - ChiefEngineerCloak
-  - ChiefEngineerMantle
-
 - type: loadoutGroup
   id: ChiefEngineerOuterClothing
   name: loadout-group-outerclothing
@@ -1180,6 +1179,7 @@
   loadouts:
   - ResearchDirectorMantle
   - ResearchDirectorCloak
+  - ResearchDirectorCloakLuxurious # WD
 
 - type: loadoutGroup
   id: ResearchDirectorJumpsuit
@@ -1224,7 +1224,6 @@
   id: ResearchDirectorHeadset
   name: loadout-group-ears
   loadouts:
-  - ResearchDirectorHeadset
   - ResearchDirectorHeadsetAlt
 
 - type: loadoutGroup
@@ -1604,6 +1603,12 @@
   loadouts:
   - SecurityCommandHeadset
 
+- type: loadoutGroup # WD
+  id: CommonSecurityHeadsetFull
+  name: loadout-group-ears
+  loadouts:
+  - SecurityHeadsetFull
+
 - type: loadoutGroup
   id: CommonSecurityBackpack
   name: loadout-group-backpack
@@ -1636,10 +1641,9 @@
   - CowboyWhite
 
 - type: loadoutGroup # WD
-  id: ChiefMedicalOfficerEars
+  id: ChiefMedicalOfficerHeadset
   name: loadout-group-ears
   loadouts:
-  - CMOHeadset
   - CMOHeadsetAlt
 
 - type: loadoutGroup
@@ -2029,9 +2033,7 @@
   id: InspectorBackpack
   name: loadout-group-backpack
   loadouts:
-  - InspectorBackpack
   - InspectorSatchel
-  - InspectorDuffel
   - CommonSatchelLeather
 
 - type: loadoutGroup # WD

Resources/Prototypes/Loadouts/role_loadouts.yml

@@ -385,7 +385,7 @@
   id: JobWarden
   groups:
   - WardenHead
-  - CommonSecurityCommandHeadset # WD
+  - CommonSecurityHeadsetFull # WD
   - CommonSecurityCommandMask # WD
   - CommonSecurityNeck
   - WardenJumpsuit
@@ -399,7 +399,7 @@
   id: JobSeniorOfficer
   groups:
   - CommonSecurityHead
-  - CommonSecurityHeadset # WD
+  - CommonSecurityHeadsetFull # WD
   - CommonSecurityCommandMask # WD
   - CommonSecurityNeck
   - SeniorOfficerJumpsuit
@@ -414,7 +414,7 @@
   id: JobSecurityOfficer
   groups:
   - CommonSecurityHead
-  - CommonSecurityHeadset # WD
+  - CommonSecurityHeadsetFull # WD
   - CommonSecurityMask # WD
   - CommonSecurityNeck # WD
   - SecurityJumpsuit
@@ -430,7 +430,7 @@
   id: JobDetective
   groups:
   - DetectiveHead
-  - CommonSecurityHeadset # WD
+  - CommonSecurityHeadsetFull # WD
   - CommonMaskCigarette # WD
   - CommonSecurityNeck
   - DetectiveJumpsuit
@@ -445,7 +445,7 @@
   id: JobSecurityCadet
   groups:
   - CommonSecurityHead
-  - CommonSecurityHeadset # WD
+  - CommonSecurityHeadsetFull # WD
   - CommonSecurityNeck
   - SecurityCadetJumpsuit
   - CommonSecurityBackpack
@@ -459,7 +459,7 @@
   id: JobChiefMedicalOfficer
   groups:
   - ChiefMedicalOfficerHead
-  - ChiefMedicalOfficerEars # WD
+  - ChiefMedicalOfficerHeadset # WD
   - CommonMedicalMask # WD
   - ChiefMedicalOfficerNeck
   - ChiefMedicalOfficerJumpsuit

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -153,6 +153,8 @@
           prob: 0.5
         - proto: ClothingEyesNightVisionGoggles
           cost: 8
+        - proto: ClothingEyesGlassesThermal
+          cost: 8
         - proto: ClothingHandsGlovesCombat
           cost: 3
         - proto: Katana

Resources/Prototypes/Reagents/Consumable/Drink/juice.yml

@@ -116,6 +116,7 @@
   physicalDesc: reagent-physical-desc-saucey
   flavor: tomato
   color: "#731008"
+  slippery: false
 
 - type: reagent
   id: JuiceWatermelon

Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml

@@ -42,4 +42,4 @@
     back: ClothingBackpackQuartermasterFilled
     shoes: ClothingShoesColorBrown
     id: QuartermasterPDA
-    ears: ClothingHeadsetQM
+    ears: ClothingHeadsetAltCargo

Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml

@@ -43,4 +43,4 @@
     back: ClothingBackpackChiefEngineerFilled
     shoes: ClothingShoesColorBrown
     id: CEPDA
-    ears: ClothingHeadsetCE
+    ears: ClothingHeadsetAltEngineering

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

@@ -145,7 +145,7 @@
   id: SyndicateLoneOperativeGearFull
   equipment:
     jumpsuit: ClothingUniformJumpsuitOperative
-    back: ClothingBackpackDuffelSyndicateOperative
+    back: ClothingBackpackDuffelSyndicateLonelyOperative
     mask: ClothingMaskGasSyndicate
     eyes: ClothingEyesHudSyndicate
     ears: ClothingHeadsetAltSyndicate

Resources/Prototypes/Roles/Jobs/Justice/inspector.yml

@@ -28,6 +28,6 @@
     back: ClothingBackpackFilled
     shoes: ClothingShoesBootsInspector
     id: InspectorPDA
-    ears: ClothingHeadsetAltSecurity
+    ears: ClothingHeadsetAltSecurityCommand
   inhand:
     - BriefcaseBrownFilled

Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml

@@ -40,4 +40,4 @@
     back: ClothingBackpackCMOFilled
     shoes: ClothingShoesColorBrown
     id: CMOPDA
-    ears: ClothingHeadsetCMO
+    ears: ClothingHeadsetAltMedical

Resources/Prototypes/Roles/Jobs/Science/research_director.yml

@@ -37,4 +37,4 @@
     back: ClothingBackpackResearchDirectorFilled
     shoes: ClothingShoesColorBrown
     id: RnDPDA
-    ears: ClothingHeadsetRD
+    ears: ClothingHeadsetAltScience

Resources/Prototypes/Roles/Jobs/Security/detective.yml

@@ -31,4 +31,4 @@
     back: ClothingBackpackSecurityFilledDetective
     shoes: ClothingShoesBootsCombatFilled
     id: DetectivePDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetAltSecurity

Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml

@@ -45,4 +45,4 @@
     back: ClothingBackpackHOSFilled
     shoes: ClothingShoesBootsCombatFilled
     id: HoSPDA
-    ears: ClothingHeadsetAltSecurity
+    ears: ClothingHeadsetAltSecurityCommand

Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml

@@ -33,5 +33,5 @@
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
     id: SecurityCadetPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetAltSecurity
     pocket1: BookSecurity

Resources/Prototypes/Roles/Jobs/Security/security_officer.yml

@@ -30,4 +30,4 @@
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
     id: SecurityPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetAltSecurity

Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml

@@ -39,4 +39,4 @@
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
     id: SeniorOfficerPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetAltSecurity

Resources/Prototypes/Roles/Jobs/Security/warden.yml

@@ -32,4 +32,4 @@
     back: ClothingBackpackSecurityFilled
     shoes: ClothingShoesBootsCombatFilled
     id: WardenPDA
-    ears: ClothingHeadsetSecurity
+    ears: ClothingHeadsetAltSecurity

Resources/Prototypes/_White/Actions/types.yml

@@ -38,10 +38,24 @@
     itemIconStyle: BigAction
     priority: -20
     icon:
-      sprite: White/Clothing/Head/nightvision.rsi
+      sprite: White/Clothing/Eyes/Glasses/nightvision.rsi
       state: icon
     event: !type:ToggleNightVisionEvent
 
+- type: entity
+  id: ToggleThermalVision
+  name: Toggle thermal vision.
+  description: Toggles thermal vision.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    itemIconStyle: BigAction
+    priority: -20
+    icon:
+      sprite: White/Clothing/Eyes/Glasses/thermal.rsi
+      state: icon
+    event: !type:ToggleThermalVisionEvent
+
 - type: entity
   id: ToggleBodyCamera
   name: Toggle body camera.

Resources/Prototypes/_White/Catalog/uplink.yml

@@ -108,7 +108,7 @@
   name: uplink-night-vision-name
   description: uplink-night-vision-desc
   productEntity: ClothingEyesNightVisionGogglesSyndie
-  icon: { sprite: White/Clothing/Head/nightvision.rsi, state: icon }
+  icon: { sprite: White/Clothing/Eyes/Glasses/nightvision.rsi, state: icon }
   cost:
     Telecrystal: 3
   categories:
@@ -124,7 +124,39 @@
   name: uplink-night-vision-name
   description: uplink-night-vision-desc
   productEntity: ClothingEyesNightVisionGogglesNukie
-  icon: { sprite: White/Clothing/Head/nightvision.rsi, state: icon }
+  icon: { sprite: White/Clothing/Eyes/Glasses/nightvision.rsi, state: icon }
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    whitelist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkThermalGoggles
+  name: uplink-thermal-vision-name
+  description: uplink-thermal-vision-desc
+  productEntity: ClothingEyesGlassesThermalSyndie
+  icon: { sprite: White/Clothing/Eyes/Glasses/thermal.rsi, state: icon }
+  cost:
+    Telecrystal: 3
+  categories:
+  - UplinkWearables
+  conditions:
+  - !type:StoreWhitelistCondition
+    blacklist:
+      tags:
+      - NukeOpsUplink
+
+- type: listing
+  id: UplinkThermalGogglesNukie
+  name: uplink-thermal-vision-name
+  description: uplink-thermal-vision-desc
+  productEntity: ClothingEyesGlassesThermalNukie
+  icon: { sprite: White/Clothing/Eyes/Glasses/thermal.rsi, state: icon }
   cost:
     Telecrystal: 3
   categories:

Resources/Prototypes/_White/Entities/Clothing/Head/night_vision_goggle.yml

@@ -6,9 +6,9 @@
   description: Теперь ты видишь во тьме!
   components:
   - type: Sprite
-    sprite: White/Clothing/Head/nightvision.rsi
+    sprite: White/Clothing/Eyes/Glasses/nightvision.rsi
   - type: Clothing
-    sprite: White/Clothing/Head/nightvision.rsi
+    sprite: White/Clothing/Eyes/Glasses/nightvision.rsi
   - type: ClothingGrantComponent
     component:
     - type: NightVision

Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml

@@ -41,7 +41,8 @@
       component:
       - type: NightVision
         toggleAction: null
-        toggleSound: null
+        activateSound: null
+        deactivateSound: null
         color: White
     - type: ShowHealthBars
       damageContainers:

Resources/Prototypes/_White/Entities/Cult/constructs.yml

@@ -64,7 +64,8 @@
     - type: ShowCultHud
     - type: IsDeadIC
     - type: NightVision
-      toggleSound: null
+      activateSound: null
+      deactivateSound: null
       color: White
     - type: ShowHealthBars
       damageContainers:

Resources/Prototypes/_White/Recipes/lathe_recipes.yml

@@ -22,6 +22,16 @@
     Silver: 100
     Gold: 100
 
+- type: latheRecipe
+  id: ClothingEyesGlassesThermal
+  result: ClothingEyesGlassesThermal
+  completetime: 2
+  materials:
+    Steel: 200
+    Glass: 100
+    Silver: 100
+    Gold: 100
+
 - type: latheRecipe
   id: WeaponTempGun
   result: WeaponTempGun

Resources/Prototypes/_White/Research/experimental.yml

@@ -3,10 +3,22 @@
   id: NightVisionTech
   name: research-technology-night-vision
   icon:
-    sprite: White/Clothing/Head/nightvision.rsi
+    sprite: White/Clothing/Eyes/Glasses/nightvision.rsi
     state: icon
   discipline: Experimental
   tier: 2
   cost: 10000
   recipeUnlocks:
   - ClothingEyesNightVisionGoggles
+
+- type: technology
+  id: ThermalVisionTech
+  name: research-technology-thermal-vision
+  icon:
+    sprite: White/Clothing/Eyes/Glasses/thermal.rsi
+    state: icon
+  discipline: Experimental
+  tier: 2
+  cost: 10000
+  recipeUnlocks:
+  - ClothingEyesGlassesThermal

Resources/Textures/White/Clothing/Eyes/Glasses/nightvision.rsi/meta.json

@@ -0,0 +1,48 @@
+{
+  "version": 1,
+  "license": null,
+  "copyright": null,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "equipped-EYES",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "equipped-EYES-off",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Neck/Cloaks/cap.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, colors edited by Skarletto (github)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Neck/Cloaks/ce.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Clothing/Neck/Cloaks/rd.rsi/meta.json

@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}