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

2024-03-11 11:21:24 +03:00
parent 95054e072a 8878280b17
commit d6aa8ac5be
287 changed files with 4801 additions and 1247 deletions
--- a/Resources/Audio/Machines/attributions.yml
+++ b/Resources/Audio/Machines/attributions.yml
@@ -152,3 +152,23 @@
  license: "CC0-1.0"
  copyright: "dakamakat on freesound.org"
  source: "https://freesound.org/people/Dakamakat/sounds/717370/"
+
+- files: ["energyshield_up.ogg"]
+  license: "CC0-1.0"
+  copyright: "unfa on freesound.org"
+  source: "https://freesound.org/people/unfa/sounds/584173/"
+
+- files: ["energyshield_down.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "SilverIllusionist on freesound.org"
+  source: "https://freesound.org/people/SilverIllusionist/sounds/673556/"
+
+- files: ["energyshield_ambient.ogg"]
+  license: "CC0-1.0"
+  copyright: "julianmateo_ on freesound.org"
+  source: "https://freesound.org/people/julianmateo_/sounds/524165/"
+
+- files: ["energyshield_parry.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Robinhood76 on freesound.org"
+  source: "https://freesound.org/people/Robinhood76/sounds/107613/"
--- a/Resources/Audio/Machines/energyshield_ambient.ogg
+++ b/Resources/Audio/Machines/energyshield_ambient.ogg
--- a/Resources/Audio/Machines/energyshield_down.ogg
+++ b/Resources/Audio/Machines/energyshield_down.ogg
--- a/Resources/Audio/Machines/energyshield_parry.ogg
+++ b/Resources/Audio/Machines/energyshield_parry.ogg
--- a/Resources/Audio/Machines/energyshield_up.ogg
+++ b/Resources/Audio/Machines/energyshield_up.ogg
--- a/Resources/Audio/White/Items/scroll/after_use.ogg
+++ b/Resources/Audio/White/Items/scroll/after_use.ogg
--- a/Resources/Audio/White/Items/scroll/use.ogg
+++ b/Resources/Audio/White/Items/scroll/use.ogg
--- a/Resources/Audio/White/Magic/Arc/cast.ogg
+++ b/Resources/Audio/White/Magic/Arc/cast.ogg
--- a/Resources/Audio/White/Magic/Arc/charge.ogg
+++ b/Resources/Audio/White/Magic/Arc/charge.ogg
--- a/Resources/Audio/White/Magic/Arc/max.ogg
+++ b/Resources/Audio/White/Magic/Arc/max.ogg
--- a/Resources/Audio/White/Magic/Cards/cast.ogg
+++ b/Resources/Audio/White/Magic/Cards/cast.ogg
--- a/Resources/Audio/White/Magic/Cards/charge.ogg
+++ b/Resources/Audio/White/Magic/Cards/charge.ogg
--- a/Resources/Audio/White/Magic/Cards/max.ogg
+++ b/Resources/Audio/White/Magic/Cards/max.ogg
--- a/Resources/Audio/White/Magic/Force/cast.ogg
+++ b/Resources/Audio/White/Magic/Force/cast.ogg
--- a/Resources/Audio/White/Magic/Force/charge.ogg
+++ b/Resources/Audio/White/Magic/Force/charge.ogg
--- a/Resources/Audio/White/Magic/Force/max.ogg
+++ b/Resources/Audio/White/Magic/Force/max.ogg
--- a/Resources/Audio/White/Magic/chargingfallback.ogg
+++ b/Resources/Audio/White/Magic/chargingfallback.ogg
--- a/Resources/Audio/White/Magic/maxchargefallback.ogg
+++ b/Resources/Audio/White/Magic/maxchargefallback.ogg
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1914,3 +1914,260 @@
  id: 177
  time: '2024-03-02T14:17:52.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/152
+- author: Aviu
+  changes:
+  - message: "\u0411\u0417 \u0442\u0435\u043F\u0435\u0440\u044C \u0443\u0441\u044B\
+      \u043F\u043B\u044F\u0435\u0442 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\
+      \u043E\u0432."
+    type: Add
+  - message: "\u041D\u0438\u0442\u0440\u0438\u0443\u043C \u0441\u043D\u043E\u0432\u0430\
+      \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442."
+    type: Fix
+  id: 178
+  time: '2024-03-03T08:09:04.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/167
+- author: ThereDrD
+  changes:
+  - message: "\u0424\u0438\u043A\u0441 \u043F\u0443\u0441\u0442\u044B\u0445 \u0441\
+      \u0442\u0440\u043E\u0447\u0435\u043A \u0432\u043C\u0435\u0441\u0442\u043E \u043F\
+      \u043E\u043F\u0430\u043F\u043E\u0432"
+    type: Fix
+  - message: "\u0424\u0438\u043A\u0441 \u043F\u0440\u043E\u043F\u0430\u0432\u0448\u0438\
+      \u0445 \u043F\u043E\u043F\u0430\u043F\u043E\u0432"
+    type: Fix
+  id: 179
+  time: '2024-03-04T06:56:23.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/176
+- author: Aviu
+  changes:
+  - message: "\u0422\u041A \u0437\u0430 \u0432\u043E\u0439\u043D\u0443 20 -> 30."
+    type: Tweak
+  - message: "\u041A\u043E\u0441\u0430 \u0436\u043D\u0435\u0446\u0430: \u0443\u0440\
+      \u043E\u043D 27 -> 24."
+    type: Tweak
+  - message: "\u041F\u043E\u0441\u043E\u0445 \u043C\u043E\u043D\u0430\u0445\u0430\
+      : \u0443\u0440\u043E\u043D 20 -> 18."
+    type: Tweak
+  - message: "\u041D\u0435\u0447\u0435\u0441\u0442\u0438\u0432\u044B\u0435 \u0432\u0438\
+      \u043B\u044B: \u0443\u0440\u043E\u043D 25 -> 24."
+    type: Tweak
+  - message: "\u0413\u0438\u043F\u0435\u0440\u0438\u043D\u0441\u0442\u0440\u0443\u043C\
+      \u0435\u043D\u0442: \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0430\u0442\
+      \u0430\u043A\u0438 0.75 -> 1, \u0443\u0440\u043E\u043D \u043F\u043E \u0441\u0442\
+      \u0430\u043C\u0438\u043D\u0435 60 -> 40."
+    type: Tweak
+  - message: "\u0423 \u0432\u043D\u0435\u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\
+      \u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0433\u043E \u043A\u043B\u0438\u043D\
+      \u043A\u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0430\u0435\u0442\u0441\u044F\
+      \ \u0443\u0440\u043E\u043D \u0441 \u041F\u041A\u041C \u0430\u0442\u0430\u043A\
+      \u0438, \u043A\u0430\u043A \u0438 \u0443 \u043E\u0441\u0442\u0430\u043B\u044C\
+      \u043D\u044B\u0445 \u043E\u0440\u0443\u0436\u0438\u0439."
+    type: Tweak
+  - message: "\u0413\u043B\u0443\u0448\u0438\u043B\u043A\u0430 \u0440\u0430\u0434\u0438\
+      \u043E: \u0446\u0435\u043D\u0430 4 -> 2."
+    type: Tweak
+  - message: "\u0421\u0432\u0438\u043D\u0446\u043E\u0432\u044B\u0435 \u0431\u043E\u043A\
+      \u0441\u0435\u0440\u0441\u043A\u0438\u0435 \u043F\u0435\u0440\u0447\u0430\u0442\
+      \u043A\u0438: \u0443\u0440\u043E\u043D 8 -> 10, \u0443\u0440\u043E\u043D \u043F\
+      \u043E \u0441\u0442\u0430\u043C\u0438\u043D\u0435 25 -> 30, \u0441\u043A\u043E\
+      \u0440\u043E\u0441\u0442\u044C \u0430\u0442\u0430\u043A\u0438 1.4 -> 1.5."
+    type: Tweak
+  - message: "\u0421\u0435\u0442\u0447\u0430\u0442\u044B\u0439 \u0436\u0438\u043B\u0435\
+      \u0442: \u0440\u0435\u0437\u0438\u0441\u0442 \u043A \u043F\u0440\u043E\u043D\
+      \u0438\u043A\u0430\u044E\u0449\u0435\u043C\u0443 \u0443\u0440\u043E\u043D\u0443\
+      \ 70 -> 60, \u043A \u0442\u0435\u043F\u043B\u043E\u0432\u043E\u043C\u0443 10\
+      \ -> 20."
+    type: Tweak
+  - message: "\u0421\u0442\u0430\u043D\u043F\u0440\u043E\u0434 \u0438 \u0441\u043D\
+      \u0430\u0442\u0447\u0435\u0440\u043F\u0440\u043E\u0434: \u0443\u0440\u043E\u043D\
+      \ \u043F\u043E \u0441\u0442\u0430\u043C\u0438\u043D\u0435 30 -> 40."
+    type: Tweak
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u043A\u0440\u0430\u0444\u0442\
+      \ \u0441\u0442\u0430\u043D\u043F\u0440\u043E\u0434\u0430 \u0438 \u0441\u043D\
+      \u0430\u0442\u0447\u0435\u0440\u043F\u0440\u043E\u0434\u0430, \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043D\u0443\u0436\u043D\u043E \u043A\u043B\u0438\u043A\u043D\
+      \u0443\u0442\u044C \u0441\u0442\u0435\u0440\u0436\u043D\u044F\u043C\u0438 \u043F\
+      \u043E \u0441\u0442\u044F\u0436\u043A\u0430\u043C, \u0434\u043E\u0431\u0430\u0432\
+      \u0438\u0442\u044C \u0438\u0433\u043D\u0438\u0442\u0435\u0440 \u0438 \u043A\u043E\
+      \u043D\u0434\u0435\u043D\u0441\u0430\u0442\u043E\u0440/\u0442\u0435\u043B\u0435\
+      \u043A\u0440\u0438\u0441\u0442\u0430\u043B\u043B."
+    type: Tweak
+  - message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D \u043A\u0440\u0430\
+      \u0444\u0442 \u0441\u0442\u0430\u043D\u043F\u0440\u043E\u0434\u0430 \u0432 \u043C\
+      \u0435\u043D\u044E \u043A\u0440\u0430\u0444\u0442\u0430."
+    type: Tweak
+  - message: "\u0412 \u0432\u0435\u043D\u0434\u043E\u043C\u0430\u0442\u0435 \u0442\
+      \u0435\u043F\u0435\u0440\u044C 5 \u0438\u0433\u043D\u0438\u0442\u0435\u0440\u043E\
+      \u0432 \u0438 4 \u043F\u0435\u0440\u0435\u0434\u0430\u0442\u0447\u0438\u043A\
+      \u0430 \u0441\u0438\u0433\u043D\u0430\u043B\u0430."
+    type: Tweak
+  id: 180
+  time: '2024-03-04T07:02:16.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/170
+- author: Aviu
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043F\u0440\u043E\u0434\
+      \u0432\u0438\u043D\u0443\u0442\u044B\u0439 \u0438\u043C\u043F\u043B\u0430\u043D\
+      \u0442\u0435\u0440 \u0432 \u0430\u043F\u043B\u0438\u043D\u043A."
+    type: Add
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0432\u0440\u0435\
+      \u043C\u044F \u0432\u043A\u0430\u043B\u044B\u0432\u0430\u043D\u0438\u044F \u0438\
+      \u043C\u043F\u043B\u0430\u043D\u0442\u043E\u0432 \u0441\u0438\u043D\u0434\u0438\
+      \u043A\u0430\u0442\u0430 5s -> 2s."
+    type: Tweak
+  - message: "\u0412\u0441\u0435 \u0438\u043C\u043F\u043B\u0430\u043D\u0442\u0435\u0440\
+      \u044B \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u0434\u043D\u043E\u0440\u0430\
+      \u0437\u043E\u0432\u044B\u0435, \u0442\u043E \u0435\u0441\u0442\u044C \u043B\
+      \u043E\u043C\u0430\u044E\u0442\u0441\u044F \u043F\u043E\u0441\u043B\u0435 \u0432\
+      \u043A\u0430\u043B\u044B\u0432\u0430\u043D\u0438\u044F."
+    type: Tweak
+  id: 181
+  time: '2024-03-05T18:42:07.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/171
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u043E \u0430\u0432\u0442\
+      \u043E\u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 the \u0432\
+      \ \u0440\u0443\u0441\u0441\u043A\u043E\u0439 \u043B\u043E\u043A\u0430\u043B\u0438\
+      \u0437\u0430\u0446\u0438\u0438."
+    type: Fix
+  id: 182
+  time: '2024-03-06T18:06:28.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/178
+- author: rhailrake
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0430\u043B\u044C\
+      \u0442\u0435\u0440\u043D\u0430\u0442\u0438\u0432\u043D\u044B\u0435 \u0441\u043F\
+      \u0435\u043B\u043B\u044B."
+    type: Add
+  id: 183
+  time: '2024-03-07T16:01:55.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/156
+- author: Aviu
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0431\u0440\u043E\u043D\u044F\
+      \ \u0437\u0430\u0449\u0438\u0449\u0430\u0435\u0442 \u043E\u0442 \u0440\u0435\
+      \u0437\u0438\u043D\u043E\u0432\u044B\u0445 \u043F\u0443\u043B\u044C \u043F\u0440\
+      \u043E\u043F\u043E\u0440\u0446\u0438\u043E\u043D\u0430\u043B\u044C\u043D\u043E\
+      \ \u0440\u0435\u0437\u0438\u0441\u0442\u0443 \u043E\u0442 \u0442\u0443\u043F\
+      \u043E\u0433\u043E \u0443\u0440\u043E\u043D\u0430."
+    type: Add
+  - message: "\u0423\u0440\u043E\u043D \u043F\u043E \u0441\u0442\u0430\u043C\u0438\
+      \u043D\u0435 \u0442\u0440\u0430\u0432\u043C\u0430\u0442\u0438\u0447\u0435\u0441\
+      \u043A\u0438\u0445 \u043F\u0430\u0442\u0440\u043E\u043D\u043E\u0432 \u043E\u0442\
+      \ \u0434\u0440\u043E\u0431\u043E\u0432\u0438\u043A\u0430: 40 -> 70."
+    type: Tweak
+  - message: "\u041D\u0435\u043C\u043D\u043E\u0433\u043E \u0441\u043D\u0438\u0436\u0435\
+      \u043D \u0440\u0435\u0437\u0438\u0441\u0442\u044B \u0443 \u0431\u0440\u043E\u043D\
+      \u0438 \u0441\u0432\u044F\u0449\u0435\u043D\u043D\u0438\u043A\u0430."
+    type: Tweak
+  - message: "\u0412 \u0438\u043C\u043F\u043B\u0430\u043D\u0442\u0435 \u0430\u043F\
+      \u043B\u0438\u043D\u043A\u0430 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\
+      \u0442 \u0441\u043A\u0438\u0434\u043E\u043A."
+    type: Tweak
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0431\u043E\u043B\
+      \u044B \u0432 \u0421\u0411\u0422\u0435\u0445."
+    type: Add
+  - message: "\u0412\u044B\u0441\u0442\u0440\u0435\u043B\u044B \u0442\u0435\u043C\u043F\
+      \u0435\u0440\u0430\u0442\u0443\u0440\u043D\u044B\u0445 \u043F\u0443\u0448\u0435\
+      \u043A \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u0440\u043E\u0445\
+      \u043E\u0434\u044F\u0442 \u0441\u043A\u0432\u043E\u0437\u044C \u0441\u0442\u0435\
+      \u043A\u043B\u043E."
+    type: Tweak
+  - message: "\u0423\u0434\u0432\u043E\u0435\u043D\u0430 \u0441\u043A\u043E\u0440\u043E\
+      \u0441\u0442\u044C \u0432\u043E\u0441\u0441\u0442\u0430\u043D\u043E\u0432\u043B\
+      \u0435\u043D\u0438\u044F \u0442\u0435\u043C\u043F\u0435\u0440\u0430\u0442\u0443\
+      \u0440\u044B \u0432 \u0441\u043A\u0430\u0444\u0430\u043D\u0434\u0440\u0430\u0445\
+      ."
+    type: Tweak
+  id: 184
+  time: '2024-03-08T15:35:11.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/177
+- author: Remuchi
+  changes:
+  - message: "\u0418\u043C\u043F\u043B\u0430\u043D\u0442 \u043F\u043E\u0434\u0447\u0438\
+      \u043D\u0435\u043D\u0438\u044F \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435\
+      \ \u0443\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F \u043F\u0440\u0438\
+      \ \u0434\u043E\u0441\u0442\u0430\u0432\u0430\u043D\u0438\u0438 \u043B\u044E\u0431\
+      \u043E\u0433\u043E \u0438\u043C\u043F\u043B\u0430\u043D\u0442\u0430 \u0438\u0437\
+      \ \u0442\u0435\u043B\u0430 \u0440\u0430\u0431\u0430"
+    type: Fix
+  - message: "\u0421\u043A\u0430\u043D\u0435\u0440 \u0440\u0430\u0441\u0442\u0435\u043D\
+      \u0438\u0439 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
+      \ \u043F\u043E\u043B\u043E\u0436\u0438\u0442\u044C \u0432 \u043F\u043E\u044F\
+      \u0441 \u0431\u043E\u0442\u0430\u043D\u0438\u043A\u0430"
+    type: Fix
+  - message: "\u041F\u0435\u0440\u0435\u0432\u043E\u0434 \u0432\u043A\u0443\u0441\u0430\
+      \ \u043F\u0438\u0432\u0430, \u0440\u0430\u0437\u043C\u0435\u0440\u043E\u0432\
+      \ \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u043E\u0432"
+    type: Add
+  - message: "\u041A\u043E\u0441\u043C\u0438\u0447\u0435\u0441\u043A\u0438\u0439 \u043E\
+      \u0447\u0438\u0441\u0442\u0438\u0442\u0435\u043B\u044C \u0441\u043D\u043E\u0432\
+      \u0430 \u043C\u043E\u0436\u0435\u0442 \u0441\u0442\u0438\u0440\u0430\u0442\u044C\
+      \ \u0440\u0438\u0441\u0443\u043D\u043A\u0438"
+    type: Add
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0432\u0441\u0442\u0430\u0432\u043B\u044F\u0442\u044C \u0438\u043C\u043F\u043B\
+      \u0430\u043D\u0442\u044B \u0432 \u0431\u043E\u0440\u0433\u043E\u0432 (\u043D\
+      \u0438\u043A\u0430\u043A\u0438\u0445 \u0431\u043E\u0440\u0433\u043E\u0432-\u0440\
+      \u0430\u0431\u043E\u0432)"
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0442\u043E\u043B\u044C\u043A\u043E\
+      \ \u043B\u044E\u0434\u0438 \u0441\u043F\u0430\u0432\u043D\u044F\u0442\u0441\u044F\
+      \ \u043D\u0430 \u0440\u043E\u043B\u044F\u0445 \u0426\u041A (\u041E\u0442\u0440\
+      \u044F\u0434 \u0421\u043C\u0435\u0440\u0442\u0438, \u041E\u0411\u0420, \u041F\
+      \u0440\u0435\u0434\u0441\u0442\u0430\u0432\u0438\u0442\u0435\u043B\u044C \u0426\
+      \u041A, \u0420\u0425\u0411\u0417"
+    type: Add
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\
+      \u0437\u043C\u0435\u0440\u044B \u043E\u0441\u0442\u0430\u0432\u0448\u0438\u0445\
+      \u0441\u044F \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432 (\u0441\
+      \u0442\u0435\u043A\u043B\u0430, \u0441\u0442\u0435\u0440\u0436\u043D\u0438,\
+      \ \u0441\u043B\u0438\u0442\u043A\u0438, \u043F\u043B\u0430\u0441\u0442\u0438\
+      \u043A, \u0443\u0440\u0430\u043D \u0438 \u043F\u0440\u043E\u0447\u0435\u0435\
+      )"
+    type: Tweak
+  - message: "\u0420\u0430\u0437\u043C\u0435\u0440 \u043F\u043E\u0440\u0442\u0441\u0438\
+      \u0433\u0430\u0440\u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0434\
+      \u043E 2x2"
+    type: Tweak
+  - message: "\u0423\u0434\u0430\u043B\u0435\u043D\u043E \u0434\u0435\u0439\u0441\u0442\
+      \u0432\u0438\u0435 \"\u041A\u0440\u0438\u0447\u0430\u0442\u044C\" \u0441 \u043F\
+      \u0430\u043D\u0435\u043B\u0438 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439"
+    type: Remove
+  id: 185
+  time: '2024-03-08T16:50:01.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/181
+- author: ThereDrD
+  changes:
+  - message: "\u0420\u0430\u0443\u043D\u0434\u0441\u0442\u0430\u0440\u0442\u043E\u0432\
+      \u044B\u0439 \u0438\u043D\u0432\u0435\u043D\u0442\u0430\u0440\u044C \u0440\u043E\
+      \u043B\u0435\u0439 \u043F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\
+      \u043D"
+    type: Add
+  - message: "\u0423\u0432\u0435\u043B\u0438\u0447\u0435\u043D\u043E \u043A\u043E\u043B\
+      \u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0432\u0435\u0449\u0435\u0439 \u0432\
+      \ \u0448\u043A\u0430\u0444\u0447\u0438\u043A\u0430\u0445 \u0440\u043E\u043B\u0435\
+      \u0439."
+    type: Add
+  id: 186
+  time: '2024-03-10T23:02:48.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/180
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u043E \u0441\u043E\u0434\
+      \u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u0432\u0435\u043D\u0434\u043E\u043C\
+      \u0430\u0442\u043E\u0432 \u043D\u043E\u0432\u044B\u043C\u0438 \u0442\u043E\u0432\
+      \u0430\u0440\u0430\u043C\u0438"
+    type: Add
+  id: 187
+  time: '2024-03-10T23:02:31.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/179
+- author: ThereDrD
+  changes:
+  - message: "\u0423\u0431\u0440\u0430\u043D \u043F\u043E\u043F\u0430\u043F \u0441\
+      \u043D\u0430(Zzz...)"
+    type: Remove
+  id: 188
+  time: '2024-03-10T23:07:37.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/146
--- a/Resources/Locale/en-US/EnergyDome/energydome.ftl
+++ b/Resources/Locale/en-US/EnergyDome/energydome.ftl
@@ -0,0 +1,9 @@
+energy-dome-access-denied = Access denied
+energy-dome-recharging = Recharging...
+energy-dome-no-power = Low battery
+energy-dome-no-cell = There is no power source
+
+energy-dome-on-examine-is-on-message = The energy barrier is [color=darkgreen]up[/color].
+energy-dome-on-examine-is-off-message = The energy barrier is [color=darkred]down[/color].
+
+energy-dome-verb-toggle = Toggle energy dome
--- a/Resources/Locale/en-US/actions/actions/sleep.ftl
+++ b/Resources/Locale/en-US/actions/actions/sleep.ftl
@@ -1,6 +1,5 @@
 action-name-wake = Wake up

-sleep-onomatopoeia = Zzz...
 sleep-examined = [color=lightblue]{CAPITALIZE(SUBJECT($target))} {CONJUGATE-BE($target)} asleep.[/color]

 wake-other-success = You shake {THE($target)} awake.
--- a/Resources/Locale/en-US/research/technologies.ftl
+++ b/Resources/Locale/en-US/research/technologies.ftl
@@ -32,6 +32,7 @@ research-technology-wave-particle-harnessing = Wave Particle Harnessing
 research-technology-advanced-riot-control = Advanced Riot Control
 research-technology-portable-microfusion-weaponry = Portable Microfusion Weaponry
 research-technology-experimental-battery-ammo = Experimental Battery Ammo
+research-technology-energy_barriers = Energy Barriers
 research-technology-basic-shuttle-armament = Shuttle basic armament
 research-technology-advanced-shuttle-weapon = Advanced shuttle weapons

--- a/Resources/Locale/en-US/store/uplink-catalog.ftl
+++ b/Resources/Locale/en-US/store/uplink-catalog.ftl
@@ -306,6 +306,9 @@ uplink-hardsuit-syndieelite-desc = An elite version of the blood-red hardsuit, w
 uplink-clothing-outer-hardsuit-juggernaut-name = Cybersun Juggernaut Suit
 uplink-clothing-outer-hardsuit-juggernaut-desc = Hyper resilient armor made of materials tested in the Tau chromosphere facility. The only thing that's going to be slowing you down is this suit... and tasers.

+uplink-energy-dome-name = Personal energy dome
+uplink-energy-dome-desc = A personal shield generator that protects the wearer from lasers and bullets but prevents from using ranged weapons himself. Comes with a small power cell.
+
 # Misc
 uplink-cyberpen-name = Cybersun Pen
 uplink-cyberpen-desc = Cybersun's legal department pen, invaluable for forging documents and escaping prisons. Smells vaguely of hard-light and war profiteering.
--- a/Resources/Locale/ru-RU/White/items/betrayal-dagger.ftl
+++ b/Resources/Locale/ru-RU/White/items/betrayal-dagger.ftl
@@ -0,0 +1 @@
+backstab-damage-betrayal-dagger = Удар в спину: {$damage}!
--- a/Resources/Locale/ru-RU/actions/actions/sleep.ftl
+++ b/Resources/Locale/ru-RU/actions/actions/sleep.ftl
@@ -2,7 +2,6 @@ action-name-sleep = Спать
 action-desc-sleep = Лечь спать.
 action-name-wake = Проснуться
 action-desc-wake = Перестать спать.
-sleep-onomatopoeia = Zzz...
 sleep-examined = [color=lightblue]{ CAPITALIZE($target) } спит.[/color]
 wake-other-success = Вы разбудили { $target }.
 wake-other-failure = Вы тормошите { $target }, но { $target } не просыпается.
--- a/Resources/Locale/ru-RU/bonk/components/bonkable-component.ftl
+++ b/Resources/Locale/ru-RU/bonk/components/bonkable-component.ftl
@@ -1,2 +1,2 @@
-bonkable-success-message-others = { CAPITALIZE(THE($user)) } стукает голову { POSS-ADJ($user) } об { $bonkable }
+bonkable-success-message-others = { CAPITALIZE($user) } стукает голову { POSS-ADJ($user) } об { $bonkable }
 bonkable-success-message-user = Вы стукаете свою голову об { $bonkable }
--- a/Resources/Locale/ru-RU/cluwne/cluwne.ftl
+++ b/Resources/Locale/ru-RU/cluwne/cluwne.ftl
@@ -1,2 +1,2 @@
-cluwne-transform = { CAPITALIZE(THE($target)) } превратился в клувна!
+cluwne-transform = { CAPITALIZE($target) } превратился в клувна!
 cluwne-name-prefix = Клувнифицированный { $target }
--- a/Resources/Locale/ru-RU/components/storage-component.ftl
+++ b/Resources/Locale/ru-RU/components/storage-component.ftl
@@ -3,7 +3,7 @@ comp-storage-cant-insert = Невозможно поместить.
 comp-storage-insufficient-capacity = Недостаточная вместимость.
 comp-storage-invalid-container = Неправильный контейнер для этого предмета.
 comp-storage-anchored-failure = Невозможно поместить закрепленный предмет.
-comp-storage-cant-drop = Вы не можете отпустить { THE($entity) }!
+comp-storage-cant-drop = Вы не можете отпустить { $entity }!
 comp-storage-window-title = Предмет хранилище
 comp-storage-window-volume = Занято: { $usedVolume }/{ $maxVolume }, предметов: { $itemCount }
 comp-storage-window-volume-unlimited = Предметов: { $itemCount }
--- a/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
+++ b/Resources/Locale/ru-RU/flavors/flavor-profiles.ftl
@@ -179,7 +179,7 @@ flavor-complex-rocksandstones = как скалы и камни

 ## Basic drinks
 flavor-complex-water = как вода
-flavor-complex-water = как вода
+flavor-complex-beer = как моча
 flavor-complex-cognac = как сухой пряный алкоголь
 flavor-complex-mead = как забродивший мёд
 flavor-complex-vermouth = как виноградная мякоть
--- a/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
+++ b/Resources/Locale/ru-RU/fluids/components/absorbent-component.ftl
@@ -1,10 +1,10 @@
 mopping-system-tool-full = { CAPITALIZE($used) } полная!
-mopping-system-target-container-empty-water = { CAPITALIZE(THE($target)) } не имеет воды!
-mopping-system-puddle-space = { THE($used) } заполнено водой
-mopping-system-puddle-evaporate = { THE($target) } испаряется
-mopping-system-no-water = { THE($used) } не имеет воды!
-mopping-system-full = { THE($used) } полное!
-mopping-system-empty = { THE($used) } пустое!
+mopping-system-target-container-empty-water = { CAPITALIZE($target) } не имеет воды!
+mopping-system-puddle-space = { $used } заполнено водой
+mopping-system-puddle-evaporate = { $target } испаряется
+mopping-system-no-water = { $used } не имеет воды!
+mopping-system-full = { $used } полное!
+mopping-system-empty = { $used } пустое!
 mopping-system-puddle-diluted = Вы разбавляете лужу.
 mopping-system-puddle-success = Вы убираете лужу.
 mopping-system-release-to-floor = Вы выжимаете часть жидкости на пол.
--- a/Resources/Locale/ru-RU/fluids/components/drain-component.ftl
+++ b/Resources/Locale/ru-RU/fluids/components/drain-component.ftl
@@ -1,8 +1,8 @@
-drain-component-empty-verb-using-is-empty-message = { CAPITALIZE(THE($object)) } пусто!
-drain-component-empty-verb-target-is-full-message = { CAPITALIZE(THE($object)) } полный!
+drain-component-empty-verb-using-is-empty-message = { CAPITALIZE($object) } пусто!
+drain-component-empty-verb-target-is-full-message = { CAPITALIZE($object) } полный!
 drain-component-empty-verb-inhand = Пустой { $object }
 drain-component-examine-hint-full = [color="blue"]Он наполнен до краев. Может вантуз поможет?[/color]
 drain-component-examine-volume = [color="blue"]Оставшееся место - { $volume }ед.[/color]
-drain-component-unclog-fail = { CAPITALIZE(THE($object)) } все еще полон.
-drain-component-unclog-success = { CAPITALIZE(THE($object)) } очищается.
-drain-component-unclog-notapplicable = { CAPITALIZE(THE($object)) } не забит.
+drain-component-unclog-fail = { CAPITALIZE($object) } все еще полон.
+drain-component-unclog-success = { CAPITALIZE($object) } очищается.
+drain-component-unclog-notapplicable = { CAPITALIZE($object) } не забит.
--- a/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl
+++ b/Resources/Locale/ru-RU/fluids/components/puddle-component.ftl
@@ -2,4 +2,4 @@ puddle-component-examine-is-slipper-text = Выглядит скользким.
 puddle-component-examine-evaporating = Оно [color=#5E7C16]испаряемое[/color].
 puddle-component-examine-evaporating-partial = Оно [color=#FED83D]частично испаряемое[/color].
 puddle-component-examine-evaporating-no = Оно [color=#B02E26]не испаряемое[/color].
-puddle-component-slipped-touch-reaction = Вещества в { THE($puddle) } попадают на вашу кожу!
+puddle-component-slipped-touch-reaction = Вещества в { $puddle } попадают на вашу кожу!
--- a/Resources/Locale/ru-RU/fluids/components/spillable-component.ftl
+++ b/Resources/Locale/ru-RU/fluids/components/spillable-component.ftl
@@ -3,8 +3,8 @@
 spill-target-verb-get-data-text = Выплеснуть содержимое
 spill-target-verb-activate-cannot-drain-message = Вы не можете ничего выплеснуть из { $owner }!
 spill-target-verb-activate-is-empty-message = В { $owner } пусто!
-spill-melee-hit-attacker = Вы проливаете { $amount }ед { THE($spillable) } на { THE($target) }!
-spill-melee-hit-others = { CAPITALIZE(THE($attacker)) } выливаете часть { THE($spillable) } на { THE($target) }!
-spill-land-spilled-on-other = { CAPITALIZE(THE($spillable)) } проливает часть своего содержимого на { THE($target) }!
+spill-melee-hit-attacker = Вы проливаете { $amount }ед { $spillable } на { $target }!
+spill-melee-hit-others = { CAPITALIZE($attacker) } выливаете часть { $spillable } на { $target }!
+spill-land-spilled-on-other = { CAPITALIZE($spillable) } проливает часть своего содержимого на { $target }!
 spill-examine-is-spillable = Этот контейнер выглядит так, что его можно пролить.
 spill-examine-spillable-weapon = Вы могли бы выплеснуть это на кого-нибудь при атаке в ближнем бою.
--- a/Resources/Locale/ru-RU/glue/glue.ftl
+++ b/Resources/Locale/ru-RU/glue/glue.ftl
@@ -1,3 +1,3 @@
-glue-success = { THE($target) } покрыли в клее.
+glue-success = { $target } покрыли в клее.
 glued-name-prefix = Приклеенный { $target }
-glue-failure = { THE($target) } уже покрыт клеем.
+glue-failure = { $target } уже покрыт клеем.
--- a/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl
@@ -10,7 +10,7 @@ petting-success-bird = Вы гладите { $target } по { POSS-ADJ($target)
 petting-success-cat = Вы гладите { $target } по { POSS-ADJ($target) } маленькой пушистой голове.
 petting-success-corrupted-corgi = В порыве самонадеянности, вы гладите { $target } по { POSS-ADJ($target) } маленькой проклятой голове.
 petting-success-crab = Вы гладите { $target } по { POSS-ADJ($target) } маленькой гладкой голове.
-petting-success-dehydrated-carp = Вы гладите { THE($target) } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(OBJECT($target)) } похоже теперь любит вас.
+petting-success-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове. { CAPITALIZE(OBJECT($target)) } похоже теперь любит вас.
 petting-success-dog = Вы гладите { $target } по { POSS-ADJ($target) } мягкой пушистой голове.
 petting-success-frog = Вы гладите { $target } по { POSS-ADJ($target) } маленькой скользкой голове.
 petting-success-goat = Вы гладите { $target } по { POSS-ADJ($target) } рогатой пушистой голове.
@@ -24,17 +24,17 @@ petting-success-tarantula = Вы гладите { $target } по { POSS-ADJ($tar
 petting-success-holo = Вы гладите { $target } по { POSS-ADJ($target) } металлической шипастой голове.
 petting-success-dragon = Уворачиваясь от клыков, когтей, и пламени, вы гладите { $target } по { POSS-ADJ($target) } огромной чешуйчатой голове.
 petting-success-hamster = Вы гладите { $target } по { POSS-ADJ($target) } маленькой пушистой голове.
-petting-success-bear = Вы неохотно гладите { THE($target) } по { POSS-ADJ($target) } мистической голове.
-petting-success-slimes = Вы гладите { THE($target) } по { POSS-ADJ($target) } слизистой поверхности.
-petting-success-snake = Вы гладите {THE($target)} по {POSS-ADJ($target)} чешуйчатой большой голове.
-petting-success-monkey = Вы гладите {THE($target)} по {POSS-ADJ($target)} озорной маленькой голове.
-petting-success-nymph = Вы гладите {THE($target)} по {POSS-ADJ($target)} деревянной маленькой голове.
+petting-success-bear = Вы неохотно гладите { $target } по { POSS-ADJ($target) } мистической голове.
+petting-success-slimes = Вы гладите { $target } по { POSS-ADJ($target) } слизистой поверхности.
+petting-success-snake = Вы гладите { $target } по { POSS-ADJ($target) } чешуйчатой большой голове.
+petting-success-monkey = Вы гладите { $target } по { POSS-ADJ($target) } озорной маленькой голове.
+petting-success-nymph = Вы гладите { $target } по { POSS-ADJ($target) } деревянной маленькой голове.

 petting-failure-generic = Вы тянетесь погладить { $target }, но { $target } настороженно уклоняется от вас.
 petting-failure-bat = Вы тянетесь погладить { $target }, но { $target } очень трудно поймать!
 petting-failure-corrupted-corgi = Вы тянетесь погладить { $target }, но решаете, что лучше не надо.
 petting-failure-crab = Вы тянетесь погладить { $target }, но { $target } щёлкает клешнями в вашу сторону!
-petting-failure-dehydrated-carp = Вы гладите { THE($target) } по { POSS-ADJ($target) } сухой маленькой голове.
+petting-failure-dehydrated-carp = Вы гладите { $target } по { POSS-ADJ($target) } сухой маленькой голове.
 petting-failure-goat = Вы тянетесь погладить { $target }, но { $target } упорно отказывается!
 petting-failure-goose = Вы тянетесь погладить { $target }, но { $target } слишком ужасен!
 petting-failure-possum = Вы тянетесь погладить { $target }, но на вас шипят и рычат.
@@ -42,20 +42,20 @@ petting-failure-sloth = Вы тянетесь погладить { $target }, н
 petting-failure-holo = Вы тянетесь погладить { $target }, но { $target } едва не пронзает шипами вашу руку!
 petting-failure-dragon = Вы поднимаете руку, но { $target } издаёт рёв, и вы решаете, что не хотите стать кормом для карпов.
 petting-failure-hamster = Вы тянетесь погладить { $target }, но { $target } пытается укусить вас за палец, и только ваши молниеносные рефлексы спасают вас от почти смертельной травмы.
-petting-failure-bear = Вы протягиваете руку, чтобы погладить { THE($target) }, но { SUBJECT($target) } рычит, заставляя вас дважды подумать.
-petting-failure-monkey = Вы протягиваете руку, чтобы погладить {THE($target)}, но {SUBJECT($target)} чуть-ли не откусывает ваши пальцы!
-petting-failure-nymph = Вы протягиваете руку, чтобы погладить {THE($target)}, но {POSS-ADJ($target)} отодвигает свои ветки от вас.
-petting-failure-shadow = Вы пытаетесь погладить {THE($target)}, но ваша рука проходит сквозь холодную темноту его тела.
+petting-failure-bear = Вы протягиваете руку, чтобы погладить { $target }, но { SUBJECT($target) } рычит, заставляя вас дважды подумать.
+petting-failure-monkey = Вы протягиваете руку, чтобы погладить { $target }, но { SUBJECT($target) } чуть-ли не откусывает ваши пальцы!
+petting-failure-nymph = Вы протягиваете руку, чтобы погладить { $target }, но { POSS-ADJ($target) } отодвигает свои ветки от вас.
+petting-failure-shadow = Вы пытаетесь погладить {$target}, но ваша рука проходит сквозь холодную темноту его тела.

 ## Knocking on windows

 petting-success-honkbot = Вы гладите { $target } по его скользкой металлической голове.
-petting-success-mimebot = Вы гладите { THE($target) } по { POSS-ADJ($target) } холодной металлической голове.
+petting-success-mimebot = Вы гладите { $target } по { POSS-ADJ($target) } холодной металлической голове.
 petting-success-cleanbot = Вы гладите { $target } по его влажной металлической голове.
 petting-success-medibot = Вы гладите { $target } по его стерильной металлической голове.
 petting-failure-honkbot = Вы тянетесь погладить { $target }, но { $target } хонкает и уворачивается!
 petting-failure-cleanbot = Вы тянетесь погладить { $target }, но { $target } занят уборкой!
-petting-failure-mimebot = Вы тянетесь погладить { THE($target) }, но { SUBJECT($target) } { CONJUGATE-BE($target) } занятый мимикацией!
+petting-failure-mimebot = Вы тянетесь погладить { $target }, но { SUBJECT($target) } { CONJUGATE-BE($target) } занятый мимикацией!
 petting-failure-medibot = Вы тянетесь погладить { $target }, но { $target } едва не пронзает вашу руку шприцом!
 # Shown when knocking on a window
 hugging-success-generic = Вы обнимаете { $target }.
--- a/Resources/Locale/ru-RU/items/components/item-component.ftl
+++ b/Resources/Locale/ru-RU/items/components/item-component.ftl
@@ -5,3 +5,12 @@ pick-up-verb-get-data-text = Подобрать
 # "pick up" doesn't make sense if the item is already in their inventory

 pick-up-verb-get-data-text-inventory = Взять в руку
+
+item-component-on-examine-size = Это {INDEFINITE($size)} [bold]{$size}[/bold] предмет.
+
+item-component-size-Tiny = крошечный
+item-component-size-Small = маленький
+item-component-size-Normal = средний
+item-component-size-Large = большой
+item-component-size-Huge = огромный
+item-component-size-Ginormous = гигантский
--- a/Resources/Locale/ru-RU/kitchen/components/butcherable-component.ftl
+++ b/Resources/Locale/ru-RU/kitchen/components/butcherable-component.ftl
@@ -1,4 +1,4 @@
-butcherable-different-tool = Вам понадобится другой инструмент для разделки { THE($target) }.
+butcherable-different-tool = Вам понадобится другой инструмент для разделки { $target }.
 butcherable-knife-butchered-success = Вы разделываете { $target } с помощью { $knife }.
 butcherable-need-knife = Используйте острый предмет чтобы разделать { $target }.
 butcherable-not-in-container = Сперва достаньте { $target } из контейнера.
--- a/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl
+++ b/Resources/Locale/ru-RU/kitchen/components/kitchen-spike-component.ftl
@@ -1,6 +1,6 @@
 comp-kitchen-spike-deny-collect = На { CAPITALIZE($this) } уже что-то есть, закончите сначала собирать мясо!
 comp-kitchen-spike-deny-butcher = { CAPITALIZE($victim) } не может быть разделан на { $this }.
-comp-kitchen-spike-deny-butcher-knife = { CAPITALIZE(THE($victim)) } не может быть разделан на { THE($this) }, вы должны разделать это, используя нож.
+comp-kitchen-spike-deny-butcher-knife = { CAPITALIZE($victim) } не может быть разделан на { THE($this) }, вы должны разделать это, используя нож.
 comp-kitchen-spike-deny-not-dead = { CAPITALIZE($victim) } не может быть разделан. { CAPITALIZE(SUBJECT($victim)) } { $victim } не умер!
 comp-kitchen-spike-begin-hook-victim = { $user } начинает насаживать вас на { $this }!
 comp-kitchen-spike-begin-hook-self = Вы начинаете насаживать себя на { $this }!
--- a/Resources/Locale/ru-RU/lube/lube.ftl
+++ b/Resources/Locale/ru-RU/lube/lube.ftl
@@ -1,4 +1,4 @@
-lube-success = { THE($target) } был покрыт смазкой!
+lube-success = { $target } был покрыт смазкой!
 lubed-name-prefix = Смазал { $target }
-lube-failure = Не могу покрыть { THE($target) } в смазке!
-lube-slip = { THE($target) } выскальзывает из твоих рук!
+lube-failure = Не могу покрыть { $target } в смазке!
+lube-slip = { $target } выскальзывает из твоих рук!
--- a/Resources/Locale/ru-RU/nutrition/components/animal-husbandry.ftl
+++ b/Resources/Locale/ru-RU/nutrition/components/animal-husbandry.ftl
@@ -1,3 +1,3 @@
 infant-name-prefix = младенец { $name }
-reproductive-birth-popup = { CAPITALIZE(THE($parent)) } родила!
-reproductive-laid-egg-popup = { CAPITALIZE(THE($parent)) } откладывает яйцо!
+reproductive-birth-popup = { CAPITALIZE($parent) } родила!
+reproductive-laid-egg-popup = { CAPITALIZE($parent) } откладывает яйцо!
--- a/Resources/Locale/ru-RU/nutrition/components/food-component.ftl
+++ b/Resources/Locale/ru-RU/nutrition/components/food-component.ftl
@@ -11,8 +11,8 @@ food-system-you-cannot-eat-any-more = В вас больше не лезет!
 food-system-you-cannot-eat-any-more-other = В него больше не лезет!
 food-system-try-use-food-is-empty = { $entity } пустая!
 food-system-wrong-utensil = вы не можете есть { $food } с помощью { $utensil }.
-food-system-cant-digest = Ты не можешь переварить { THE($entity) }!
-food-system-cant-digest-other = Они не могут переварить { THE($entity) }!
+food-system-cant-digest = Ты не можешь переварить { $entity }!
+food-system-cant-digest-other = Они не могут переварить { $entity }!
 food-system-verb-eat = Съесть

 ## Force feeding
--- a/Resources/Locale/ru-RU/nutrition/components/vape-component.ftl
+++ b/Resources/Locale/ru-RU/nutrition/components/vape-component.ftl
@@ -1,7 +1,7 @@
 vape-component-vape-success = Ты затянулся вейпом.
-vape-component-vape-success-forced = { CAPITALIZE(THE($user)) } заставил тебя затянуться вейпом.
-vape-component-vape-success-user-forced = Вас успешно заставили затянуться { THE($target) }.
-vape-component-try-use-vape-forced = { CAPITALIZE(THE($user)) } пытается заставить тебя затянуться вейпом.
-vape-component-try-use-vape-forced-user = Вы вынуждаете { THE($target) } затянуться вейпом.
+vape-component-vape-success-forced = { CAPITALIZE($user) } заставил тебя затянуться вейпом.
+vape-component-vape-success-user-forced = Вас успешно заставили затянуться { $target }.
+vape-component-try-use-vape-forced = { CAPITALIZE($user) } пытается заставить тебя затянуться вейпом.
+vape-component-try-use-vape-forced-user = Вы вынуждаете { $target } затянуться вейпом.
 vape-component-try-use-vape = Ты пытаешься затянуться вейпом.
 vape-component-vape-empty = Вейп пуст!
--- a/Resources/Locale/ru-RU/payload/payload-case.ftl
+++ b/Resources/Locale/ru-RU/payload/payload-case.ftl
@@ -1,3 +1,3 @@
 payload-case-not-close-enough = Вам нужно подойти ближе, чтобы определить, содержит ли { $ent } заряд.
 payload-case-has-payload = В { CAPITALIZE($ent) } установлен заряд!
-payload-case-does-not-have-payload = { CAPITALIZE(THE($ent)) } не содержит заряд.
+payload-case-does-not-have-payload = { CAPITALIZE($ent) } не содержит заряд.
--- a/Resources/Locale/ru-RU/power/components/generator.ftl
+++ b/Resources/Locale/ru-RU/power/components/generator.ftl
@@ -1,4 +1,4 @@
-generator-clogged = {THE($generator)} резко отключается!
+generator-clogged = {$generator} резко отключается!

 portable-generator-verb-start = Запустить генератор
 portable-generator-verb-start-msg-unreliable = Запуск генератора. Это может потребовать нескольких попыток.
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/actions/types.ftl
@@ -1,5 +1,3 @@
-ent-ActionScream = Крикнуть
-    .desc = ААААААААААААААААААААААААА
 ent-ActionTurnUndead = Обратиться в зомби
    .desc = Поддайтесь заражению и превратитесь в зомби.
 ent-ActionToggleLight = Переключить фонарь
--- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/implanters.ftl
+++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/objects/misc/implanters.ftl
@@ -52,3 +52,5 @@ ent-DeathAcidifierImplanter = { ent-BaseImplanter }
 ent-ImplanterAdmeme = { ent-BaseImplanter }
    .desc = {""}
    .suffix = адмемы
+ent-ImplanterSyndi = { ent-BaseImplanter }
+    .desc = { ent-BaseImplanter.desc }
--- a/Resources/Locale/ru-RU/storage/components/pick-random-component.ftl
+++ b/Resources/Locale/ru-RU/storage/components/pick-random-component.ftl
@@ -1,2 +1,2 @@
-comp-pick-random-empty = { CAPITALIZE(THE($storage)) } пустое!
+comp-pick-random-empty = { CAPITALIZE($storage) } пустое!
 comp-pick-random-verb-text = Выбрать предмет
--- a/Resources/Locale/ru-RU/store/currency.ftl
+++ b/Resources/Locale/ru-RU/store/currency.ftl
@@ -1,6 +1,6 @@
 store-currency-inserted = { CAPITALIZE($used) } внесены в { $target }.
 store-currency-war-boost-given = { CAPITALIZE($target) } начинает жужжать
-store-currency-inserted-implant = { CAPITALIZE(THE($used)) } вставляется в ваш имплантат.
+store-currency-inserted-implant = { CAPITALIZE($used) } вставляется в ваш имплантат.
 store-currency-free = Бесплатно
 store-currency-display-debugdollar =
    { $amount ->
--- a/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl
+++ b/Resources/Locale/ru-RU/weapons/grenades/timer-trigger.ftl
@@ -12,4 +12,4 @@ verb-toggle-start-on-stick = Переключить автоактивацию
 popup-start-on-stick-off = Устройство НЕ будет автоматически активировано после установки
 popup-start-on-stick-on = Устройство будет автоматически активировано после установки

-trigger-activated = Вы активируете {THE($device)}.
+trigger-activated = Вы активируете {$device}.
--- a/Resources/Locale/ru-RU/weapons/melee/melee.ftl
+++ b/Resources/Locale/ru-RU/weapons/melee/melee.ftl
@@ -1,6 +1,6 @@
 melee-inject-failed-hardsuit = Ваше { $weapon } не может впрыскивать через скафандры!

-melee-balloon-pop = {CAPITALIZE(THE($balloon))} взорвался!
+melee-balloon-pop = {CAPITALIZE($balloon)} взорвался!

 #BatteryComponent
 melee-battery-examine = Заряда хватит на [color={$color}]{$count}[/color] ударов.
--- a/Resources/Locale/ru-RU/weapons/ranged/gun.ftl
+++ b/Resources/Locale/ru-RU/weapons/ranged/gun.ftl
@@ -17,9 +17,9 @@ gun-PullMob = тащить существ
 gun-ballistic-cycle = Перезарядка
 gun-ballistic-cycled = Перезаряжено
 gun-ballistic-cycled-empty = Разряжено
-gun-ballistic-transfer-invalid = {CAPITALIZE(THE($ammoEntity))} нельзя поместить в {THE($targetEntity)}!
-gun-ballistic-transfer-empty = В {CAPITALIZE(THE($entity))} пусто.
-gun-ballistic-transfer-target-full = {CAPITALIZE(THE($entity))} уже полностью заряжен.
+gun-ballistic-transfer-invalid = { CAPITALIZE($ammoEntity) } нельзя поместить в { $targetEntity }!
+gun-ballistic-transfer-empty = В { CAPITALIZE($entity) } пусто.
+gun-ballistic-transfer-target-full = { CAPITALIZE($entity) } уже полностью заряжен.

 # CartridgeAmmo
 gun-cartridge-spent = Он [color=red]израсходован[/color].
--- a/Resources/Locale/ru-RU/white/species/felinid/felinid.ftl
+++ b/Resources/Locale/ru-RU/white/species/felinid/felinid.ftl
@@ -1,7 +1,7 @@
 hairball-action = Откашлять комок шерсти.
 hairball-action-desc = Люди это не любят.
 hairball-mask = Сначала сними { $mask }.
-hairball-cough = { CAPITALIZE(THE($name)) } пытается выкашлять комок шерсти!
+hairball-cough = { CAPITALIZE($name) } пытается выкашлять комок шерсти!
 action-name-eat-mouse = Съесть мышь.
 action-description-eat-mouse = Съешьте мышь в своей руке, получая питательные вещества и заряд комка шерсти.

--- a/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl
+++ b/Resources/Locale/ru-RU/wieldable/wieldable-component.ftl
@@ -14,4 +14,4 @@ wieldable-component-not-enough-free-hands =
       *[other] свободных рук
    }.
 wieldable-component-not-in-hands = { CAPITALIZE($item) } не в ваших руках!
-wieldable-component-requires = { CAPITALIZE(THE($item)) } должно быть в руках!
+wieldable-component-requires = { CAPITALIZE($item) } должно быть в руках!
--- a/Resources/Locale/ru-RU/zombies/zombie.ftl
+++ b/Resources/Locale/ru-RU/zombies/zombie.ftl
@@ -1,4 +1,4 @@
-zombie-transform = {CAPITALIZE(THE($target))} превратился в зомби!
+zombie-transform = {CAPITALIZE($target)} превратился в зомби!
 zombie-infection-greeting = Вы стали зомби. Ваша цель - заражать любое живое существо на вашем пути. Работайте с другими зомби чтобы захвать всю станцию!

 zombie-generic = зомби
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -1,16 +1,3 @@
- type: entity
-  id: ActionScream
-  name: Scream
-  description: AAAAAAAAAAAAAAAAAAAAAAAAA
-  noSpawn: true
-  components:
-  - type: InstantAction
-    useDelay: 10
-    icon: Interface/Actions/scream.png
-    event: !type:ScreamActionEvent
-    checkCanInteract: false
-  - type: LesserFormRestricted
-
 - type: entity
  id: ActionTurnUndead
  name: Turn Undead
@@ -33,6 +20,16 @@
    iconOn: Objects/Tools/flashlight.rsi/flashlight-on.png
    event: !type:ToggleActionEvent

+- type: entity
+  id: ActionToggleDome
+  name: Toggle energy dome
+  description: Turn the energy barrier on or off.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: { sprite: Objects/Weapons/Melee/e_shield.rsi, state: eshield-on }
+    event: !type:ToggleActionEvent
+
 - type: entity
  id: ActionOpenStorageImplant
  name: Open Storage Implant
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -27,7 +27,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -135,7 +134,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -26,7 +26,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -143,7 +142,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -40,7 +40,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
@@ -157,7 +156,6 @@
    contents:
      - id: BoxSurvivalSecurity
      - id: Flash
-      - id: MagazinePistol

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml
@@ -20,7 +20,7 @@
  - type: StorageFill
    contents:
      - id: Ointment
-        amount: 2
+        amount: 3
      - id: PillCanisterKelotane
      - id: PillCanisterDermaline

@@ -32,7 +32,7 @@
  - type: StorageFill
    contents:
      - id: Brutepack
-      - id: Gauze
+        amount: 3
      - id: PillCanisterIron
      - id: PillCanisterCopper

@@ -47,6 +47,7 @@
      - id: SyringeEthylredoxrazine
      - id: AntiPoisonMedipen
      - id: PillCanisterDylovene
+        amount: 2
      - id: PillCanisterCharcoal

 - type: entity
@@ -61,6 +62,7 @@
      - id: EmergencyMedipen
      - id: SyringeInaprovaline
      - id: PillCanisterDexalin
+      - id: Gauze

 - type: entity
  id: MedkitRadiationFilled
@@ -73,6 +75,7 @@
      - id: RadAutoInjector
      - id: EmergencyMedipen
      - id: PillCanisterHyronalin
+        amount: 2

 - type: entity
  id: MedkitAdvancedFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
@@ -13,6 +13,7 @@
      - id: ClothingUniformJumpskirtCapFormalDress
      - id: ClothingHandsGlovesCaptain
      - id: ClothingNeckMantleCap
+      - id: ClothingEyesGlassesSunglasses

 - type: entity
  id: DresserChiefEngineerFilled
@@ -50,6 +51,7 @@
      - id: ClothingNeckCloakHop
      - id: ClothingHeadHatHopcap
      - id: ClothingOuterWinterHoP
+      - id: ClothingHandsGlovesHop

 - type: entity
  id: DresserHeadOfSecurityFilled
@@ -67,6 +69,7 @@
      - id: ClothingUniformJumpskirtHosFormal
      - id: ClothingUniformJumpsuitHosFormal
      - id: ClothingMaskNeckGaiter
+      - id: ClothingHandsGlovesCombat

 - type: entity
  id: DresserQuarterMasterFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -90,6 +90,8 @@
      - id: MedkitOxygenFilled
      - id: HolofanProjector
      - id: DoorRemoteFirefight
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerAtmosphericsFilled
@@ -105,6 +107,8 @@
      - id: MedkitOxygenFilled
      - id: HolofanProjector
      - id: DoorRemoteFirefight
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerEngineerFilledHardsuit
@@ -119,6 +123,8 @@
      - id: OxygenTankFilled
      - id: NitrogenTankFilled
      - id: ClothingShoesBootsMag
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: LockerEngineerFilled
@@ -130,6 +136,8 @@
      - id: ClothingHandsGlovesColorYellow
      - id: ClothingMaskGas
      - id: trayScanner
+      - id: ClothingBeltUtilityEngineering
+      - id: ClothingEyesGlassesMeson

 - type: entity
  id: ClosetRadiationSuitFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -171,6 +171,7 @@
      - id: AccessConfigurator
      - id: RCD
      - id: RCDAmmo
+      - id: ClothingHeadHatHardhatWhite

 - type: entity
  id: LockerChiefMedicalOfficerFilledHardsuit
@@ -196,6 +197,7 @@
      - id: MedicalTechFabCircuitboard
      - id: BoxEncryptionKeyMedical
      - id: Eftpos
+      - id: ClothingBeltMedical

 - type: entity
  id: LockerChiefMedicalOfficerFilled
@@ -217,6 +219,7 @@
      - id: MedicalTechFabCircuitboard
      - id: BoxEncryptionKeyMedical
      - id: Eftpos
+      - id: ClothingBeltMedical

 - type: entity
  id: LockerResearchDirectorFilledHardsuit
@@ -279,6 +282,7 @@
      - id: BoxEncryptionKeySecurity
      - id: HoloprojectorSecurity
      - id: BookSecretDocuments
+      - id: WeaponPistolMk58Nonlethal

 - type: entity
  id: LockerHeadOfSecurityFilled
@@ -304,6 +308,8 @@
      - id: BoxEncryptionKeySecurity
      - id: HoloprojectorSecurity
      - id: BookSecretDocuments
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerFreezerVaultFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml
@@ -119,11 +119,15 @@
      - id: BoxBottle
      - id: BoxVial
      - id: ChemBag
+        amount: 3
      - id: ClothingHandsGlovesLatex
+        amount: 3
      - id: ClothingHeadsetMedical
+        amount: 3
      - id: ClothingMaskSterile
+        amount: 3
      - id: HandLabeler
-        prob: 0.5
+        amount: 3
      - id: Eftpos

 - type: entity
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -15,12 +15,15 @@
      - id: ClothingHandsGlovesCombat
      - id: ClothingShoesBootsJack
      - id: ClothingOuterCoatWarden
+      - id: ClothingHeadHatWarden
      - id: ClothingOuterWinterWarden
      - id: RubberStampWarden
      - id: DoorRemoteArmory
      - id: ClothingOuterHardsuitWarden
      - id: HoloprojectorSecurity
      - id: BoxBodyCamera
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerWardenFilled
@@ -45,6 +48,8 @@
      - id: DoorRemoteArmory
      - id: HoloprojectorSecurity
      - id: BoxBodyCamera
+      - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol

 - type: entity
  id: LockerSecurityFilled
@@ -54,7 +59,6 @@
  - type: StorageFill
    contents:
      - id: FlashlightSeclite
-        prob: 0.8
      - id: ClothingUniformJumpsuitSecGrey
        prob: 0.3
      - id: ClothingHeadHelmetBasic
@@ -72,6 +76,9 @@
      - id: HoloprojectorSecurity
        prob: 0.6
      - id: WeaponTempGun
+      - id: WeaponPistolMk58Nonlethal
+      - id: BoxBodyCamera
+      - id: MagazinePistol

 - type: entity
  id: LockerBrigmedicFilled
@@ -127,6 +134,10 @@
      - id: ClothingHandsGlovesForensic
      - id: HoloprojectorSecurity
      - id: BoxEvidenceMarkers
+      - id: ClothingBeltHolsterFilled
+      - id: BoxBodyCamera
+      - id: VoiceRecorder
+      - id: ClothingEyesGlassesSecurity

 - type: entity
  id: ClosetBombFilled
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -111,6 +111,9 @@
      - id: ClothingHeadHatTrucker
        prob: 0.1
      - id: Eftpos
+      - id: HydroponicsToolSpade
+      - id: HydroponicsToolMiniHoe
+      - id: RobustHarvestChemistryBottle

 - type: entity
  id: LockerBotanistLoot
--- a/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml
@@ -172,12 +172,19 @@
   - type: StorageFill
     contents:
       - id: ClothingHeadHatCargosoft
+         amount: 3
       - id: ClothingUniformJumpsuitCargo
+         amount: 3
       - id: ClothingBackpack
+         amount: 3
       - id: ClothingShoesColorBlack
+         amount: 3
       - id: ClothingUniformJumpskirtCargo
+         amount: 3
       - id: ClothingHandsGlovesFingerless
+         amount: 3
       - id: AppraisalTool
+         amount: 3

 - type: entity
   id: WardrobeSalvageFilled
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
@@ -1,15 +1,19 @@
 - type: vendingMachineInventory
  id: AtmosDrobeInventory
  startingInventory:
-    ClothingBackpackDuffelAtmospherics: 2
-    ClothingBackpackSatchelAtmospherics: 2
-    ClothingBackpackAtmospherics: 2
+    ClothingBackpackDuffelAtmospherics: 3
+    ClothingBackpackSatchelAtmospherics: 3
+    ClothingBackpackAtmospherics: 3
+    ClothingHeadHatBeretEngineering: 3
+    ClothingHeadsetEngineering: 3
+    ClothingNeckScarfStripedLightBlue: 3
+    ClothingMaskGasAtmos: 3
+    ClothingOuterWinterAtmos: 2
    ClothingUniformJumpsuitAtmos: 3
    ClothingUniformJumpskirtAtmos: 3
    ClothingUniformJumpsuitAtmosCasual: 3
    ClothingShoesColorWhite: 3
-    ClothingHeadsetEngineering: 2
    ClothingHeadHelmetFire: 2
    ClothingOuterSuitFire: 2
-    ClothingOuterWinterAtmos: 2
-    ClothingNeckScarfStripedLightBlue: 3
+    ClothingOuterSuitAtmosFire: 1
+    ClothingHeadHelmetAtmosFire: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml
@@ -4,16 +4,15 @@
    ClothingHeadHatBowlerHat: 2
    ClothingHeadHatTophat: 2
    ClothingEyesHudBeer: 2
-    ClothingEyesEyepatchHudBeer: 1
+    ClothingEyesGlassesSunglasses: 2
    ClothingHeadsetService: 2
-    ClothingOuterApronBar: 2
+    ClothingOuterArmorBasicSlim: 2
    ClothingOuterWinterBar: 2
+    ClothingOuterVest: 2
    ClothingUniformJumpsuitBartender: 2
    ClothingUniformJumpskirtBartender: 2
    ClothingUniformJumpsuitBartenderPurple: 2
-    ClothingShoesColorBlack: 2
-    ClothingOuterArmorBasicSlim: 2
-    ClothingOuterVest: 2
    ClothingBeltBandolier: 2
-    ClothingEyesGlassesSunglasses: 2
-
+    ClothingShoesColorBlack: 2
+    ClothingEyesEyepatchHudBeer: 1
+    ClothingOuterApronBar: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -1,13 +1,13 @@
 - type: vendingMachineInventory
  id: BoozeOMatInventory
  startingInventory:
-    DrinkGlass: 20 #Kept glasses at top for ease to differentiate from booze.
+    DrinkGlass: 20
    DrinkShotGlass: 10
    DrinkGlassCoupeShaped: 10
    DrinkVacuumFlask: 5
    DrinkFlaskBar: 5
    DrinkShaker: 5
-    CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
+    CustomDrinkJug: 2
    DrinkAbsintheBottleFull: 2
    DrinkAleBottleFull: 5
    DrinkBeerBottleFull: 5
@@ -16,7 +16,7 @@
    DrinkColaBottleFull: 4
    DrinkCreamCarton: 5
    DrinkGinBottleFull: 3
-    DrinkGildlagerBottleFull: 2 #if champagne gets less because its premium, then gildlager should match this and have two
+    DrinkGildlagerBottleFull: 2
    DrinkGrenadineBottleFull: 2
    DrinkJuiceLimeCarton: 3
    DrinkJuiceOrangeCarton: 3
@@ -34,7 +34,7 @@
    DrinkVodkaBottleFull: 5
    DrinkWhiskeyBottleFull: 5
    DrinkWineBottleFull: 5
-    DrinkChampagneBottleFull: 2 #because the premium drink
+    DrinkChampagneBottleFull: 2
    Eftpos: 4
    DrinkBeerCan: 5
    DrinkWineCan: 5
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cargodrobe.yml
@@ -1,17 +1,18 @@
 - type: vendingMachineInventory
  id: CargoDrobeInventory
  startingInventory:
-    ClothingBackpackCargo: 3
-    ClothingBackpackSatchelCargo: 3
-    ClothingBackpackDuffelCargo: 3
-    ClothingUniformJumpsuitCargo: 3
-    ClothingUniformJumpskirtCargo: 3
-    ClothingShoesColorBlack: 3
-    ClothingHandsGlovesFingerless: 3
-    ClothingHeadHatCargosoft: 3
-    ClothingHeadBandBrown: 3
-    ClothingHeadsetCargo: 3
-    ClothingOuterWinterCargo: 2
-    ClothingOuterWinterMiner: 2
-    ClothingNeckScarfStripedBrown: 3
+    ClothingBackpackCargo: 4
+    ClothingBackpackSatchelCargo: 4
+    ClothingBackpackDuffelCargo: 4
+    ClothingUniformJumpsuitCargo: 4
+    ClothingUniformJumpskirtCargo: 4
+    ClothingShoesColorBlack: 4
+    ClothingHandsGlovesFingerless: 4
+    ClothingHeadHatCargosoft: 4
+    ClothingHeadBandBrown: 4
+    ClothingHeadsetCargo: 4
+    ClothingOuterWinterCargo: 4
+    ClothingOuterWinterMiner: 4
+    ClothingNeckScarfStripedBrown: 4
    ClothingShoesBootsWinterCargo: 2
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
@@ -1,16 +1,16 @@
 - type: vendingMachineInventory
  id: PTechInventory
  startingInventory:
-    PassengerPDA: 5
-    ClearPDA: 5
-    PassengerIDCard: 5
-    ClothingHeadsetGrey: 5
+    PassengerPDA: 7
+    ClearPDA: 7
+    PassengerIDCard: 7
+    ClothingHeadsetGrey: 7
    RubberStampApproved: 1
    RubberStampDenied: 1
-    Paper: 10
-    EncryptionKeyCargo: 2
-    EncryptionKeyEngineering: 2
-    EncryptionKeyMedical: 2
-    EncryptionKeyScience: 2
-    EncryptionKeySecurity: 1
+    Paper: 13
+    EncryptionKeyCargo: 3
+    EncryptionKeyEngineering: 3
+    EncryptionKeyMedical: 3
+    EncryptionKeyScience: 3
+    EncryptionKeySecurity: 3
    EncryptionKeyService: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chang.yml
@@ -3,8 +3,7 @@
  startingInventory:
    FoodCondimentPacketSoy: 5
    FoodSnackCookieFortune: 5
-    DrinkRamen: 3
-    DrinkHellRamen: 3
-    FoodSnackChowMein: 3
-    FoodSnackDanDanNoodles: 3
-# rice?
+    DrinkRamen: 5
+    DrinkHellRamen: 5
+    FoodSnackChowMein: 5
+    FoodSnackDanDanNoodles: 5
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
@@ -1,34 +1,31 @@
 - type: vendingMachineInventory
  id: PietyVendInventory
  startingInventory:
+    ClothingUniformJumpsuitChaplain: 2
+    ClothingUniformJumpskirtChaplain: 2
+    ClothingUniformJumpsuitMonasticRobeDark: 2
+    ClothingUniformJumpsuitMonasticRobeLight: 2
+    ClothingOuterHoodieChaplain: 2
+    ClothingOuterHoodieBlack: 2
+    ClothingHeadHatHoodChaplainHood: 2
+    ClothingHeadHatHoodNunHood: 2
+    ClothingOuterNunRobe: 2
+    ClothingHeadHatFez: 2
+    ClothingHeadHatPlaguedoctor: 2
+    ClothingHeadHatWitch: 2
+    ClothingHeadHatWitch1: 2
+    ClothingOuterPlagueSuit: 2
+    ClothingMaskPlague: 2
+    ClothingHeadsetService: 2
    ClothingNeckNecklaceSilver: 2
    ClothingNeckNecklaceGold: 1
    ClothingNeckNecklaceTech: 1
-    ClothingUniformJumpsuitChaplain: 2
-    ClothingUniformJumpskirtChaplain: 2
-    ClothingUniformJumpsuitMonasticRobeDark: 1
-    ClothingUniformJumpsuitMonasticRobeLight: 1
    ClothingNeckStoleChaplain: 1
-    ClothingOuterHoodieChaplain: 1
-    ClothingOuterHoodieBlack: 1
-    ClothingHeadHatHoodNunHood: 1
-    ClothingOuterNunRobe: 1
-    ClothingHeadHatFez: 1
-    ClothingHeadHatPlaguedoctor: 1
-    ClothingHeadHatWitch: 1
-    ClothingHeadHatWitch1: 1
-    ClothingOuterPlagueSuit: 1
-    ClothingMaskPlague: 1
-    ClothingHeadsetService: 2
    BoxCandle: 2
    BoxCandleSmall: 2
    Urn: 5
  emaggedInventory:
-    #ClothingOuterArmorCult: 1
-    #ClothingHeadHelmetCult: 1
-    #ClothingOuterRobesCult: 3
-    #ClothingHeadHatHoodCulthood: 3
-    #ClothingShoesCult: 4
    BedsheetCult: 4
+    BibleNecronomicon: 1
    ClothingNeckScarfStripedBlack: 3
    ClothingNeckNecklaceUnholy: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefdrobe.yml
@@ -2,10 +2,10 @@
  id: ChefDrobeInventory
  startingInventory:
    ClothingHeadsetService: 2
-    ClothingOuterApronChef: 3
+    ClothingOuterApronChef: 2
    ClothingOuterWinterChef: 2
-    ClothingOuterJacketChef: 1
-    ClothingUniformJumpsuitChef: 1
+    ClothingOuterJacketChef: 2
+    ClothingUniformJumpsuitChef: 2
    ClothingMaskItalianMoustache: 2
    ClothingUniformJumpskirtChef:  2
    ClothingHeadHatChef: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
@@ -6,18 +6,23 @@
    ReagentContainerSugar: 2
    ReagentContainerRice: 2
    FoodCondimentPacketSalt: 4
+    FoodCondimentPacketPepper: 4
    FoodCondimentBottleEnzyme: 2
-    FoodCondimentBottleHotsauce: 1
-    FoodCondimentBottleKetchup: 1
-    FoodCondimentBottleBBQ: 1
+    FoodCondimentBottleHotsauce: 2
+    FoodCondimentBottleKetchup: 2
+    FoodCondimentBottleBBQ: 2
    FoodCondimentBottleVinegar: 2
    ReagentContainerOliveoil: 2
+    FoodContainerEgg: 2
+    ReagentContainerMilk: 3
+    ReagentContainerMilkSoy: 3
+    MonkeyCubeBox: 1
    ReagentContainerMayo: 1
    VariantCubeBox: 1
-    FoodContainerEgg: 1
    DrinkMilkCarton: 2
    DrinkSoyMilkCarton: 1
    FoodButter: 4
    FoodCheese: 1
    FoodMeat: 6
    Eftpos: 4
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemdrobe.yml
@@ -1,15 +1,16 @@
 - type: vendingMachineInventory
  id: ChemDrobeInventory
  startingInventory:
-    ClothingUniformJumpsuitChemistry: 2
-    ClothingUniformJumpskirtChemistry: 2
-    ClothingOuterCoatLabChem: 2
-    ClothingShoesColorWhite: 2
-    ClothingBackpackChemistry: 2
-    ClothingBackpackSatchelChemistry: 2
-    ClothingBackpackDuffelChemistry: 2
-    ChemBag: 2
-    ClothingBeltMedical: 2
-    ClothingHandsGlovesLatex: 2
-    ClothingHeadsetMedical: 2
-    ClothingOuterWinterChem: 2
+    ClothingBackpackChemistry: 3
+    ClothingBackpackSatchelChemistry: 3
+    ClothingBackpackDuffelChemistry: 3
+    ClothingHeadHatBeretBrigmedic: 3
+    ClothingHeadsetMedical: 3
+    ClothingOuterWinterChem: 3
+    ClothingOuterCoatLabChem: 3
+    ClothingUniformJumpsuitChemistry: 3
+    ClothingUniformJumpskirtChemistry: 3
+    ClothingHandsGlovesLatex: 3
+    ChemBag: 3
+    ClothingBeltMedical: 3
+    ClothingShoesColorWhite: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cigs.yml
@@ -1,18 +1,19 @@
 - type: vendingMachineInventory
  id: CigaretteMachineInventory
  startingInventory:
-    CigPackGreen: 2
-    CigPackRed: 2
-    CigPackBlue: 2
-    CigPackBlack: 2
-    CigPackMixed: 2
+    CigPackGreen: 3
+    CigPackRed: 3
+    CigPackBlue: 3
+    CigPackBlack: 3
    CigarCase: 1
-    SmokingPipeFilledTobacco: 1
+    SmokingPipeFilledTobacco: 3
    Vape: 1
    Matchbox: 5
    PackPaperRollingFilters: 3
-    CheapLighter: 4
+    CheapLighter: 5
    Lighter: 2
+    CigPackMixed: 2
    FlippoLighter: 2
+
  emaggedInventory:
-    CigPackSyndicate: 1
+    CigPackSyndicate: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -3,75 +3,104 @@
  startingInventory:
    ClothingBackpack: 5
    ClothingBackpackDuffel: 5
-    ClothingBackpackSatchel: 3
-    ClothingBackpackSatchelLeather: 2
-    ClothingHeadHatBeret: 4
-    ClothingHeadBandBlack: 2
-    ClothingHeadBandBlue: 2
-    ClothingHeadBandGreen: 2
-    ClothingHeadBandRed: 2
-    ClothingHeadBandSkull: 2
-    ClothingHeadHatGreyFlatcap: 3
-    ClothingHeadHatBrownFlatcap: 3
+    ClothingBackpackSatchel: 5
+    ClothingBackpackSatchelLeather: 5
+    ClothingBeltStorageWaistbag: 5
+    ClothingHeadBandBlack: 3
+    ClothingHeadBandBlue: 3
+    ClothingHeadBandGreen: 3
+    ClothingHeadBandRed: 3
+    ClothingHeadBandSkull: 3
    ClothingUniformJumpsuitColorGrey: 8
    ClothingUniformJumpskirtColorGrey: 8
    ClothingUniformJumpsuitColorWhite: 3
    ClothingUniformJumpskirtColorWhite: 3
-    ClothingUniformJumpsuitColorBlack: 3
-    ClothingUniformJumpskirtColorBlack: 3
-    ClothingUniformJumpsuitColorBlue: 2
-    ClothingUniformJumpskirtColorBlue: 2
-    ClothingUniformJumpsuitColorYellow: 2
-    ClothingUniformJumpskirtColorYellow: 2
-    ClothingUniformJumpsuitColorGreen: 2
-    ClothingUniformJumpskirtColorGreen: 2
-    ClothingUniformJumpsuitColorOrange: 2
-    ClothingUniformJumpskirtColorOrange: 2
-    ClothingUniformJumpsuitColorRed: 2
-    ClothingUniformJumpskirtColorRed: 2
-    ClothingUniformJumpsuitColorPurple: 2
-    ClothingUniformJumpskirtColorPurple: 2
-    ClothingUniformJumpsuitColorPink: 2
-    ClothingUniformJumpskirtColorPink: 2
-    ClothingUniformJumpsuitColorDarkBlue: 2
-    ClothingUniformJumpskirtColorDarkBlue: 2
-    ClothingUniformJumpsuitColorDarkGreen:  2
-    ClothingUniformJumpskirtColorDarkGreen: 2
-    ClothingUniformJumpsuitColorTeal: 2
-    ClothingUniformJumpskirtColorTeal: 2
+    ClothingUniformJumpsuitColorBlue: 3
+    ClothingUniformJumpskirtColorBlue: 3
+    ClothingUniformJumpsuitColorYellow: 3
+    ClothingUniformJumpskirtColorYellow: 3
+    ClothingUniformJumpsuitColorGreen: 3
+    ClothingUniformJumpskirtColorGreen: 3
+    ClothingUniformJumpsuitColorOrange: 3
+    ClothingUniformJumpskirtColorOrange: 3
+    ClothingUniformJumpsuitColorRed: 3
+    ClothingUniformJumpskirtColorRed: 3
+    ClothingUniformJumpsuitColorPurple: 3
+    ClothingUniformJumpskirtColorPurple: 3
+    ClothingUniformJumpsuitColorPink: 3
+    ClothingUniformJumpskirtColorPink: 3
+    ClothingUniformJumpsuitColorDarkBlue: 3
+    ClothingUniformJumpskirtColorDarkBlue: 3
+    ClothingUniformJumpsuitColorTeal: 3
+    ClothingUniformJumpskirtColorTeal: 3
+    ClothingShoesColorBlack: 8
+    ClothingShoesColorBrown: 3
+    ClothingShoesColorWhite: 3
+    ClothingShoesColorBlue: 3
+    ClothingShoesColorYellow: 3
+    ClothingShoesColorGreen: 3
+    ClothingShoesColorOrange: 3
+    ClothingShoesColorRed: 3
+    ClothingShoesColorPurple: 3
+    ClothingHeadHatGreysoft: 8
+    ClothingHeadHatMimesoft: 3
+    ClothingHeadHatBluesoft: 3
+    ClothingHeadHatYellowsoft: 3
+    ClothingHeadHatGreensoft: 3
+    ClothingHeadHatOrangesoft: 3
+    ClothingHeadHatRedsoft: 3
+    ClothingHeadHatPurplesoft: 3
+    ClothingHeadHatCorpsoft: 3
+    ClothingNeckScarfStripedLightBlue: 2
+    ClothingNeckScarfStripedBlue: 2
+    ClothingNeckScarfStripedRed: 2
+    ClothingNeckScarfStripedOrange: 2
+    ClothingNeckScarfStripedBrown: 2
+    ClothingNeckScarfStripedPurple: 2
+    ClothingNeckScarfStripedBlack: 2
+    ClothingMaskNeckGaiter: 1
    ClothingUniformJumpsuitHawaiBlack: 2
    ClothingUniformJumpsuitHawaiBlue: 2
    ClothingUniformJumpsuitHawaiRed: 2
    ClothingUniformJumpsuitHawaiYellow: 2
    ClothingUniformJumpsuitFlannel: 2
+    #WD edit start
+    ClothingUniformJumpsuitCossack: 1
+    ClothingOuterCoatBomber: 1
+    ClothingOuterWinterCoat: 1
+    ClothingOuterCoatGentle: 1
+    ClothingOuterCoatInspector: 1
+    ClothingUniformJumpsuitKimono: 1
+    ClothingOuterPonchoClassic: 1
+    ClothingOuterHoodieGrey: 1
+    ClothingOuterApron: 1
+    ClothingHeadHatHetmanHat: 1
+    ClothingHeadHatFedoraGrey: 1
+    ClothingHeadHatFedoraBrown: 1
+    ClothingHeadHatTophat: 1
+    ClothingHeadHatBeaverHat: 1
+    ClothingHeadHatUshanka: 1
+    ClothingHeadSafari: 1
+    ClothingHeadFishCap: 2
+    ClothingHeadHatCasa: 1
+    ClothingHeadHatFez: 1
+    ClothingHeadRastaHat: 1
+    ClothingEyesEyepatch: 1
+    ClothingShoesLeather: 1
+    ClothingHeadHatBeret: 4
+    ClothingHeadHatGreyFlatcap: 3
+    ClothingHeadHatBrownFlatcap: 3
+    ClothingUniformJumpsuitColorBlack: 3
+    ClothingUniformJumpskirtColorBlack: 3
+    ClothingUniformJumpsuitColorDarkGreen: 2
+    ClothingUniformJumpskirtColorDarkGreen: 2
    ClothingUniformJumpsuitCasualBlue: 2
    ClothingUniformJumpskirtCasualBlue: 2
    ClothingUniformJumpsuitCasualPurple: 2
    ClothingUniformJumpskirtCasualPurple: 2
    ClothingUniformJumpsuitCasualRed: 2
    ClothingUniformJumpskirtCasualRed: 2
-    ClothingShoesColorBlack: 8
-    ClothingShoesColorBrown: 4
-    ClothingShoesColorWhite: 3
-    ClothingShoesColorBlue: 2
-    ClothingShoesColorYellow: 2
-    ClothingShoesColorGreen: 2
-    ClothingShoesColorOrange: 2
-    ClothingShoesColorRed: 2
-    ClothingShoesColorPurple: 2
-    ClothingHeadHatGreysoft: 8
-    ClothingHeadHatMimesoft: 3
-    ClothingHeadHatBluesoft: 2
-    ClothingHeadHatYellowsoft: 2
-    ClothingHeadHatGreensoft: 2
-    ClothingHeadHatOrangesoft: 2
-    ClothingHeadHatRedsoft: 2
    ClothingHeadHatBlacksoft: 2
-    ClothingHeadHatPurplesoft: 2
-    ClothingHeadHatCorpsoft: 2
-    ClothingHeadFishCap: 2
-    ClothingHeadRastaHat: 2
-    ClothingBeltStorageWaistbag: 3
    ClothingEyesGlasses: 6
    ClothingEyesGlassesSunglasses: 2
    ClothingHandsGlovesColorBlack: 4
@@ -83,6 +112,7 @@
    ClothingHandsGlovesColorGreen: 2
    ClothingHandsGlovesColorOrange: 2
    ClothingHandsGlovesColorPurple: 2
+
    #White bra start
    ClothingUnderwearTopBraWhite: 5
    ClothingUnderwearTopBraSports: 5
@@ -150,9 +180,3 @@
    ClothingUnderwearSocksStripedThigh: 2
    ClothingUnderwearSocksThinKnee: 1
    ClothingUnderwearSocksThinThigh: 1
-    # white end
-  contrabandInventory:
-    ClothingMaskNeckGaiter: 2
-    ClothingUniformJumpsuitTacticool: 1
-    ClothingUniformJumpskirtTacticool: 1
-
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
@@ -1,12 +1,13 @@
 - type: vendingMachineInventory
  id: RobustSoftdrinksInventory
  startingInventory:
-    DrinkColaCan: 4
-    DrinkGrapeCan: 2
-    DrinkRootBeerCan: 2
-    DrinkIcedTeaCan: 2
-    DrinkLemonLimeCan: 2
-    DrinkFourteenLokoCan: 2
+    DrinkColaCan: 6
+    DrinkGrapeCan: 4
+    DrinkRootBeerCan: 4
+    DrinkIcedTeaCan: 4
+    DrinkLemonLimeCan: 4
+    DrinkDrGibbCan: 4
+    DrinkFourteenLokoCan: 4
+    DrinkColaBottleFull: 2
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
@@ -1,16 +1,24 @@
 - type: vendingMachineInventory
  id: DetDrobeInventory
  startingInventory:
+    ClothingBackpackSatchelLeather: 2
+    ClothingHeadHatFedoraGrey: 2
+    ClothingHeadHatFedoraBrown: 2
+    ClothingHeadsetSecurity: 2
    ClothingUniformJumpsuitDetective: 2
    ClothingUniformJumpskirtDetective: 2
-    ClothingShoesColorBrown: 2
    ClothingOuterCoatDetective: 2
-    ClothingHeadHatFedoraBrown: 2
+    ClothingOuterVestDetective: 2
+    ClothingOuterCoatGentle: 1
+    ClothingOuterCoatInspector: 1
+    ClothingOuterCoatJensen: 1
    ClothingUniformJumpsuitDetectiveGrey: 2
    ClothingUniformJumpskirtDetectiveGrey: 2
-    ClothingOuterVestDetective: 2
    ClothingNeckTieDet: 2
-    ClothingHeadHatFedoraGrey: 2
+    ClothingShoesLeather: 2
+    ClothingShoesColorBrown: 2
    ClothingHandsGlovesColorBlack: 2
    ClothingHandsGlovesLatex: 2
-    ClothingHeadsetSecurity: 2
+    CigPackGreen: 4
+    SmokingPipeFilledTobacco: 1
+    Matchbox: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -1,7 +1,7 @@
 - type: vendingMachineInventory
  id: DinnerwareInventory
  startingInventory:
-    ButchCleaver: 1
+    ButchCleaver: 2
    KitchenKnife: 5
    RollingPin: 4
    Spoon: 4
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/discount.yml
@@ -1,9 +1,8 @@
 - type: vendingMachineInventory
  id: DiscountDansInventory
  startingInventory:
-    FoodSnackCheesie: 3
-    FoodSnackChips: 3
-    FoodSnackBoritos: 3
-    FoodSnackPopcorn: 3
-    FoodSnackEnergy: 3
-    CigPackMixed: 2
+    FoodSnackCheesie: 4
+    FoodSnackChips: 4
+    FoodSnackBoritos: 4
+    FoodSnackPopcorn: 4
+    FoodSnackEnergy: 4
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/donut.yml
@@ -1,9 +1,19 @@
 - type: vendingMachineInventory
  id: DonutInventory
  startingInventory:
-    FoodDonutChocolate: 5
-    FoodDonutApple: 3
-    FoodDonutPink: 3
-    FoodDonutBungo: 3
+    #WD edit start
+    FoodDonutPlain: 3
+    FoodDonutPink: 2
+    FoodDonutChocolate: 2
+    FoodDonutCaramel: 2
+    FoodDonutApple: 2
+    FoodDonutBlumpkin: 2
+    FoodDonutMeat: 2
+    FoodDonutSpaceman: 2
+    FoodDonutBungo: 2
+    FoodDonutJellySlugcat: 1
  emaggedInventory:
-    FoodDonutPoison: 1
+    FoodDonutPoison: 3
+  contrabandInventory:
+    FoodDonutHomer: 2
+  #WD edit end
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engidrobe.yml
@@ -1,18 +1,20 @@
 - type: vendingMachineInventory
  id: EngiDrobeInventory
  startingInventory:
-    ClothingBackpackDuffelEngineering: 3
-    ClothingBackpackSatchelEngineering: 3
-    ClothingBackpackEngineering: 3
-    ClothingUniformJumpsuitEngineering: 3
-    ClothingUniformJumpskirtEngineering: 3
-    ClothingUniformJumpsuitEngineeringHazard: 3
-    ClothingShoesColorBlack: 3
-    ClothingOuterVestHazard: 3
-    ClothingShoesBootsWork: 3
-    ClothingHeadHatHardhatYellow: 3
-    ClothingHeadHatHardhatOrange: 3
-    ClothingHeadsetEngineering: 3
-    ClothingOuterWinterEngi: 2
-    ClothingNeckScarfStripedOrange: 3
+    ClothingBackpackDuffelEngineering: 5
+    ClothingBackpackSatchelEngineering: 5
+    ClothingBackpackEngineering: 5
+    ClothingHeadHatBeretEngineering: 5
+    ClothingHeadHatHardhatYellow: 5
+    ClothingHeadHatHardhatOrange: 5
+    ClothingHeadsetEngineering: 5
+    ClothingNeckScarfStripedOrange: 5
+    ClothingOuterVestHazard: 5
+    ClothingOuterWinterEngi: 5
+    ClothingUniformJumpsuitEngineering: 5
+    ClothingUniformJumpskirtEngineering: 5
+    ClothingUniformJumpsuitEngineeringHazard: 5
+    ClothingBeltUtility: 5
+    ClothingShoesColorBlack: 5
+    ClothingShoesBootsWork: 5
    ClothingShoesBootsWinterEngi: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -7,4 +7,8 @@
    NetworkConfigurator: 5
    PowerCellMedium: 5
    ClothingHandsGlovesColorYellow: 6
-    BoxInflatable: 2
+    HolofanProjector: 5
+    trayScanner: 5
+    GeigerCounter: 5
+    InflatableWallStack1: 24
+    InflatableDoorStack1: 8
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml
@@ -16,3 +16,5 @@
    PaperCNCSheet: 6
    MysteryFigureBox: 2
    BooksBag: 3
+  emaggedInventory:
+    BalloonSyn: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/genedrobe.yml
@@ -1,11 +1,12 @@
 - type: vendingMachineInventory
  id: GeneDrobeInventory
  startingInventory:
-    ClothingUniformJumpsuitGenetics: 2
-    ClothingUniformJumpskirtGenetics: 2
-    ClothingShoesColorWhite: 2
-    ClothingOuterCoatLabGene: 2
-    ClothingOuterWinterGen: 2
    ClothingBackpackGenetics: 2
    ClothingBackpackSatchelGenetics: 2
    ClothingBackpackDuffelGenetics: 2
+    ClothingHeadHatBeretBrigmedic: 2
+    ClothingOuterCoatLabGene: 2
+    ClothingOuterWinterGen: 2
+    ClothingUniformJumpsuitGenetics: 2
+    ClothingUniformJumpskirtGenetics: 2
+    ClothingShoesColorWhite: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml
@@ -2,7 +2,7 @@
  id: HappyHonkDispenserInventory
  startingInventory:
    HappyHonk: 10
-    HappyHonkMime: 4
+    HappyHonkMime: 10
  emaggedInventory:
-    HappyHonkCluwne: 1
-    HappyHonkNukie: 1
+    HappyHonkCluwne: 3
+    HappyHonkNukie: 3
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/hydrobe.yml
@@ -1,15 +1,17 @@
 - type: vendingMachineInventory
  id: HyDrobeInventory
  startingInventory:
-    ClothingBackpackHydroponics: 2
-    ClothingBackpackSatchelHydroponics: 2
-    ClothingBackpackDuffelHydroponics: 2
-    ClothingOuterApronBotanist: 2
+    ClothingBackpackHydroponics: 3
+    ClothingBackpackSatchelHydroponics: 3
+    ClothingBackpackDuffelHydroponics: 3
+    ClothingHeadBandBotany: 3
+    ClothingHeadsetService: 3
+    ClothingOuterWinterHydro: 3
+    ClothingOuterApronBotanist: 3
+    ClothingBeltPlant: 3
    ClothingUniformOveralls: 3
    ClothingUniformJumpsuitHydroponics: 3
    ClothingUniformJumpskirtHydroponics: 3
+    ClothingHandsGlovesLeather: 3
+    ClothingShoesColorGreen: 3
    ClothingNeckScarfStripedGreen: 3
-    ClothingHeadBandBotany: 3
-    ClothingHeadsetService: 2
-    ClothingOuterWinterHydro: 2
-
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/janidrobe.yml
@@ -1,16 +1,15 @@
 - type: vendingMachineInventory
  id: JaniDrobeInventory
  startingInventory:
-    ClothingUniformJumpsuitJanitor: 2
-    ClothingUniformJumpskirtJanitor: 2
+    ClothingBackpack: 4
+    ClothingHeadHatPurplesoft: 4
+    ClothingHeadsetService: 4
+    ClothingNeckScarfStripedPurple: 4
+    ClothingOuterWinterJani: 4
+    ClothingUniformJumpsuitJanitor: 4
+    ClothingUniformJumpskirtJanitor: 4
+    ClothingBeltJanitor: 4
+    ClothingHandsGlovesColorBlack: 4
+    ClothingShoesGaloshes: 2
+    ClothingShoesColorBlack: 4
    ClothingHandsGlovesJanitor: 2
-    ClothingShoesColorBlack: 2
-    ClothingHeadHatPurplesoft: 2
-    ClothingBeltJanitor: 2
-    ClothingHeadsetService: 2
-    ClothingOuterWinterJani: 2
-    ClothingNeckScarfStripedPurple: 3
-
-  emaggedInventory:
-    ClothingUniformJumpskirtJanimaid: 2
-    ClothingUniformJumpskirtJanimaidmini: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
@@ -1,19 +1,24 @@
 - type: vendingMachineInventory
  id: LawDrobeInventory
  startingInventory:
-    ClothingUniformJumpsuitLawyerBlue: 1
-    ClothingUniformJumpskirtLawyerBlue: 1
-    ClothingUniformJumpsuitLawyerPurple: 1
-    ClothingUniformJumpskirtLawyerPurple: 1
-    ClothingUniformJumpsuitLawyerRed: 1
-    ClothingUniformJumpskirtLawyerRed: 1
-    ClothingUniformJumpsuitLawyerBlack: 1
-    ClothingUniformJumpskirtLawyerBlack: 1
-    ClothingUniformJumpsuitLawyerGood: 1
-    ClothingUniformJumpskirtLawyerGood: 1
-    ClothingShoesBootsLaceup: 2
+    ClothingBackpack: 2
    ClothingHeadsetService: 2
+    ClothingEyesGlassesSunglasses: 2
+    ClothingEyesGlasses: 2
    ClothingNeckLawyerbadge: 2
+    ClothingUniformJumpsuitLawyerBlue: 2
+    ClothingUniformJumpskirtLawyerBlue: 2
+    ClothingUniformJumpsuitLawyerPurple: 2
+    ClothingUniformJumpskirtLawyerPurple: 2
+    ClothingUniformJumpsuitLawyerRed: 2
+    ClothingUniformJumpskirtLawyerRed: 2
+    ClothingUniformJumpsuitLawyerBlack: 2
+    ClothingUniformJumpskirtLawyerBlack: 2
+    ClothingUniformJumpsuitLawyerGood: 2
+    ClothingUniformJumpskirtLawyerGood: 2
+    ClothingHandsGlovesColorWhite: 2
+    ClothingShoesBootsLaceup: 2
+    RubberStampLawyer: 1
    Eftpos: 3
  emaggedInventory:
    CyberPen: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/magivend.yml
@@ -9,6 +9,3 @@
    ClothingHeadHatVioletwizard: 3
    ClothingOuterWizardViolet: 3
    ClothingShoesWizard: 9
-    #TO DO:
-    #only missing staff
-    #and if wizarditis reagent when hacked if we want this.
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
@@ -5,6 +5,12 @@
    Brutepack: 5
    Ointment: 5
    Bloodpack: 5
+    Gauze: 5
    EpinephrineChemistryBottle: 3
    Syringe: 5
-    Eftpos: 2 #WD edit
+    EmergencyMedipen: 2
+    SyringeBicaridine: 1
+    SyringeDermaline: 1
+    Eftpos: 2
+  emaggedInventory:
+    SyringeEphedrine: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
@@ -4,18 +4,29 @@
    ClothingBackpackDuffelMedical: 4
    ClothingBackpackMedical: 4
    ClothingBackpackSatchelMedical: 4
+    ClothingHeadHelmetVoidParamed: 2
+    ClothingOuterHardsuitVoidParamed: 2
+    ClothingHeadHatBeretBrigmedic: 4
+    ClothingHeadNurseHat: 4
+    ClothingHeadHatParamedicsoft: 4
+    ClothingHeadsetMedical: 4
+    ClothingEyesHudMedical: 5
+    ClothingMaskSterile: 4
+    ClothingOuterWinterMed: 4
+    ClothingOuterWinterPara: 4
+    ClothingOuterCoatParamedicWB: 4
+    ClothingOuterCoatLab: 4
+    ClothingUniformJumpsuitParamedic: 4
+    ClothingUniformJumpskirtParamedic: 4
+    ClothingHandsGlovesLatex: 4
+    ClothingShoesColorWhite: 9
+    ClothingOuterHospitalGown: 5
+    UniformScrubsColorGreen: 5
+    UniformScrubsColorBlue: 5
+    UniformScrubsColorPurple: 5
    ClothingUniformJumpsuitMedicalDoctor: 4
    ClothingUniformJumpskirtMedicalDoctor: 4
    ClothingEyesEyepatchHudMedical: 1
    ClothingHeadHatBeretMedic: 4
-    ClothingHeadNurseHat: 4
-    ClothingOuterCoatLab: 4
-    ClothingShoesColorWhite: 4
-    ClothingHandsGlovesLatex: 4
-    ClothingHeadsetMedical: 4
-    ClothingOuterWinterMed: 2
-    ClothingOuterHospitalGown: 5
-    UniformScrubsColorGreen: 4
-    UniformScrubsColorBlue: 4
-    UniformScrubsColorPurple: 4
    ClothingShoesBootsWinterMed: 2
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/nutri.yml
@@ -7,17 +7,16 @@
    HydroponicsToolScythe: 4
    HydroponicsToolHatchet: 4
    PlantBag: 4
-    HandheldSeedAnalyzer: 4
    PlantBGoneSpray: 20
    WeedSpray: 20
    PestSpray: 20
    Syringe: 5
-    RobustHarvestChemistryBottle: 3
-    EZNutrientChemistryBottle: 3
-    Bucket: 3
+    RobustHarvestChemistryBottle: 5
+    Bucket: 5
    DiseaseSwab: 20
-    Eftpos: 4 #WD edit
-    #TO DO:
-    #plant analyzer
+    HandheldSeedAnalyzer: 4
+    EZNutrientChemistryBottle: 3
+    Eftpos: 4
+
  emaggedInventory:
    Left4ZedChemistryBottle: 1
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
@@ -1,13 +1,13 @@
 - type: vendingMachineInventory
  id: PwrGameInventory
  startingInventory:
-    DrinkPwrGameCan: 4
-    DrinkEnergyDrinkCan: 4
-    DrinkGrapeCan: 2
-    DrinkRootBeerCan: 2
-    DrinkIcedTeaCan: 2
-    DrinkLemonLimeCan: 2
-    DrinkFourteenLokoCan: 2
+    DrinkPwrGameCan: 5
+    DrinkEnergyDrinkCan: 5
+    DrinkGrapeCan: 5
+    DrinkRootBeerCan: 5
+    DrinkIcedTeaCan: 5
+    DrinkLemonLimeCan: 5
+    DrinkDrGibbCan: 5
+    DrinkFourteenLokoCan: 5
  emaggedInventory:
    DrinkNukieCan: 2
-    DrinkChangelingStingCan: 2
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robodrobe.yml
@@ -1,12 +1,15 @@
 - type: vendingMachineInventory
  id: RoboDrobeInventory
  startingInventory:
-    ClothingOuterCoatRobo: 2
-    ClothingUniformJumpsuitRoboticist: 2
-    ClothingUniformJumpskirtRoboticist: 2
-    ClothingShoesColorBlack: 2
-    ClothingHandsGlovesRobohands: 2
    ClothingHeadHatCorpsoft: 2
    ClothingHeadBandSkull: 2
    ClothingHeadsetRobotics: 2
+    ClothingEyesHudDiagnostic: 2
    ClothingOuterWinterRobo: 2
+    ClothingOuterCoatRobo: 2
+    ClothingUniformJumpsuitRoboticist: 2
+    ClothingUniformJumpskirtRoboticist: 2
+    ClothingHandsGlovesFingerless: 2
+    ClothingShoesColorBlack: 2
+    ClothingHandsGlovesRobohands: 2
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml
@@ -1,19 +1,19 @@
 - type: vendingMachineInventory
  id: RoboticsInventory
  startingInventory:
-    CableApcStack: 4
+    CableApcStack: 10
+    ProximitySensor: 10
+    RemoteSignaller: 10
    SciFlash: 4
-    ProximitySensor: 3
    ClothingEyesHudDiagnostic: 2
-    RemoteSignaller: 3
-    Igniter: 3 # its more ordnance but yeah
+    Igniter: 3
    HandheldHealthAnalyzer: 3
    Scalpel: 2
    SawElectric: 2
-    #Bonesetter: 2 add when robotics
    NitrousOxideTankFilled: 2
    ClothingMaskBreathMedical: 5
    ClothingHeadHatWeldingMaskFlame: 1
    Welder: 1
    Screwdriver: 2
    Crowbar: 2
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -1,15 +1,24 @@
 - type: vendingMachineInventory
  id: SalvageEquipmentInventory
  startingInventory:
-    Crowbar: 2
-    Pickaxe: 4
-    OreBag: 4
-    Flare: 4
-    FlashlightLantern: 2
-    Floodlight: 2
-    HandheldGPSBasic: 2
-    RadioHandheld: 2
    WeaponProtoKineticAccelerator: 4
-    SeismicCharge: 2
-    FultonBeacon: 1
-    Fulton: 2
+    WeaponCrusher: 4
+    WeaponCrusherDagger: 4
+    WeaponGrapplingGun: 3
+    HandheldGPSBasic: 10
+    Crowbar: 6
+    BoxMRE: 6
+    Pickaxe: 6
+    SurvivalKnife: 3
+    OreBag: 6
+    Flare: 20
+    FlashlightLantern: 6
+    Floodlight: 2
+    RadioHandheld: 10
+    StackHolderHealingItem: 2
+    InflatableWallStack1: 40
+    InflatableDoorStack1: 10
+    SeismicCharge: 3
+    FultonBeacon: 2
+    Fulton: 3
+
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
@@ -1,17 +1,23 @@
 - type: vendingMachineInventory
  id: SciDrobeInventory
  startingInventory:
-    ClothingBackpackScience: 3
-    ClothingBackpackSatchelScience: 3
-    ClothingBackpackDuffelScience: 3
-    ClothingUniformJumpsuitScientist: 3
-    ClothingUniformJumpskirtScientist: 3
-    ClothingUniformJumpsuitScientistFormal: 3
-    ClothingOuterCoatRnd: 3
-    ClothingShoesColorWhite: 3
-    ClothingNeckTieSci: 3
-    ClothingHeadsetScience: 3
-    ClothingMaskGas: 3
-    ClothingOuterWinterSci: 2
-    ClothingNeckScarfStripedPurple: 3
+    ClothingBackpackScience: 6
+    ClothingBackpackSatchelScience: 6
+    ClothingBackpackDuffelScience: 6
+    ClothingHeadHatBeretRND: 6
+    ClothingHeadsetScience: 6
+    ClothingMaskGas: 6
+    ClothingNeckScarfStripedPurple: 6
+    ClothingNeckTieSci: 6
+    ClothingOuterCoatRnd: 6
+    ClothingOuterWinterSci: 6
+    ClothingUniformJumpsuitScientist: 6
+    ClothingUniformJumpskirtScientist: 6
+    ClothingUniformJumpsuitScientistFormal: 6
+    ClothingHandsGlovesLatex: 6
+    ClothingShoesColorWhite: 6
+    ClothingOuterBioScientist: 2
+    ClothingHeadHatHoodBioScientist: 2
    ClothingShoesBootsWinterSci: 2
+
+
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`backstab-damage-betrayal-dagger = Удар в спину: {$damage}!`