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

2024-08-03 22:32:36 +03:00
parent 64ad5900c8 76b15fd787
commit 1adca3107a
77 changed files with 791 additions and 341 deletions
--- a/Resources/Audio/Effects/Footsteps/attributions.yml
+++ b/Resources/Audio/Effects/Footsteps/attributions.yml
@@ -71,3 +71,10 @@
  license: "CC-BY-SA-3.0"
  copyright: "Taken from tgstation"
  source: "https://github.com/tgstation/tgstation/tree/1e8d511946d194f92f744f5f957a7c41683d84a6/sound/effects/footstep"
+
+- files:
+  - borgwalk1.ogg
+  - borgwalk2.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Taken from IENBA freesound.org and modified by https://github.com/MilenVolf"
+  source: "https://freesound.org/people/IENBA/sounds/697379/"
--- a/Resources/Audio/Effects/Footsteps/borgwalk1.ogg
+++ b/Resources/Audio/Effects/Footsteps/borgwalk1.ogg
--- a/Resources/Audio/Effects/Footsteps/borgwalk2.ogg
+++ b/Resources/Audio/Effects/Footsteps/borgwalk2.ogg
--- a/Resources/Audio/Voice/Silicon/attributions.yml
+++ b/Resources/Audio/Voice/Silicon/attributions.yml
@@ -0,0 +1,4 @@
+- files: ["syndieborg_laugh.ogg"]
+  license: "CC0-1.0"
+  copyright: "Taken from vultraz168 freesound.org and modified by https://github.com/MilenVolf"
+  source: "https://freesound.org/people/vultraz168/sounds/334665/"
--- a/Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg
+++ b/Resources/Audio/Voice/Silicon/syndieborg_laugh.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/attributions.yml
+++ b/Resources/Audio/Voice/Talk/Silicon/attributions.yml
@@ -0,0 +1,10 @@
+- files:
+  - borg.ogg
+  - borg_ask.ogg
+  - borg_exclaim.ogg
+  - syndieborg.ogg
+  - syndieborg_ask.ogg
+  - syndieborg_exclaim.ogg
+  license: "CC-BY-SA-4.0"
+  copyright: "Recorded and mixed by https://github.com/MilenVolf"
+  source: "https://github.com/space-wizards/space-station-14/pull/27205"
--- a/Resources/Audio/Voice/Talk/Silicon/borg.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/borg.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/borg_ask.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/borg_exclaim.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/syndieborg.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/syndieborg_ask.ogg
--- a/Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg
+++ b/Resources/Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -7470,3 +7470,212 @@
  id: 451
  time: '2024-08-02T11:50:26.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/542
+- author: PuroSlavKing
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043A\u043B\
+      \u0430\u0434\u043A\u0430 \u043B\u043E\u0434\u0430\u0443\u0442\u0430 \"\u0421\
+      \u0440\u0435\u0434\u0441\u0442\u0432\u0430 \u0441\u0430\u043C\u043E\u043E\u0431\
+      \u043E\u0440\u043E\u043D\u044B\", \u0434\u043B\u044F \u0433\u043B\u0430\u0432\
+      ."
+    type: Add
+  - message: "\u0422\u0435\u043B\u0435\u0441\u043A\u043E\u043F\u0438\u0447\u0435\u0441\
+      \u043A\u0430\u044F \u0434\u0443\u0431\u0438\u043D\u043A\u0430 \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u043D\u0435 \u0432\u044B\u0431\u0438\u0432\u0430\u0435\u0442\
+      \ \u0432\u0435\u0449\u0438 \u0438\u0437 \u0440\u0443\u043A."
+    type: Tweak
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0443\u0440\u043E\u043D\
+      \ \u0442\u0435\u043B\u0435\u0441\u043A\u043E\u043F\u0438\u0447\u0435\u0441\u043A\
+      \u043E\u0439 \u0434\u0443\u0431\u0438\u043D\u043A\u0438, 12 > 2 ~~(\u042D\u0442\
+      \u043E \u043D\u0435 \u043E\u0440\u0443\u0436\u0438\u0435)~~, \u0443\u043C\u0435\
+      \u043D\u044C\u0448\u0435\u043D \u0443\u0440\u043E\u043D \u043F\u043E \u0441\u0442\
+      \u0430\u043C\u0438\u043D\u0435, 55 > 16 ~~(\u042D\u0442\u043E \u043D\u0435 \u0441\
+      \u0442\u0430\u043D\u0431\u0430\u0442\u043E\u043D)~~, \u043D\u043E \u0441\u043A\
+      \u043E\u0440\u043E\u0441\u0442\u044C \u0430\u0442\u0430\u043A\u0438 \u0441\u0442\
+      \u0430\u043B\u0430 \u0431\u044B\u0441\u0442\u0440\u0435\u0435 \u0432 \u043D\u0435\
+      \u0441\u043A\u043E\u043B\u044C\u043A\u043E \u0440\u0430\u0437."
+    type: Tweak
+  id: 452
+  time: '2024-08-03T12:53:19.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/544
+- author: reizor32
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043D\u043E\u0432\
+      \u044B\u0435 \u0438 \u0443\u0434\u0430\u043B\u0435\u043D\u044B \u043D\u0435\u043A\
+      \u043E\u0442\u043E\u0440\u044B\u0435 \u0438\u043C\u0435\u043D\u0430 \u0438\u0437\
+      \ \u0433\u0435\u043D\u0435\u0440\u0430\u0442\u043E\u0440\u0430 \u0438\u043C\u0451\
+      \u043D"
+    type: Fix
+  id: 453
+  time: '2024-08-03T12:58:17.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/543
+- author: ThereDrD0
+  changes:
+  - message: "\u0422\u0435\u043B\u0435\u0441\u043A\u043E\u043F\u0438\u0447\u043A\u0430\
+      \ \u0441\u043D\u043E\u0432\u0430 \u0432\u044B\u0431\u0438\u0432\u0430\u0435\u0442\
+      \ \u043F\u0440\u0435\u0434\u043C\u0435\u0442\u044B \u0438\u0437 \u0440\u0443\
+      \u043A, \u0431\u044C\u0435\u0442 \u043C\u0435\u0434\u043B\u0435\u043D\u043D\u043E\
+      \ \u0438 \u043D\u0430\u043D\u043E\u0441\u0438\u0442 9 \u0443\u0440\u043E\u043D\
+      \u0430"
+    type: Tweak
+  id: 454
+  time: '2024-08-03T14:02:07.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/546
+- author: Aviu
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0447\u0442\u043E\u0431\u044B\
+      \ \u0432\u043E\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\
+      \u0441\u044F \u0441\u0442\u0430\u043D \u0430\u0443\u0440\u043E\u0439 \u0438\u043B\
+      \u0438 \u0430\u0443\u0440\u043E\u0439 \u043A\u0440\u043E\u0432\u0430\u0432\u044B\
+      \u0445 \u043E\u0431\u0440\u044F\u0434\u043E\u0432 \u043D\u0443\u0436\u043D\u043E\
+      \ \u043A\u043B\u0438\u043A\u043D\u0443\u0442\u044C \u043F\u043E \u043A\u043E\
+      \u0441\u043C\u043E\u043D\u0430\u0432\u0442\u0438\u043A\u0443, \u0430 \u043D\u0435\
+      \ \u0443\u0434\u0430\u0440\u0438\u0442\u044C."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u043A\u043B\u0438\u043A\u0430\u0442\u044C \u043F\u043E \u043A\u043E\u0441\
+      \u043C\u043E\u043D\u0430\u0432\u0442\u0438\u043A\u0430\u043C \u0447\u0435\u0440\
+      \u0435\u0437 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u043D\u043E\u0435\
+      \ \u043C\u0435\u043D\u044E, \u0438\u043D\u0430\u0447\u0435 \u043C\u043E\u0436\
+      \u043D\u043E \u0431\u044B\u043B\u043E \u0441\u043B\u0438\u0448\u043A\u043E\u043C\
+      \ \u043F\u0440\u043E\u0441\u0442\u043E \u0437\u0430\u0442\u044B\u043A\u0430\u0442\
+      \u044C \u0433\u0438\u043F\u043E\u0441\u043F\u0440\u0435\u0435\u043C \u0438\u043B\
+      \u0438 \u043E\u0433\u043B\u0443\u0448\u0438\u0442\u044C \u043F\u0435\u0440\u0447\
+      \u0430\u0442\u043A\u0430\u043C\u0438 \u043D\u0438\u043D\u0434\u0437\u044F."
+    type: Add
+  - message: "\u041D\u0430\u0440\u0441\u0438 \u0441\u043D\u043E\u0430 \u043A\u043E\
+      \u0440\u0440\u0435\u043A\u0442\u043D\u043E \u0441\u043F\u0430\u0432\u043D\u0438\
+      \u0442\u0441\u044F."
+    type: Fix
+  - message: "\u0414\u0438\u0430\u0433\u043E\u043D\u0430\u043B\u044C\u043D\u044B\u0435\
+      \ \u0440\u0435\u0448\u0435\u0442\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043F\u0440\u043E\u043F\u0443\u0441\u043A\u0430\u044E\u0442 \u043B\u0430\u0437\
+      \u0435\u0440\u044B."
+    type: Fix
+  - message: "\u0418\u0437 \u0442\u0430\u0440\u0430\u043A\u0430\u043D\u043E\u0432\
+      \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0432\u044B\u043F\u0430\
+      \u0434\u0430\u044E\u0442 \u043E\u0440\u0433\u0430\u043D\u044B."
+    type: Fix
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u0441\u043B\
+      \u044B\u0448\u0430\u0442 \u0447\u0430\u0442 \u043A\u0443\u043B\u044C\u0442\u0430\
+      ."
+    type: Fix
+  - message: "NPC \u043C\u043E\u0433\u0443\u0442 \u043F\u0440\u043E\u043C\u0430\u0445\
+      \u0438\u0432\u0430\u0442\u044C\u0441\u044F."
+    type: Fix
+  - message: "\u041A\u0440\u043E\u0432\u0430\u0432\u044B\u0435 \u043E\u0431\u0440\u044F\
+      \u0434\u044B \u0442\u0435\u043F\u0435\u0440\u044C \u043B\u0435\u0447\u0430\u0442\
+      \ 1 \u0445\u043F \u0437\u0430 1 \u0435\u0434\u0438\u043D\u0438\u0446\u0443 \u043A\
+      \u0440\u043E\u0432\u0438."
+    type: Tweak
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0448\u0430\u043D\u0441\
+      \ \u043C\u0430\u0433\u0430 \u0432 \u0441\u0435\u043A\u0440\u0435\u0442\u0435\
+      \ \u0434\u043E 9%, \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D \u0448\u0430\
+      \u043D\u0441 \u0440\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u0438 \u0434\u043E\
+      \ 10%."
+    type: Tweak
+  - message: "\u0412 \u0442\u0435\u0440\u043C\u0430\u043B\u043A\u0430\u0445 \u0431\
+      \u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0432\u0438\u0434\u043D\u043E \u043A\
+      \u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0432 \u0438 \u0441\u0443\
+      \u0449\u0435\u0441\u0442\u0432 \u0432 \u0441\u0442\u0435\u043B\u0441\u0435."
+    type: Tweak
+  - message: "\u041E\u0442\u043A\u0430\u0442 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\
+      \u043D\u0438\u044F \u0434\u0430\u043B\u044C\u043D\u043E\u0441\u0442\u0438 \u0430\
+      \u0442\u0430\u043A\u0438 \u043C\u0438\u043B\u0438\u0448\u0435\u043A."
+    type: Tweak
+  - message: "\u041D\u043E\u043A\u0434\u0430\u0443\u043D \u043E\u0442 \u0432\u0441\
+      \u043F\u044B\u0448\u0435\u043A \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\
+      \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043D\u0430 \u0442\u0435\
+      \u0445, \u043A\u0442\u043E \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043B\
+      \u0435\u0447\u044C, \u0432\u0440\u0435\u043C\u044F \u043D\u043E\u043A\u0434\u0430\
+      \u0443\u043D\u0430 \u0443\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0434\
+      \u043E 10 \u0441\u0435\u043A\u0443\u043D\u0434 \u043C\u0430\u043A\u0441\u0438\
+      \u043C\u0443\u043C."
+    type: Tweak
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u043F\u043E\u0434\u043E\
+      \u0437\u0440\u0438\u0442\u0435\u043B\u044C\u043D\u043E\u043C \u044F\u0449\u0438\
+      \u043A\u0435 \u043B\u0435\u0436\u0438\u0442 \u043F\u043E\u044F\u0441 \u0441\
+      \ \u0438\u043D\u0441\u0442\u0440\u0443\u043C\u0435\u043D\u0442\u0430\u043C\u0438\
+      ."
+    type: Tweak
+  id: 455
+  time: '2024-08-03T15:23:46.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/548
+- author: ThereDrD0
+  changes:
+  - message: "\u0411\u043E\u0440\u0433\u0438 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\
+      \u0438 \u043D\u043E\u0432\u044B\u0435 \u0437\u0432\u0443\u043A\u0438 \u0445\u043E\
+      \u0434\u044C\u0431\u044B. \u0421\u0438\u043D\u0434\u0438\u0431\u043E\u0440\u0433\
+      \u0438 \u0438 \u0443\u043B\u0443\u0447\u0448\u0435\u043D\u043D\u044B\u0435 \u0431\
+      \u043E\u0440\u0433\u0438 \u043F\u043E\u043B\u0443\u0447\u0438\u043B\u0438 \u043D\
+      \u043E\u0432\u044B\u0435 \u0437\u0432\u0443\u043A\u0438 \u0440\u0430\u0437\u0433\
+      \u043E\u0432\u043E\u0440\u0430"
+    type: Add
+  - message: "\u0411\u043E\u0440\u0433\u043E\u0432 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043C\u043E\u0436\u043D\u043E \u0433\u043B\u0430\u0434\u0438\u0442\u044C"
+    type: Add
+  - message: "\u0412 \u043B\u043E\u0433\u0430\u0445 \u0434\u0432\u0435\u0440\u0435\
+      \u0439 \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043E\u0445\u0440\u0430\u043D\
+      \u044F\u044E\u0442\u0441\u044F \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u044F\
+      \ \u0431\u043E\u0440\u0433\u043E\u0432"
+    type: Tweak
+  - message: "\u041C\u0435\u0434\u0431\u043E\u0440\u0433 \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u0440\u0430\u0437\u043B\u0438\u0447\u0430\u0435\u0442 \u0440\u0435\u0430\
+      \u0433\u0435\u043D\u0442\u044B"
+    type: Tweak
+  - message: "\u0421\u0438\u043D\u0434\u0438\u0431\u043E\u0440\u0433\u0438 \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u043A\u0440\u0430\u0441\
+      \u043D\u044B\u0435 \u0444\u043E\u043D\u0430\u0440\u0438\u043A\u0438"
+    type: Tweak
+  - message: "\u041C\u0435\u0434\u0431\u043E\u0440\u0433 \u043F\u043E\u043B\u0443\u0447\
+      \u0438\u043B \u0430\u043D\u0430\u043B\u0438\u0437\u0430\u0442\u043E\u0440 \u0437\
+      \u0434\u043E\u0440\u043E\u0432\u044C\u044F"
+    type: Tweak
+  - message: "\u041C\u0435\u0434\u0431\u043E\u0440\u0433\u0438 \u043F\u043E\u043B\u0443\
+      \u0447\u0438\u043B\u0438 \u043C\u0435\u0434\u0445\u0443\u0434"
+    type: Tweak
+  - message: "\u0428\u043B\u044F\u043F\u044B \u043D\u0430 \u0431\u043E\u0440\u0433\
+      \u0430\u0445 \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435 \u0441\u0434\u0432\
+      \u0438\u043D\u0443\u0442\u044B \u043D\u0430 \u043F\u0438\u043A\u0441\u0435\u043B\
+      \u044C"
+    type: Fix
+  - message: "\u0412 \u0431\u043E\u0440\u0433\u043E\u0432 \u0431\u043E\u043B\u044C\
+      \u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u0441\u0443\u043D\u0443\u0442\
+      \u044C \u0434\u0432\u0430 \u043E\u0434\u0438\u043D\u0430\u043A\u043E\u0432\u044B\
+      \u0445 \u043C\u043E\u0434\u0443\u043B\u044F"
+    type: Fix
+  - message: "\u0415\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u0445 \u0431\u043E\u0440\
+      \u0433\u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\
+      \u0437\u044F \u043E\u043F\u043E\u0437\u043D\u0430\u0442\u044C \u043F\u043E \u043E\
+      \u043F\u0438\u0441\u0430\u043D\u0438\u044E"
+    type: Fix
+  - message: "\u0415\u043C\u0430\u0433\u043D\u0443\u0442\u044B\u0435 \u0431\u043E\u0440\
+      \u0433\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0433\u0443\u0442\
+      \ \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0432\
+      \u043E\u0438 \u043F\u0430\u043D\u0435\u043B\u0438"
+    type: Fix
+  - message: "\u0421\u0438\u043D\u0434\u0438\u0431\u043E\u0440\u0433 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043C\u043E\u0436\u0435\u0442 \u0432\u0437\u044F\u0442\u044C\
+      \ \u0441\u0432\u043E\u0439 \u0434\u0435\u0441\u0432\u043E\u0440\u0434 \u0432\
+      \ \u0434\u0432\u0435 \u0440\u0443\u043A\u0438"
+    type: Fix
+  - message: "\u0411\u043E\u0440\u0433\u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435\
+      \ \u043D\u0435 \u0431\u044C\u0435\u0442 \u0442\u043E\u043A\u043E\u043C \u0438\
+      \ \u043E\u043D\u0438 \u043D\u0435 \u043C\u043E\u0433\u0443\u0442 \u043F\u043E\
+      \u0441\u043A\u043E\u043B\u044C\u0437\u043D\u0443\u0442\u044C\u0441\u044F"
+    type: Fix
+  id: 456
+  time: '2024-08-03T15:53:54.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/549
+- author: ThereDrD0
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u0430 \u043F\u0440\u043E\
+      \u0432\u0435\u0440\u043A\u0430 \u043D\u0430 \u043D\u0435\u0441\u043A\u043E\u043B\
+      \u044C\u043A\u043E \u043C\u043E\u0434\u0443\u043B\u0435\u0439, \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043E\u043D\u0430 \u043D\u0435 \u0441\u0440\u0430\u0431\u0430\
+      \u0442\u044B\u0432\u0430\u0435\u0442 \u0434\u0430\u0436\u0435 \u0442\u043E\u0433\
+      \u0434\u0430, \u043A\u043E\u0433\u0434\u0430 \u0432 \u0431\u043E\u0440\u0433\
+      \u0435 \u043D\u0435\u0442 \u043C\u043E\u0434\u0443\u043B\u0435\u0439"
+    type: Fix
+  id: 457
+  time: '2024-08-03T18:31:23.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/551
--- a/Resources/Locale/en-US/borg/borg.ftl
+++ b/Resources/Locale/en-US/borg/borg.ftl
@@ -1,4 +1,4 @@
-borg-player-not-allowed = The brain doesn't fit!
+borg-player-not-allowed = The brain doesn't fit!
 borg-player-not-allowed-eject = The brain was expelled from the chassis!

 borg-panel-not-open = The cyborg's panel isn't open...
@@ -7,6 +7,7 @@ borg-mind-added = {CAPITALIZE($name)} powered on!
 borg-mind-removed = {CAPITALIZE($name)} shut off!

 borg-module-too-many = There's not enough room for another module...
+borg-module-duplicate = This module is already installed in this cyborg.
 borg-module-whitelist-deny = This module doesn't fit in this type of cyborg...

 borg-construction-guide-string = The cyborg limbs and torso must be attached to the endoskeleton.
--- a/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
+++ b/Resources/Locale/en-US/interaction/interaction-popup-component.ftl
@@ -61,12 +61,26 @@ petting-success-honkbot = You pet {THE($target)} on {POSS-ADJ($target)} slippery
 petting-success-mimebot = You pet {THE($target)} on {POSS-ADJ($target)} cold metal head.
 petting-success-cleanbot = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
 petting-success-medibot = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
+petting-success-generic-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} metal head.
+petting-success-salvage-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dirty metal head.
+petting-success-engineer-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} reflective metal head.
+petting-success-janitor-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} damp metal head.
+petting-success-medical-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} sterile metal head.
+petting-success-service-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} dapper looking metal head.
+petting-success-syndicate-cyborg = You pet {THE($target)} on {POSS-ADJ($target)} menacing metal head.
 petting-success-recycler = You pet {THE($target)} on {POSS-ADJ($target)} mildly threatening steel exterior.

 petting-failure-honkbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} honks in refusal!
 petting-failure-cleanbot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy mopping!
 petting-failure-mimebot = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy miming!
 petting-failure-medibot = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} syringe nearly stabs your hand!
+petting-failure-generic-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy stating laws!
+petting-failure-salvage-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy drilling!
+petting-failure-engineer-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy repairing!
+petting-failure-janitor-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy cleaning!
+petting-failure-medical-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy saving lives!
+petting-failure-service-cyborg = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} busy serving others!
+petting-failure-syndicate-cyborg = You reach out to pet {THE($target)}, but {POSS-ADJ($target)} treacherous affiliation makes you reconsider.

 ## Knocking on windows

--- a/Resources/Locale/en-US/station-laws/laws.ftl
+++ b/Resources/Locale/en-US/station-laws/laws.ftl
@@ -47,5 +47,3 @@ laws-ui-state-law = State law:

 laws-notify = You are bound to silicon laws, which you can view via the sidebar action. You are required to always follow your laws.
 laws-update-notify = Your laws have been updated. You can view the changes via the sidebar action.
-
-laws-compromised-examine = The [color=red]law-governing[/color] internals seem damaged...
--- a/Resources/Locale/ru-RU/_white/cult/entities.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/entities.ftl
@@ -6,10 +6,10 @@ ent-SoulShardGhost = камень душ
    .suffix = Роль призраков

 ent-StunHand = оглушающая аура
-    .desc = Оглушит и обезмолвит жертву при ударе.
+    .desc = Оглушит и обезмолвит жертву при контакте.

 ent-RitesHand = аура кровавых обрядов
-    .desc = Впитывает кровь из всего, к чему прикасается. При ударе по культистам и конструктам может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.
+    .desc = Впитывает кровь из всего, к чему прикасается. При контакте с культистами или конструктами может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.

 ent-ShadowShackles = теневые оковы
    .desc = Оковы, сковывающие запястья с помощью зловещей магии.
--- a/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl
+++ b/Resources/Locale/ru-RU/_white/loadouts/loadoutGroups.ftl
@@ -15,3 +15,4 @@ loadout-group-job-trinkets = Рабочий инвентарь
 loadout-group-inhand = В руках
 loadout-group-trinkets = Побрякушки
 loadout-group-instruments = Муз. инструменты
+loadout-group-self-defence-devices = Средства самообороны
--- a/Resources/Locale/ru-RU/_white/object/telebaton.ftl
+++ b/Resources/Locale/ru-RU/_white/object/telebaton.ftl
@@ -1,4 +1,4 @@
-ent-Telebaton = телескопическая дубинка
+ent-TelescopicBaton = телескопическая дубинка
    .desc = Компактное, но надежное оружие личной обороны. В сложенном состоянии может быть скрыто.

 comp-telebaton-examined-on = Дубинка в боевом положении.
--- a/Resources/Locale/ru-RU/_white/white-shit.ftl
+++ b/Resources/Locale/ru-RU/_white/white-shit.ftl
@@ -22,3 +22,5 @@ melee-block-event-blocked = заблокировал!
 alerts-blocked-name = Атака заблокирована
 alerts-blocked-desc = Невозможно блокировать некоторое время.
 melee-block-component-delay = Может блокировать атаку ближнего боя каждые {$delay} секунд.
+
+context-menu-cant-interact = Невозможно взаимодействовать через контекстное меню!
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
@@ -65,10 +65,8 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
      #- name: StationCharter
-      #- name: TelescopicBaton
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackEngineering
@@ -77,9 +75,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalEngineering
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -89,9 +84,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -101,9 +93,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -113,9 +102,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -125,9 +111,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalMedical
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -137,9 +120,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -149,7 +129,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalSecurity
-      - id: Flash

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
@@ -74,10 +74,8 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
      #- name: StationCharter
-      #- name: TelescopicBaton
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackDuffelEngineering
@@ -86,9 +84,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalEngineering
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -98,9 +93,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -110,9 +102,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -122,9 +111,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalMedical
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -134,9 +120,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -146,7 +129,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalSecurity
-      - id: Flash

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
+++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
@@ -102,10 +102,8 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
      #- name: StationCharter
-      #- name: TelescopicBaton
+
 - type: entity
  noSpawn: true
  parent: ClothingBackpackSatchelEngineering
@@ -114,9 +112,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalEngineering
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -126,9 +121,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -138,9 +130,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -150,9 +139,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvivalMedical
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

 - type: entity
  noSpawn: true
@@ -162,9 +148,6 @@
  - type: StorageFill
    contents:
      - id: BoxSurvival
-      - id: Flash
-      - id: Telebaton
-      #- id: TelescopicBaton

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

 - type: entity
  parent: ClothingBackpackSatchelInspector
@@ -185,8 +167,6 @@
  - type: StorageFill
    contents:
    - id: BoxSurvivalSecurity
-    - id: Flash
-    - id: Telebaton

 - type: entity
  noSpawn: true
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -112,12 +112,7 @@
  components:
  - type: StorageFill
    contents:
-    - id: Crowbar
-    - id: Wrench
-    - id: Screwdriver
-    - id: Wirecutter
-    - id: Welder
-    - id: Multitool
+    - id: ClothingBeltUtilityEngineering
    - id: ClothingHandsGlovesCombat
    - id: ClothingMaskGasSyndicate

--- a/Resources/Prototypes/Datasets/Names/first_female.yml
+++ b/Resources/Prototypes/Datasets/Names/first_female.yml
@@ -154,6 +154,7 @@
  - Криста
  - Кристиана
  - Кристина
+  - Ксения
  - Кристобель
  - Сиара
  - Синди
@@ -232,7 +233,9 @@
  - Евфимия
  - Юстас
  - Ева
+  - Екатерина
  - Евангелина
+  - Елизавета
  - Эвелина
  - Эвелина
  - Эвелин
@@ -258,8 +261,10 @@
  - Джина
  - Джинджер
  - Жизель
+  - Жанна
  - Глэдвин
  - Гленна
+  - Галина
  - Глория
  - Грейс
  - Грейси
@@ -294,6 +299,7 @@
  - Инносент
  - Ирен
  - Ирис
+  - Ирина
  - Изабель
  - Изабелла
  - Изабель
@@ -356,6 +362,7 @@
  - Джойе
  - Джулия
  - Юлиана
+  - Юлия
  - Джулианна
  - Джули
  - Джульетта
@@ -415,8 +422,6 @@
  - Кимбэрли
  - Кимора
  - Кира
-  - Кристен
-  - Кристина
  - Кайла
  - Кайли
  - Кира
@@ -427,6 +432,7 @@
  - Лалла
  - Лана
  - Латания
+  - Лариса
  - Лаура
  - Лорен
  - Лауренсия
@@ -440,7 +446,6 @@
  - Лейлани
  - Лена
  - Лесли
-  - Лесли
  - Лесси
  - Лета
  - Лекси
@@ -452,7 +457,6 @@
  - Лилиан
  - Лилиана
  - Лилиан
-  - Лилиана
  - Лилли
  - Лили
  - Линдси
@@ -567,7 +571,9 @@
  - Ноуэлл
  - Нидия
  - Найла
+  - Оксана
  - Олива
+  - Ольга
  - Оливия
  - Орали
  - Пейдж
@@ -576,11 +582,8 @@
  - Париж
  - Пейшенс
  - Патриция
+  - Полина
  - Пэйлин
-  - Пейтон
-  - Пене
-  - Пенелопа
-  - Сапсан
  - Перла
  - Пейтон
  - Фиби
@@ -588,7 +591,6 @@
  - Филисс
  - Филлида
  - Пайпер
-  - Порше
  - Пресли
  - Присцилла
  - Проспер
@@ -596,6 +598,7 @@
  - Киана
  - Рэйчел
  - Рэйган
+  - Регина
  - Раэлин
  - Рейн
  - Ранда
@@ -624,7 +627,7 @@
  - Шалфей
  - Салли
  - Саманта
-  - Самара
+  - Светлана
  - Сандра
  - Сара
  - Сара
@@ -638,6 +641,7 @@
  - Сенеса
  - Серена
  - Серенити
+  - Софья
  - Шана
  - Шаника
  - Шанна
@@ -684,7 +688,6 @@
  - Тори
  - Трейси
  - Трейси
-  - Троица
  - Улисса
  - Валари
  - Валентина
@@ -708,3 +711,6 @@
  - Иоланда
  - Зельда
  - Зои
+  - Зоя
+  - Злата
+  - Яна
--- a/Resources/Prototypes/Datasets/Names/first_male.yml
+++ b/Resources/Prototypes/Datasets/Names/first_male.yml
@@ -4,21 +4,25 @@
  - Айден
  - Аарон
  - Абель
+  - Алексей
  - Авраам
  - Адам
  - Адан
+  - Анатолий
  - Аден
  - Адольф
  - Адриан
  - Эйден
  - Эйден
  - Алан
+  - Аристарх
  - Альберт
  - Альберто
  - Олден
  - Алек
  - Алехандро
  - Алекс
+  - Афанасий
  - Александр
  - Алексис
  - Альфред
@@ -62,6 +66,8 @@
  - Беннет
  - Билл
  - Блейк
+  - Борис
+  - Бронислав
  - Брэдли
  - Брейди
  - Брэндон
@@ -148,6 +154,8 @@
  - Кертис
  - Сай
  - Дакота
+  - Давид
+  - Дмитрий
  - Даллас
  - Далтон
  - Дэмиан
@@ -223,10 +231,12 @@
  - Иезекииль
  - Эзра
  - Фабиан
+  - Федор
  - Феликс
  - Фентон
  - Фернандо
  - Финн
+  - Филипп
  - Фитц
  - Флик
  - Флинт
@@ -268,6 +278,8 @@
  - Хан
  - Харрисон
  - Гарри
+  - Геннадий
+  - Григорий
  - Хартли
  - Харви
  - Хейден
@@ -288,6 +300,7 @@
  - Исмаил
  - Айзек
  - Иван
+  - Илья
  - Изая
  - Джейс
  - Джек
@@ -384,7 +397,10 @@
  - Кевин
  - Халил
  - Кингстон
+  - Кирилл
+  - Клим
  - Коби
+  - Константин
  - Колтон
  - Кристофер
  - Кайл
@@ -404,6 +420,7 @@
  - Ленни
  - Лео
  - Леонард
+  - Леонид
  - Леонардо
  - Леонель
  - Лерой
@@ -442,6 +459,8 @@
  - Марвин
  - Мейсон
  - Матео
+  - Матвей
+  - Михаил
  - Мэтью
  - Морис
  - Маурисио
@@ -475,10 +494,13 @@
  - Нельсон
  - Ник
  - Николас
+  - Николай
+  - Никита
  - Ной
  - Ноэль
  - Нолан
  - Оливер
+  - Олег
  - Омар
  - Опи
  - Орландо
@@ -489,6 +511,8 @@
  - Освальд
  - Оуэн
  - Пабло
+  - Павел
+  - Петр
  - Пэджет
  - Паркер
  - Патрик
@@ -497,6 +521,7 @@
  - Пэкстон
  - Пэйтон
  - Персиваль
+  - Прохор
  - Перш
  - Питер
  - Пейтон
@@ -525,6 +550,10 @@
  - Райли
  - Ривер
  - Роберт
+  - Роман
+  - Родион
+  - Руслан
+  - Рудольф
  - Роберто
  - Рокко
  - Роджер
@@ -558,6 +587,10 @@
  - Скотти
  - Себастьян
  - Серджио
+  - Сергей
+  - Семен
+  - Станислав
+  - Степан
  - Сет
  - Сеймур
  - Шейн
@@ -580,6 +613,7 @@
  - Таннер
  - Тейт
  - Тейлор
+  - Тимур
  - Тел
  - Террелл
  - Терри
@@ -606,7 +640,15 @@
  - Уланд
  - Ульрик
  - Уриэль
+  - Вадим
+  - Вальтер
+  - Валентин
+  - Вениамин
+  - Вольдемар
+  - Всеволод
  - Вон
+  - Вячеслав
+  - Виталий
  - Виктор
  - Винс
  - Винсент
@@ -634,3 +676,6 @@
  - Зейден
  - Зик
  - Сион
+  - Эдуард
+  - Эрнест
+  - Юрий
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -1,3 +1,15 @@
+- type: entity
+  id: ShowMedicalIcons
+  abstract: true
+  noSpawn: true
+  components:
+  - type: ShowHealthBars
+    damageContainers:
+    - Biological
+  - type: ShowHealthIcons
+    damageContainers:
+    - Biological
+
 - type: entity
  parent: ClothingEyesBase
  id: ClothingEyesHudDiagnostic
@@ -14,7 +26,7 @@
    - Silicon

 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
  id: ClothingEyesHudMedical
  name: medical hud
  description: A heads-up display that scans the humanoids in view and provides accurate data about their health status.
@@ -23,12 +35,6 @@
    sprite: Clothing/Eyes/Hud/med.rsi
  - type: Clothing
    sprite: Clothing/Eyes/Hud/med.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
  - type: Tag
    tags:
    - HudMedical
@@ -101,7 +107,7 @@
  - type: ShowThirstIcons

 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
  id: ClothingEyesHudMedOnion
  name: medonion hud
  description: Filler
@@ -110,16 +116,10 @@
    sprite: Clothing/Eyes/Hud/medonion.rsi
  - type: Clothing
    sprite: Clothing/Eyes/Hud/medonion.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
  - type: ShowHungerIcons

 - type: entity
-  parent: ClothingEyesBase
+  parent: [ClothingEyesBase, ShowMedicalIcons]
  id: ClothingEyesHudMedOnionBeer
  name: medthungerst hud
  description: Filler
@@ -128,17 +128,11 @@
    sprite: Clothing/Eyes/Hud/medonionbeer.rsi
  - type: Clothing
    sprite: Clothing/Eyes/Hud/medonionbeer.rsi
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
  - type: ShowHungerIcons
  - type: ShowThirstIcons

 - type: entity
-  parent: [ClothingEyesBase, SecHud]
+  parent: [ClothingEyesBase, SecHud, ShowMedicalIcons]
  id: ClothingEyesHudMedSec
  name: medsec hud
  description: An eye display that looks like a mixture of medical and security huds.
@@ -151,15 +145,9 @@
    graph: HudMedSec
    node: medsecHud
  - type: ShowSecurityIcons
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological

 - type: entity
-  parent: [ClothingEyesBase, SecHud]
+  parent: [ClothingEyesBase, SecHud, ShowMedicalIcons]
  id: ClothingEyesHudMultiversal
  name: multiversal hud
  description: Filler
@@ -173,13 +161,10 @@
    damageContainers:
    - Biological
    - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
  - type: ShowSyndicateIcons

 - type: entity
-  parent: [ClothingEyesBase, SecHud]
+  parent: [ClothingEyesBase, SecHud, ShowMedicalIcons]
  id: ClothingEyesHudOmni
  name: omni hud
  description: Filler
@@ -193,9 +178,6 @@
    damageContainers:
    - Biological
    - Inorganic
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological
  - type: ShowHungerIcons
  - type: ShowThirstIcons
  - type: ShowSyndicateIcons
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
@@ -130,11 +130,17 @@
    proto: robot
  - type: Speech
    speechVerb: Robotic
-    speechSounds: Pai
+    speechSounds: Borg
  - type: Vocal
    sounds:
      Unsexed: UnisexSilicon
  - type: UnblockableSpeech
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepBorg
+      params:
+        variation: 0.1
+        volume: -13
  - type: Construction
    graph: Cyborg
    containers:
@@ -142,6 +148,8 @@
    - cell_slot
  - type: Lock
    locked: true
+    breakOnEmag: false
+    unlockOnClick: false
  - type: ActivatableUIRequiresLock
  - type: LockedWiresPanel
  - type: Damageable
@@ -207,6 +215,7 @@
    tags:
    - ShoesRequiredStepTriggerImmune
    - DoorBumpOpener
+    - FootstepSound
    - CanPilot
  - type: Emoting
  - type: GuideHelp
@@ -235,23 +244,30 @@
  parent: BaseBorgChassis
  abstract: true
  components:
-    - type: NpcFactionMember
-      factions:
-        - Syndicate
-    - type: Access
-      tags:
-       - NuclearOperative
-       - SyndicateAgent
-    - type: AccessReader
-      access: [["SyndicateAgent"], ["NuclearOperative"]]
-    - type: SiliconLawProvider
-      laws: SyndicateStatic
-    - type: IntrinsicRadioTransmitter
-      channels:
-        - Binary
-        - Syndicate
-    - type: ActiveRadio
-      channels:
-        - Syndicate
-    - type: ShowSyndicateIcons
-    - type: MovementAlwaysTouching
+  - type: NpcFactionMember
+    factions:
+    - Syndicate
+  - type: Access
+    tags:
+    - NuclearOperative
+    - SyndicateAgent
+  - type: AccessReader
+    access: [["SyndicateAgent"], ["NuclearOperative"]]
+  - type: SiliconLawProvider
+    laws: SyndicateStatic
+  - type: IntrinsicRadioTransmitter
+    channels:
+    - Binary
+    - Syndicate
+  - type: ActiveRadio
+    channels:
+    - Syndicate
+  - type: ShowSyndicateIcons
+  - type: MovementAlwaysTouching
+  - type: Speech
+    speechSounds: SyndieBorg
+  - type: Vocal
+    sounds:
+      Unsexed: UnisexSiliconSyndicate
+  - type: PointLight
+    color: "#dd200b"
--- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
+++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml
@@ -24,6 +24,11 @@
    node: cyborg
  - type: Speech
    speechVerb: Robotic
+  - type: InteractionPopup
+    interactSuccessString: petting-success-generic-cyborg
+    interactFailureString: petting-failure-generic-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg

 - type: entity
  id: BorgChassisMining
@@ -75,6 +80,13 @@
    access: [["Cargo"], ["Salvage"], ["Command"], ["Research"]]
  - type: Inventory
    templateId: borgTall
+  - type: InteractionPopup
+    interactSuccessString: petting-success-salvage-cyborg
+    interactFailureString: petting-failure-salvage-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Speech # WD
+    speechSounds: BorgUpgraded

 - type: entity
  id: BorgChassisEngineer
@@ -118,6 +130,13 @@
    access: [["Engineering"], ["Command"], ["Research"]]
  - type: Inventory
    templateId: borgShort
+  - type: InteractionPopup
+    interactSuccessString: petting-success-engineer-cyborg
+    interactFailureString: petting-failure-engineer-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Speech # WD
+    speechSounds: BorgUpgraded

 - type: entity
  id: BorgChassisJanitor
@@ -169,10 +188,17 @@
    access: [["Service"], ["Command"], ["Research"]]
  - type: Inventory
    templateId: borgShort
+  - type: InteractionPopup
+    interactSuccessString: petting-success-janitor-cyborg
+    interactFailureString: petting-failure-janitor-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Speech # WD
+    speechSounds: BorgUpgraded

 - type: entity
  id: BorgChassisMedical
-  parent: BaseBorgChassisNT
+  parent: [BaseBorgChassisNT, ShowMedicalIcons]
  name: medical cyborg
  components:
  - type: Sprite
@@ -226,6 +252,19 @@
  - type: ShowHealthIcons
    damageContainers:
    - Biological
+  - type: SolutionScanner
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepHoverBorg
+      params:
+        volume: -6
+  - type: InteractionPopup
+    interactSuccessString: petting-success-medical-cyborg
+    interactFailureString: petting-failure-medical-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Speech # WD
+    speechSounds: BorgUpgraded

 - type: entity
  id: BorgChassisService
@@ -269,6 +308,13 @@
    access: [["Service"], ["Command"], ["Research"]]
  - type: Inventory
    templateId: borgTall
+  - type: InteractionPopup
+    interactSuccessString: petting-success-service-cyborg
+    interactFailureString: petting-failure-service-cyborg
+    interactSuccessSound:
+      path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Speech # WD
+    speechSounds: BorgUpgraded

 - type: entity
  id: BorgChassisSyndicateAssault
@@ -287,8 +333,6 @@
          shader: unshaded
          map: ["light"]
          visible: false
-    - type: PointLight
-      color: "#dd200b"
    - type: BorgChassis
      maxModules: 3
      moduleWhitelist:
@@ -302,6 +346,11 @@
      node: syndicateassault
    - type: Damageable
      damageModifierSet: AssaultBorg
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg

 - type: entity
  id: BorgChassisSyndicateMedical
@@ -331,6 +380,14 @@
      noMindState: synd_medical
    - type: Construction
      node: syndicatemedical
+    - type: ShowHealthBars
+      damageContainers:
+      - Biological
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg

 - type: entity
  id: BorgChassisSyndicateSaboteur
@@ -360,3 +417,12 @@
      noMindState: synd_engi
    - type: Construction
      node: syndicatesaboteur
+    - type: ShowHealthBars
+      damageContainers:
+      - Inorganic
+      - Silicon
+    - type: InteractionPopup
+      interactSuccessString: petting-success-syndicate-cyborg
+      interactFailureString: petting-failure-syndicate-cyborg
+      interactSuccessSound:
+        path: /Audio/Ambience/Objects/periodic_beep.ogg
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -375,7 +375,8 @@
        damageType: Blunt
        damage: 10
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: NonSpreaderZombie

 - type: entity
@@ -529,7 +530,8 @@
        damageType: Blunt
        damage: 60
      behaviors:
-      - !type:GibBehavior { }
+      - !type:GibBehavior
+        recursive: false
  - type: FireVisuals
    sprite: Mobs/Effects/onfire.rsi
    normalState: Mouse_burning
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -109,6 +109,8 @@
    proto: robot
  - type: ZombieImmune
  - type: Penetrated
+  - type: NoSlip
+  - type: Insulated

 - type: entity
  parent: MobSiliconBase
@@ -235,7 +237,6 @@
  - type: MovementSpeedModifier
    baseWalkSpeed: 2
    baseSprintSpeed: 3
-  - type: NoSlip
  - type: HTN
    rootTask:
      task: CleanbotCompound
@@ -248,7 +249,7 @@
      path: /Audio/Ambience/Objects/periodic_beep.ogg

 - type: entity
-  parent: MobSiliconBase
+  parent: [MobSiliconBase, ShowMedicalIcons]
  id: MobMedibot
  name: medibot
  description: No substitute for a doctor, but better than nothing.
@@ -282,19 +283,12 @@
  - type: Construction
    graph: MediBot
    node: bot
-  - type: NoSlip
  - type: Anchorable
  - type: InteractionPopup
    interactSuccessString: petting-success-medibot
    interactFailureString: petting-failure-medibot
    interactSuccessSound:
      path: /Audio/Ambience/Objects/periodic_beep.ogg
-  - type: ShowHealthBars
-    damageContainers:
-    - Biological
-  - type: ShowHealthIcons
-    damageContainers:
-    - Biological

 - type: entity
  parent: MobSiliconBase
--- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
@@ -348,12 +348,12 @@
    - state: icon-treatment
  - type: ItemBorgModule
    items:
+    - HandheldHealthAnalyzerUnpowered
    - Brutepack10Lingering
    - Ointment10Lingering
    - Gauze10Lingering
    - Bloodpack10Lingering
    - Syringe
-    - Dropper

 - type: entity
  id: BorgModuleDefibrillator
@@ -539,7 +539,7 @@
      - state: icon-syndicate
    - type: ItemBorgModule
      items:
-      - EnergySwordBorg
+      - CyborgEnergySwordDouble
      - PinpointerSyndicateNuclear

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -757,7 +757,7 @@
  - type: FlashOnTrigger
    range: 7
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SpawnOnTrigger
    proto: GrenadeFlashEffect
  - type: ActiveTimerTrigger
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -306,3 +306,12 @@
      enabled: false
      reflects:
        - Energy
+
+- type: entity
+  suffix: One-Handed, For Borgs
+  parent: EnergySwordDouble
+  id: CyborgEnergySwordDouble # why is this invalid if ID is BorgEnergySwordDouble
+  description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. Specially designed for syndicate cyborgs.
+  components: # could add energy-draining like the L6C
+  - type: Wieldable
+    freeHandsRequired: 0 # because borg has no off-hand to wield with.  Without this, it will be unable to activate the esword
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -42,7 +42,7 @@
    animation: WeaponArcThrust
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
-    range: 1.8 # Spears are long
+    range: 2 # Spears are long
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
@@ -68,7 +68,7 @@
  - type: FlashOnTrigger
    range: 7
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SoundOnTrigger
    sound:
      path: "/Audio/Effects/flash_bang.ogg"
--- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml
+++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml
@@ -12,7 +12,7 @@
    - type: RCDDeconstructable
      cost: 6
      delay: 4
-      fx: EffectRCDDeconstruct4  
+      fx: EffectRCDDeconstruct4
    - type: Tag
      tags:
        - DeleteWithWindows
@@ -200,7 +200,7 @@
          mask:
          - FullTileMask
          layer:
-          - WallLayer
+          - GlassLayer
    - type: Construction
      graph: GrilleDiagonal
      node: grilleDiagonal
@@ -235,8 +235,8 @@
          mask:
          - FullTileMask
          layer:
-          - WallLayer
+          - GlassLayer
    - type: Construction
      graph: GrilleDiagonal
      node: clockworkGrilleDiagonal
-      
+
--- a/Resources/Prototypes/InventoryTemplates/borg.yml
+++ b/Resources/Prototypes/InventoryTemplates/borg.yml
@@ -7,7 +7,7 @@
    uiWindowPos: 1,0
    strippingWindowPos: 0,0
    displayName: Head
-    offset: 0, -0.09375
+    offset: 0.015625, -0.09375

 - type: inventoryTemplate
  id: borgShort
@@ -18,7 +18,7 @@
    uiWindowPos: 1,0
    strippingWindowPos: 0,0
    displayName: Head
-    offset: 0, -0.1875
+    offset: 0.015625, -0.1875

 - type: inventoryTemplate
  id: borgTall
@@ -30,6 +30,7 @@
    uiWindowPos: 0,0
    strippingWindowPos: 0,0
    displayName: Head
+    offset: 0.015625, 0

 # taller than tall
 - type: inventoryTemplate
--- a/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/SelfDefenceDevices.yml
@@ -0,0 +1,21 @@
+#///////
+# White Dream
+#///////
+
+- type: itemLoadout
+  id: TelescopicBaton
+  equipment: TelescopicBaton
+- type: startingGear
+  id: TelescopicBaton
+  storage:
+    back:
+    - TelescopicBaton
+
+- type: itemLoadout
+  id: Flash
+  equipment: Flash
+- type: startingGear
+  id: Flash
+  storage:
+    back:
+    - Flash
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -45,6 +45,15 @@
  - NTFlag # WD

 # Command
+- type: loadoutGroup # WD
+  id: SelfDefenceDevices
+  name: loadout-group-self-defence-devices
+  minLimit: 1
+  maxLimit: 2
+  loadouts:
+  - TelescopicBaton
+  - Flash
+
 - type: loadoutGroup
  id: CaptainHead
  name: loadout-group-head
--- a/Resources/Prototypes/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -13,6 +13,7 @@
  - CaptainGloves # WD
  - CaptainShoes
  - CaptainPDA # WD
+  - SelfDefenceDevices # WD
  - Trinkets

 - type: roleLoadout
@@ -30,6 +31,7 @@
  - HoPOuterClothing
  - HoPShoes
  - HoPPDA # WD
+  - SelfDefenceDevices # WD
  - Trinkets

 # Civilian
@@ -219,6 +221,7 @@
  - CommonGloves # WD
  - QuartermasterShoes
  - QuartermasterPDA # WD
+  - SelfDefenceDevices # WD
  - CommonCargoJobTrinkets
  - Trinkets

@@ -269,6 +272,7 @@
  - CommonGloves # WD
  - ChiefEngineerShoes
  - ChiefEngineerPDA # WD
+  - SelfDefenceDevices # WD
  - Trinkets

 - type: roleLoadout
@@ -341,6 +345,7 @@
  - ResearchDirectorShoes
  - CommonScienceGloves
  - ResearchDirectorPDA
+  - SelfDefenceDevices # WD
  - Trinkets

 - type: roleLoadout
@@ -404,6 +409,7 @@
  - CommonSecurityBackpack
  - CommonSecurityShoes
  - HeadofSecurityPDA
+  - SelfDefenceDevices # WD
  - CommonSecurityJobTrinkets # WD
  - Trinkets

@@ -507,6 +513,7 @@
  - CommonMedicalGloves
  - ChiefMedicalOfficerShoes
  - ChiefMedicalOfficerPDA
+  - SelfDefenceDevices # WD
  - Trinkets

 - type: roleLoadout
@@ -604,6 +611,7 @@
  - InspectorShoes
  - InspectorPDA
  - BriefcaseInhand
+  - SelfDefenceDevices # WD
  - InspectorJobTrinkets
  - Trinkets

--- a/Resources/Prototypes/SoundCollections/footsteps.yml
+++ b/Resources/Prototypes/SoundCollections/footsteps.yml
@@ -201,3 +201,13 @@
  - /Audio/Effects/Footsteps/spurs1.ogg
  - /Audio/Effects/Footsteps/spurs2.ogg
  - /Audio/Effects/Footsteps/spurs3.ogg
+
+- type: soundCollection
+  id: FootstepBorg
+  files:
+  - /Audio/Effects/Footsteps/borgwalk1.ogg
+
+- type: soundCollection
+  id: FootstepHoverBorg
+  files:
+  - /Audio/Effects/Footsteps/borgwalk2.ogg
--- a/Resources/Prototypes/Voice/speech_emote_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml
@@ -545,6 +545,26 @@
    Ping:
      path: /Audio/Effects/Cargo/ping.ogg

+- type: emoteSounds
+  id: UnisexSiliconSyndicate
+  params:
+    variation: 0.05
+  sounds:
+    Laugh:
+      path: /Audio/Voice/Silicon/syndieborg_laugh.ogg
+    Beep:
+      path: /Audio/Machines/twobeep.ogg
+    Chime:
+      path: /Audio/Machines/chime.ogg
+    Buzz:
+      path: /Audio/Machines/buzz-sigh.ogg
+    Buzz-Two:
+      path: /Audio/Machines/buzz-two.ogg
+    Honk:
+      path: /Audio/Items/bikehorn.ogg
+    Ping:
+      path: /Audio/Effects/Cargo/ping.ogg
+
 # body emotes
 - type: emoteSounds
  id: GeneralBodyEmotes
--- a/Resources/Prototypes/Voice/speech_sounds.yml
+++ b/Resources/Prototypes/Voice/speech_sounds.yml
@@ -52,6 +52,41 @@
  exclaimSound:
    path: /Audio/Machines/vending_jingle.ogg

+- type: speechSounds
+  id: Borg
+  saySound:
+    path: /Audio/Voice/Talk/pai.ogg
+  askSound:
+    path: /Audio/Voice/Talk/pai_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/pai_exclaim.ogg
+
+# WD edit - эти звуки слишком машинные и хладнокровные. Милые звуки пИИ намного лучше
+#  saySound:
+#    path: /Audio/Voice/Talk/Silicon/borg.ogg
+#  askSound:
+#    path: /Audio/Voice/Talk/Silicon/borg_ask.ogg
+#  exclaimSound:
+#    path: /Audio/Voice/Talk/Silicon/borg_exclaim.ogg
+
+- type: speechSounds
+  id: BorgUpgraded
+  saySound:
+    path: /Audio/Voice/Talk/Silicon/borg.ogg
+  askSound:
+    path: /Audio/Voice/Talk/Silicon/borg_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/Silicon/borg_exclaim.ogg
+
+- type: speechSounds
+  id: SyndieBorg
+  saySound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg.ogg
+  askSound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg_ask.ogg
+  exclaimSound:
+    path: /Audio/Voice/Talk/Silicon/syndieborg_exclaim.ogg
+
 - type: speechSounds
  id: Pai
  saySound:
--- a/Resources/Prototypes/_White/Catalog/uplink.yml
+++ b/Resources/Prototypes/_White/Catalog/uplink.yml
@@ -101,6 +101,7 @@
    blacklist:
      tags:
      - NukeOpsUplink
+  saleLimit: 1

 # Night Vision
 - type: listing
--- a/Resources/Prototypes/_White/Construction/Cult/graphs.yml
+++ b/Resources/Prototypes/_White/Construction/Cult/graphs.yml
@@ -87,6 +87,7 @@
          completed:
            - !type:SnapToGrid
              southRotation: true
+            - !type:CheckForStructure
          steps:
            - material: RunicMetalSheets
              amount: 4
--- a/Resources/Prototypes/_White/Entities/Cult/Items/hands.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/hands.yml
@@ -8,15 +8,6 @@
  components:
  - type: Item
    size: Ginormous
-  - type: MeleeWeapon
-    canBeBlocked: false
-    canHeavyAttack: false
-    canMiss: false
-    attackRate: 2
-    wideAnimationRotation: 180
-    damage:
-      types:
-        Heat: 0
  - type: DeleteOnDropAttempt
    message: cult-hand-component-extra-message
  - type: Unremoveable
@@ -35,15 +26,6 @@
    state: icon
  - type: Item
    sprite: White/Cult/Entities/stun.rsi
-  - type: MeleeWeapon
-    canAttackSelf: false
-    attackWhitelist:
-      components:
-      - StatusEffects
-    attackBlacklist:
-      components:
-      - Cultist
-      - Construct
  - type: CultStunHand
    speech: "Fuu ma'jin!"

@@ -58,11 +40,6 @@
    state: icon
  - type: Item
    sprite: White/Cult/Entities/rites.rsi
-  - type: MeleeWeapon
-    attackWhitelist:
-      components:
-      - Cultist
-      - Construct
  - type: CultRitesHand
    speech: "Fel'th Dol Ab'orod!"
  - type: ActivatableUI
--- a/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
@@ -35,7 +35,7 @@
    animation: WeaponArcThrust
    soundHit:
      path: /Audio/Weapons/bladeslice.ogg
-    range: 1.8
+    range: 2
  - type: DamageOtherOnHit
    damage:
      types:
--- a/Resources/Prototypes/_White/Entities/Cult/constructs.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
@@ -84,6 +84,7 @@
      group: Construct
    - type: GlobalAntagonist
      antagonistPrototype: globalAntagonistCult
+    - type: ThermalBlocker

 - type: entity
  id: JuggernautConstruct
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml
@@ -41,7 +41,7 @@
  - type: FlashOnTrigger
    range: 5
    stunTime: 2 # WD
-    knockdownTime: 20 # WD
+    knockdownTime: 10 # WD
  - type: SpawnOnTrigger
    proto: GrenadeFlashEffect
  - type: DeleteOnTrigger
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
@@ -265,7 +265,7 @@
  - type: MeleeWeapon
    soundHit:
      path: /Audio/White/Items/hit/chainhit.ogg
-    range: 2.2
+    range: 2.5
    damage:
      types:
        Blunt: 18
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/telescopic_baton.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/telescopic_baton.yml
@@ -1,9 +1,19 @@
 - type: entity
-  id: Telebaton
-  name: telescopic baton
  parent: BaseItem
+  id: TelescopicBaton
+  name: telescopic baton
  description: A compact yet robust personal defense weapon. Can be concealed when folded.
  components:
+  - type: TelescopicBaton
+  - type: Sprite
+    sprite: White/Objects/Weapons/telebaton.rsi
+    layers:
+    - state: telebaton_off
+      map: [ "enum.ToggleVisuals.Layer" ]
+  - type: ItemToggleSize
+    activatedSize: Large
+    activatedShape:
+    - 0, 0, 3, 0
  - type: ItemToggle
    soundActivate:
      path: /Audio/Weapons/telescopicon.ogg
@@ -13,42 +23,6 @@
      path: /Audio/Weapons/telescopicoff.ogg
      params:
        volume: -5
-  - type: ItemToggleSize
-    activatedSize: Large
-    activatedShape:
-    - 0, 0, 3, 0
-  - type: DisarmMalus
-    malus: 0.225
-  - type: Sprite
-    sprite: White/Objects/Weapons/telebaton.rsi
-    layers:
-    - state: telebaton_off
-      map: [ "enum.ToggleVisuals.Layer" ]
-  - type: ItemToggleMeleeWeapon
-    activatedDamage:
-      types:
-        Blunt: 12
-    deactivatedSecret: true
-  - type: MeleeWeapon
-    canHeavyAttack: false
-    equipCooldown: 1
-    attackRate: 0.25
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Blunt: 0
-    bluntStaminaDamageFactor: 0.0 # so blunt doesn't deal stamina damage at all
-  - type: StaminaDamageOnHit
-    damage: 55
-    sound: /Audio/White/Weapons/woodhit.ogg
-  - type: UseDelay
-  - type: Item
-    heldPrefix: off
-    sprite: White/Objects/Weapons/telebaton.rsi
-    size: Small
-    storedRotation: 44
-    shape:
-    - 0, 0, 1, 0
  - type: Appearance
  - type: GenericVisualizer
    visuals:
@@ -56,6 +30,37 @@
        enum.ToggleVisuals.Layer:
          True: {state: telebaton_on}
          False: {state: telebaton_off}
+  - type: DisarmMalus
+    malus: 0.225
+  - type: MeleeWeapon
+    canHeavyAttack: false
+    equipCooldown: 1
+    attackRate: 0.3
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 0
+    bluntStaminaDamageFactor: 0.0 # so blunt doesn't deal stamina damage at all
+  - type: ItemToggleMeleeWeapon
+    activatedDamage:
+      types:
+        Blunt: 9
+    deactivatedSecret: true
+  - type: StaminaDamageOnHit
+    damage: 16
+    sound: /Audio/White/Weapons/woodhit.ogg
+  - type: UseDelay
+    delay: 0.4
+  - type: Item
+    heldPrefix: off
+    sprite: White/Objects/Weapons/telebaton.rsi
+    size: Small
+    storedRotation: 44
+    shape:
+    - 0, 0, 1, 0
+  - type: Clothing
+    quickEquip: false
+    slots:
+      - Belt
  - type: StaticPrice
    price: 150
-  - type: Telebaton
--- a/Resources/Prototypes/game_presets.yml
+++ b/Resources/Prototypes/game_presets.yml
@@ -3,7 +3,7 @@
  alias:
    - survival
  name: survival-title
-  showInVote: false # secret
+  showInVote: true
  description: survival-description
  rules:
    - RampingStationEventScheduler
@@ -98,7 +98,7 @@
    - traitor
  name: traitor-title
  description: traitor-description
-  showInVote: false
+  showInVote: true
  rules:
    - Traitor
    - SubGamemodesRule
@@ -114,7 +114,7 @@
  name: death-match-title
  description: death-match-description
  maxPlayers: 15
-  showInVote: true
+  showInVote: false
  supportedMaps: DeathMatchMapPool
  rules:
    - DeathMatch31
@@ -141,7 +141,7 @@
    - revolutionaries
  name: rev-title
  description: rev-description
-  showInVote: false
+  showInVote: true
  rules:
    - Revolutionary
    - SubGamemodesRule
@@ -172,7 +172,7 @@
    - pirates
  name: pirates-title
  description: pirates-description
-  showInVote: true
+  showInVote: false
  rules:
    - Pirates
    - BasicStationEventScheduler
--- a/Resources/Prototypes/secret_weights.yml
+++ b/Resources/Prototypes/secret_weights.yml
@@ -5,7 +5,7 @@
    Changeling: 0.14
    Nukeops: 0.14
    Cult: 0.15
-    Wizard: 0.15
-    Revolutionary: 0.04
+    Wizard: 0.09
+    Revolutionary: 0.1
    Zombie: 0.04
    Survival: 0.04