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

2024-06-21 21:53:12 +03:00
parent 5beb765513 b3ed98afaf
commit 5ac7ca6faa
103 changed files with 2092 additions and 340 deletions
--- a/Resources/Audio/White/Magic/timeparadox2.ogg
+++ b/Resources/Audio/White/Magic/timeparadox2.ogg
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -4601,3 +4601,187 @@
  id: 313
  time: '2024-06-19T15:59:59.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/367
+- author: Aviu
+  changes:
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u044B\u0448\u044C \u0432\
+      \ \u043A\u043E\u043B\u043F\u0430\u043A\u0435 \u043C\u043E\u0436\u0435\u0442\
+      \ \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0442\u044C \u043D\u043E\u0441\u0438\
+      \u0442\u0435\u043B\u0435\u043C."
+    type: Add
+  - message: "\u041A\u043E\u0440\u043E\u043B\u044C \u043A\u0440\u044B\u0441 \u0442\
+      \u0435\u043F\u0435\u0440\u044C \u043B\u0435\u0447\u0438\u0442 \u043A\u0440\u043E\
+      \u0432\u043E\u043F\u043E\u0442\u0435\u0440\u044E \u043E\u0442 \u043C\u0438\u0430\
+      \u0437\u043C\u044B."
+    type: Add
+  - message: "\u0421\u044A\u0435\u0434\u0435\u043D\u043D\u044B\u0435 \u0434\u0440\u0430\
+      \u043A\u043E\u043D\u043E\u043C \u0442\u0440\u0443\u043F\u044B \u0432\u044B\u043F\
+      \u0430\u0434\u0430\u044E\u0442 \u043F\u0440\u0438 \u0440\u0430\u0437\u0434\u0435\
+      \u043B\u043A\u0435."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u043E\u0440\u0442\u0430\u043B\
+      \ \u043D\u0430 \u0440\u0430\u0437\u043D\u044B\u0445 \u0433\u0440\u0438\u0434\
+      \u0430\u0445."
+    type: Fix
+  id: 314
+  time: '2024-06-20T16:24:36.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/371
+- author: Aviu
+  changes:
+  - message: "\u0417\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u043E\u0441\
+      \u0442\u0430\u043D\u043E\u0432\u043A\u0438 \u0432\u0440\u0435\u043C\u0435\u043D\
+      \u0438."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0437\u0430\u043A\u043B\u0438\u043D\
+      \u0430\u043D\u0438\u0435 \u043F\u0435\u0440\u0435\u043D\u043E\u0441\u0430 \u0441\
+      \u043E\u0437\u043D\u0430\u043D\u0438\u044F \u0440\u0430\u0431\u043E\u0442\u0430\
+      \u0435\u0442 \u043D\u0430 \u043A\u0443\u043B\u044C\u0442\u0438\u0441\u0442\u043E\
+      \u0432, \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u043E\u0432 \u0438\
+      \ \u0440\u0435\u0432\u043E\u043B\u044E\u0446\u0438\u043E\u043D\u0435\u0440\u043E\
+      \u0432."
+    type: Tweak
+  id: 315
+  time: '2024-06-20T16:24:10.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/370
+- author: RinKeeper
+  changes:
+  - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D \u0440\u0435\u0446\u0435\u043F\
+      \u0442 \u0441\u0438\u043D\u0442\u0435\u043F\u043B\u043E\u0442\u0438, \u0430\
+      \ \u0442\u0430\u043A\u0436\u0435 \u0440\u0435\u0430\u0433\u0435\u043D\u0442\u044B\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0443\u0436\u043D\u043E \u0440\
+      \u0430\u0437\u043E\u0433\u0440\u0435\u0432\u0430\u0442\u044C"
+    type: Fix
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432 \u043F\u0440\u0438\u043D\
+      \u0442\u0435\u0440\u0435 \u0443\u043D\u0438\u0444\u043E\u0440\u043C\u044B \u0435\
+      \u0441\u0442\u044C \u043D\u0435\u0431\u0435\u0441\u043D\u043E-\u0433\u043E\u043B\
+      \u0443\u0431\u043E\u0439 \u043A\u043E\u0432\u0451\u0440"
+    type: Fix
+  - message: "\u041E\u0433\u043D\u0435\u0442\u0443\u0448\u0438\u0442\u0435\u043B\u044C\
+      \ \u0438 \u043F\u043E\u0434\u043E\u0431\u043D\u044B\u0435 \u0435\u043C\u0443\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435 \u043C\u043E\u0433\u0443\
+      \u0442 \u0437\u0430 1 \u043F\u0440\u044B\u0441\u043A \u043F\u0440\u0438\u043C\
+      \u0435\u043D\u0438\u0442\u044C \u044D\u0444\u0444\u0435\u043A\u0442 \u0434\u0432\
+      \u0430\u0436\u0434\u044B \u0438\u043B\u0438 \u0442\u0440\u0438\u0436\u0434\u044B"
+    type: Fix
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0435\u0434\u043C\u0435\
+      \u0442\u044B \u0432 \u043F\u043E\u043B\u0435\u0442\u0435 \u043D\u0435 \u0441\
+      \u0440\u0430\u0431\u0430\u0442\u044B\u0432\u0430\u044E\u0442 \u0431\u043E\u043B\
+      \u044C\u0448\u0435 1 \u0440\u0430\u0437\u0430"
+    type: Fix
+  - message: "\u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u043A\u043E\u043C\
+      \u0430\u043D\u0434\u044B showmanifest \u0442\u0435\u043F\u0435\u0440\u044C \u043C\
+      \u043E\u0436\u043D\u043E \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0435\u0442\
+      \u044C \u043C\u0430\u043D\u0438\u0444\u0435\u0441\u0442 \u043F\u043E\u0441\u043B\
+      \u0435 \u0440\u0430\u0443\u043D\u0434\u0430 \u0434\u0430\u0436\u0435 \u0435\u0441\
+      \u043B\u0438 \u0432\u044B \u0435\u0433\u043E \u0437\u0430\u043A\u0440\u044B\u043B\
+      \u0438"
+    type: Add
+  id: 316
+  time: '2024-06-20T19:29:43.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/343
+- author: ThereDrD
+  changes:
+  - message: "\u0423\u043B\u0443\u0447\u0448\u0435\u043D \u0438\u043D\u0442\u0435\u0440\
+      \u0444\u0435\u0439\u0441 \u043A\u043E\u043D\u0441\u043E\u043B\u0438 \u0425\u043E\
+      \u041F\u0430, \u0442\u0435\u043F\u0435\u0440\u044C \u0434\u043E\u0441\u0442\u0443\
+      \u043F\u044B \u0438 \u0438\u043A\u043E\u043D\u043A\u0438 \u043E\u0442\u0441\u043E\
+      \u0440\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u044B \u043F\u043E \u043E\u0442\
+      \u0434\u0435\u043B\u0430\u043C \u0438 \u043F\u043E \u0432\u0430\u0436\u043D\u043E\
+      \u0441\u0442\u0438, \u0433\u0434\u0435 \u044D\u0442\u043E \u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E"
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043A\u043E\u043D\u0441\u043E\u043B\
+      \u044C \u0425\u043E\u041F\u0430 \u043C\u0435\u043D\u044F\u0435\u0442 \u0438\u043A\
+      \u043E\u043D\u043A\u0443 \u043D\u0430 \u0441\u043F\u0440\u0430\u0439\u0442\u0435\
+      \ \u043A\u0430\u0440\u0442\u043E\u0447\u043A\u0438, \u0435\u0441\u043B\u0438\
+      \ \u043F\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u0441\u043E\u043E\u0442\
+      \u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u043F\u0440\
+      \u0435\u0441\u0435\u0442."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0435\u0441\u0435\u0442\
+      \u044B \u0432 \u043A\u043E\u043D\u0441\u043E\u043B\u0438 \u0425\u043E\u041F\u0430\
+      \ \u0432\u044B\u0441\u0442\u0430\u0432\u043B\u044F\u044E\u0442\u0441\u044F \u043F\
+      \u043E \u043D\u0430\u0436\u0430\u0442\u0438\u044E \u0438\u043A\u043E\u043D\u043A\
+      \u0438, \u0430 \u043D\u0435 \u043A\u043D\u043E\u043F\u043A\u0438 \u0438\u0437\
+      \ \u0432\u044B\u043F\u0430\u0434\u0430\u044E\u0449\u0435\u0433\u043E \u0441\u043F\
+      \u0438\u0441\u043A\u0430"
+    type: Tweak
+  - message: "\u0412\u044B\u043F\u0430\u0434\u0430\u044E\u0449\u0438\u0439 \u0441\u043F\
+      \u0438\u0441\u043E\u043A \u0432 \u043A\u043E\u043D\u0441\u043E\u043B\u0438 \u0425\
+      \u043E\u041F\u0430. \u041E\u043D \u043E\u0442\u0432\u0440\u0430\u0442\u0438\u0442\
+      \u0435\u043B\u0435\u043D."
+    type: Remove
+  id: 317
+  time: '2024-06-20T19:29:26.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/369
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0441\u0442\u0443\u043F \u043A\u0432\u0430\u0440\u0442\u0438\
+      \u0440\u043C\u0430\u0441\u0442\u0435\u0440\u0430 \u0441\u043D\u043E\u0432\u0430\
+      \ \u0435\u0441\u0442\u044C \u0432 \u043A\u043E\u043D\u0441\u043E\u043B\u0438\
+      \ \u0445\u043E\u043F\u0430"
+    type: Fix
+  id: 318
+  time: '2024-06-20T21:18:50.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/372
+- author: ThereDrD
+  changes:
+  - message: "\u0428\u043B\u044E\u0437\u044B \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0438\u043C\u0435\u044E\u0442 \u0441\u0432\u0435\u0447\u0435\u043D\u0438\u0435\
+      , \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u0442 \u0435\
+      \u0433\u043E \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u044F"
+    type: Add
+  - message: "\u041E\u0440\u0443\u0436\u0438\u0435 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0438\u043C\u0435\u0435\u0442 \u0441\u0432\u0435\u0447\u0435\u043D\u0438\u0435\
+      , \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u0442 \u043F\
+      \u043E\u0434\u0441\u0432\u0435\u0442\u043A\u0438 \u043D\u0430 \u0442\u0435\u043A\
+      \u0441\u0442\u0443\u0440\u0435 \u0438 \u0441\u0442\u0435\u043F\u0435\u043D\u0438\
+      \ \u0437\u0430\u0440\u044F\u0434\u043A\u0438"
+    type: Add
+  - message: "\u0428\u043A\u0430\u0444\u0447\u0438\u043A\u0438 \u0442\u0435\u043F\u0435\
+      \u0440\u044C \u0438\u043C\u0435\u044E\u0442 \u0441\u0432\u0435\u0447\u0435\u043D\
+      \u0438\u0435, \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0435 \u043E\u0442\
+      \ \u043F\u043E\u0434\u0441\u0432\u0435\u0442\u043A\u0438 \u043D\u0430 \u0442\
+      \u0435\u043A\u0441\u0442\u0443\u0440\u0435"
+    type: Add
+  - message: "\u0411\u0430\u0442\u0430\u0440\u0435\u0439\u043A\u0438 \u0438 \u043C\
+      \u0443\u043B\u044C\u0442\u0438\u0442\u0443\u043B \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u0442\u043E\u0436\u0435 \u0441\u0432\u0435\u0442\u044F\u0442\u0441\u044F"
+    type: Add
+  - message: "\u041F\u0440\u043E\u0436\u0435\u043A\u0442\u0430\u0439\u043B\u044B \u043B\
+      \u0430\u0437\u0435\u0440\u043E\u0432, \u043A\u043E\u043D\u0441\u043E\u043B\u0438\
+      , \u0442\u043E\u0440\u0433\u043E\u0432\u044B\u0435 \u0430\u0432\u0442\u043E\u043C\
+      \u0430\u0442\u044B, \u044D\u043D\u0435\u0440\u0433\u043E\u043C\u0435\u0447\u0438\
+      , \u044D\u043D\u0435\u0440\u0433\u043E\u0449\u0438\u0442 \u0438 \u0441\u0432\
+      \u0435\u0442 \u043E\u0442 \u0432\u044B\u0441\u0442\u0440\u0435\u043B\u0430 \u0438\
+      \u0437 \u043E\u0440\u0443\u0436\u0438\u044F \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0438\u043C\u0435\u044E\u0442 \u043C\u0435\u043D\u0435\u0435 \u044F\u0434\
+      \u0440\u0435\u043D\u043E\u0435 \u0441\u0432\u0435\u0447\u0435\u043D\u0438\u0435\
+      ."
+    type: Add
+  id: 319
+  time: '2024-06-21T03:15:55.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/316
+- author: CaypenNow
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u043C\u043E\u0434\u0443\
+      \u043B\u044C\u043D\u044B\u0439 \u043F\u0440\u0438\u0446\u0435\u043B."
+    type: Add
+  - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u043E\u0448\
+      \u0438\u0431\u043A\u0430, \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u0430\u044F\
+      \ \u0441 \u043C\u043E\u0434\u0443\u043B\u044F\u043C\u0438 \u0443 M-90gl."
+    type: Fix
+  id: 320
+  time: '2024-06-21T10:24:13.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/365
+- author: ThereDrD
+  changes:
+  - message: "\u041A\u043E\u043D\u0441\u043E\u043B\u044C \u0425\u043E\u041F\u0430\
+      \ \u0441\u043D\u043E\u0432\u0430 \u043C\u043E\u0436\u0435\u0442 \u0432\u044B\
+      \u0434\u0430\u0442\u044C \u0434\u043E\u0441\u0442\u0443\u043F \u043F\u043E \u043D\
+      \u0430\u0436\u0430\u0442\u0438\u044E \u043A\u043D\u043E\u043F\u043A\u0438 \u0441\
+      \ \u0434\u043E\u0441\u0442\u0443\u043F\u043E\u043C"
+    type: Fix
+  id: 321
+  time: '2024-06-21T10:44:40.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/373
--- a/Resources/Locale/en-US/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/en-US/access/components/id-card-console-component.ftl
@@ -5,7 +5,6 @@ id-card-console-window-save-button = Save
 id-card-console-window-job-title-label = Job title:
 id-card-console-window-eject-button = Eject
 id-card-console-window-insert-button = Insert
-id-card-console-window-job-selection-label = Job presets (sets department and job icon):

 access-id-card-console-component-no-hands-error = You have no hands.
 id-card-console-privileged-id = Privileged ID
--- a/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
+++ b/Resources/Locale/en-US/teleportation/handheld-teleporter.ftl
@@ -0,0 +1 @@
+handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!
--- a/Resources/Locale/ru-RU/_white/wizard/scrolls.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/scrolls.ftl
@@ -17,6 +17,7 @@ scroll-component-recall = призыв
 scroll-component-teleport = телепортацию
 scroll-component-smite = кару
 scroll-component-mindswap = подмену сознания
+scroll-component-timestop = остановку времени

 ent-BaseScroll = магический свиток
    .desc = Этот древний пергамент, ставший реликвией в арканных преданиях, хранит в себе бесчисленные мистические заклятия и забытые заклинания.
@@ -50,3 +51,7 @@ ent-ScrollTeleport = свиток телепортации
    .desc = { ent-BaseScroll.desc }
 ent-ScrollSmite = свиток кары
    .desc = { ent-BaseScroll.desc }
+ent-ScrollMindswap = свиток подмены сознания
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollTimestop = свиток остановки времени
+    .desc = { ent-BaseScroll.desc }
--- a/Resources/Locale/ru-RU/_white/wizard/spellbook.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/spellbook.ftl
@@ -43,6 +43,9 @@ spellbook-smite-desc = { ent-ActionSmite.desc }
 spellbook-mindswap-name = { ent-ActionMindswapSpell }
 spellbook-mindswap-desc = { ent-ActionMindswapSpell.desc }

+spellbook-timestop-name = { ent-ActionTimestopSpell }
+spellbook-timestop-desc = { ent-ActionTimestopSpell.desc }
+
 spellbook-hardsuit-name = Скафандр волшебника
 spellbook-hardsuit-desc = Украшенный магическими драгоценными камнями скафандр, функционирующий так же, как и обычная мантия волшебника, но в то же время является пригодным для использования в космосе и бронированным. Небольшое замедление. Теперь вы можете произносить заклинания в космосе и местах с низкой температурой! Имеет функцию энергетического щита,который защищает от всех снарядов. Щит разряжается при получении урона и автоматически заряжается.

--- a/Resources/Locale/ru-RU/_white/wizard/spells.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/spells.ftl
@@ -44,4 +44,7 @@ ent-ActionSmite = Кара
    .desc = Заряжает вашу руку мерзкой энергией, которую можно использовать для взрыва жертв. Заклинание требует, чтобы вы коснулись своей цели, поэтому вы не сможете использовать его в наручниках или будучи оглушённым. Не работает без волшебной мантии и шляпы.

 ent-ActionMindswapSpell = Подмена сознания
-    .desc = Позволяет заклинателю переключаться между телами с целью. Вы должны быть рядом с целью, в которую хотите перейти, после чего вы оба будете нокаутированы. Не работает на культистов, генокрадов и революционеров.
+    .desc = Позволяет заклинателю переключаться между телами с целью. Вы должны быть рядом с целью, в которую хотите перейти, после чего вы оба будете нокаутированы.
+
+ent-ActionTimestopSpell = Остановка времени
+    .desc = Останавливает время в радиусе вокруг вас. Находящиеся под воздействием существа не смогут двигаться, а пролетающие мимо снаряды будут остановлены до окончания остановки времени. Не работает без волшебной мантии и шляпы.
--- a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
@@ -36,6 +36,9 @@ ent-ClothingOuterRealWizardFancy = мантия волшебника
 ent-ClothingHeadHelmetWizardHelmArmored = шлем мага
    .desc = Странный головной убор, который наверняка принадлежит настоящему магу. Не обладает свойствами волшебной шляпы.

+mindswap-success = Ваш разум подменили!
+mindswap-borer-failed = Его разумом кто-то управляет.
+
 store-currency-display-spell-point = Очки заклинаний

 store-category-spells-attack = Атакующие заклинания
--- a/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl
+++ b/Resources/Locale/ru-RU/access/components/id-card-console-component.ftl
@@ -5,7 +5,6 @@ id-card-console-window-save-button = Сохранить
 id-card-console-window-job-title-label = Должность:
 id-card-console-window-eject-button = Извлечь
 id-card-console-window-insert-button = Вставить
-id-card-console-window-job-selection-label = Предустановки должностей (задает иконку отдела и должности):
 access-id-card-console-component-no-hands-error = У вас нет рук.
 id-card-console-privileged-id = Основной ID
 id-card-console-target-id = Целевой ID
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -285,6 +285,7 @@
      - id: MagazinePistol
      - id: BoxMindshield
      - id: TagillaHammer
+      - id: EightAimModule
 - type: entity
  id: LockerFreezerVaultFilled
  suffix: Vault, Locked
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -250,6 +250,10 @@
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
+  - type: PilotedClothing
+    pilotWhitelist:
+      tags:
+        - ChefPilot
  - type: Tag
    tags:
    - ClothMade
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1584,6 +1584,7 @@
    tags:
    - Trash
    - VimPilot
+    - ChefPilot
    - Mouse
    - Meat
  - type: Respirator
@@ -3065,6 +3066,7 @@
  - type: Tag
    tags:
    - VimPilot
+    - ChefPilot
    - Trash
    - Hamster
    - Meat
--- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
@@ -594,6 +594,7 @@
    - CannotSuicide
    - Hamster
    - VimPilot
+    - ChefPilot

 - type: entity
  name: Shiva
--- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -24,6 +24,60 @@
    - WhitelistChameleon
  - type: StealTarget
    stealGroup: IDCard
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.IdVisuals.State:
+        base:
+          Captain: { state: idcaptain }
+          HeadOfPersonnel: { state: idheadofpersonnel }
+          HeadOfSecurity: { state: idheadofsecurity }
+          ChiefMedicalOfficer: { state: idchiefmedicalofficer }
+          ChiefEngineer: { state: idchiefengineer }
+          ResearchDirector: { state: idresearchdirector }
+          QuarterMaster: { state: idquartermaster }
+          Lawyer: { state: idlawyer }
+          Clown: { state: idclown }
+          Bartender: { state: idbartender }
+          Reporter: { state: idreporter }
+          Chef: { state: idcook }
+          Botanist: { state: idbotanist }
+          ServiceWorker: { state: idintern-service }
+          Zookeeper: { state: idzookeeper }
+          Musician: { state: idmusician }
+          Librarian: { state: idcurator }
+          Janitor: { state: idjanitor }
+          Chaplain: { state: idchaplain }
+          Mime: { state: idmime }
+          Boxer: { state: idboxer }
+          Passenger: { state: idpassenger }
+          Visitor: { state: idpassenger }
+          Borg: { state: idunknown }
+          CustomId: { state: idunknown }
+          Warden: { state: idwarden }
+          SeniorOfficer: { state: idseniorofficer }
+          SecurityOfficer: { state: idsecurityofficer }
+          Detective: { state: iddetective }
+          SecurityCadet: { state: idintern-cadet }
+          Brigmedic: { state: idbrigmedic }
+          SeniorPhysician: { state: idseniorphysician }
+          Paramedic: { state: idparamedic }
+          Chemist: { state: idchemist }
+          MedicalDoctor: { state: idmedicaldoctor }
+          Virologist: { state: idvirologist }
+          Geneticist: { state: idgeneticist }
+          MedicalIntern: { state: idintern-med }
+          Psychologist: { state: idpsychologist }
+          SeniorEngineer: { state: idseniorengineer }
+          AtmosphericTechnician: { state: idatmospherictechnician }
+          StationEngineer: { state: idstationengineer }
+          TechnicalAssistant: { state: idintern-tech }
+          SeniorResearcher: { state: idseniorresearcher }
+          Scientist: { state: idscientist }
+          Roboticist: { state: idroboticist }
+          ResearchAssistant: { state: idintern-sci }
+          ShaftMiner: { state: idshaftminer }
+          CargoTechnician: { state: idcargotechnician }

 #IDs with layers

--- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml
@@ -37,6 +37,12 @@
  - type: ProjectileBatteryAmmoProvider
    proto: BulletTrailLaserLight
    fireCost: 50
+  - type: PointLight
+    enabled: false
+    color: "#7FC080"
+    radius: 1.05
+    energy: 0.3
+  - type: PointLightRealBattery

 - type: entity
  name: potato battery
@@ -57,6 +63,10 @@
  - type: Construction
    graph: PowerCellPotato
    node: potatobattery
+  - type: PointLight
+    enabled: false
+    radius: 1 # Костыльный путь отрубить свет
+    energy: 1

 - type: entity
  name: small-capacity power cell
@@ -122,6 +132,7 @@
    part: PowerCell
    rating: 2

+
 - type: entity
  id: PowerCellMediumPrinted
  suffix: Empty
@@ -301,6 +312,11 @@
    walkModifier: 0.8
    sprintModifier: 0.8
  - type: HeldSpeedModifier
+  - type: PointLight
+    enabled: false
+    color: "#7FC080"
+    radius: 1.2
+    energy: 0.5

 - type: entity
  id: PowerCageSmall
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -455,8 +455,8 @@
      netsync: false
      enabled: false
      radius: 1.5
-      energy: 2
-      color: blue
+      energy: 0.7
+      color: "#678AD9"
    - type: Reflect
      enabled: false
      reflectProb: 1
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -272,6 +272,10 @@
      Plastic: 100
  - type: StaticPrice
    price: 56
+  - type: PointLight
+    color: "#7FC080"
+    radius: 1.05
+    energy: 0.3

 - type: entity
  name: network configurator
@@ -395,13 +399,13 @@
  description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function.
  components:
  - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
    - WallSolid
    - FloorSteel
    - Plating
    - Catwalk
    - Grille
-    - Window    
+    - Window
    - WindowDirectional
    - WindowReinforcedDirectional
    - ReinforcedWindow
@@ -450,7 +454,7 @@
  - type: LimitedCharges
    charges: 0
  - type: RCD
-    availablePrototypes:   
+    availablePrototypes:
    - WallSolid
    - FloorSteel
    - Plating
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -99,8 +99,11 @@
  - type: Welder
  - type: PointLight
    enabled: false
-    radius: 1.5
+    radius: 1.4
+    energy: 0.5
    color: orange
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
    netsync: false
  - type: Appearance
  - type: RequiresEyeProtection
@@ -181,7 +184,11 @@
  - type: PointLight
    enabled: false
    radius: 1.5
+    energy: 0.7
    color: lightblue
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    netsync: false
  - type: SolutionRegeneration
    solution: Welder
    generated:
@@ -213,5 +220,9 @@
    speed: 0.7
  - type: PointLight
    enabled: false
-    radius: 1.0
+    radius: 0.9
+    energy: 0.5
    color: orange
+    mask: /Textures/Effects/LightMasks/cone.png
+    autoRot: true
+    netsync: false
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -1,3 +1,9 @@
+# Colors for pointlight
+# BDC07F - yellow
+# 7FC080 - green
+# C07F7F - red
+# 7F93C0 - blue
+
 - type: entity
  id: BaseWeaponBattery
  parent: BaseItem
@@ -132,6 +138,11 @@
    magState: mag
    steps: 5
    zeroVisible: true
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#BDC07F"

 - type: entity
  name: retro laser blaster
@@ -155,6 +166,11 @@
    steps: 5
    zeroVisible: true
  - type: Appearance
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#C07F7F"

 - type: entity
  name: makeshift laser pistol
@@ -175,6 +191,11 @@
  - type: ProjectileBatteryAmmoProvider
    proto: BulletTrailLaser
    fireCost: 125
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#7FC080"

 - type: entity
  name: tesla gun
@@ -230,6 +251,11 @@
  - type: ProjectileBatteryAmmoProvider
    proto: BulletTrailLaser
    fireCost: 62.5
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#7FC080"

 - type: entity
  name: practice laser rifle
@@ -265,6 +291,11 @@
    - SemiAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#7F93C0"
  - type: ProjectileBatteryAmmoProvider
    proto: PulseBoltProjectile
    fireCost: 100
@@ -302,6 +333,11 @@
      - FullAuto
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#7F93C0"
  - type: ProjectileBatteryAmmoProvider
    proto: PulseBoltProjectile
    fireCost: 40
@@ -335,6 +371,11 @@
    fireRate: 1.5
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/laser3.ogg
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#7F93C0"
  - type: ProjectileBatteryAmmoProvider
    proto: PulseBoltProjectile
    fireCost: 2.5
@@ -371,6 +412,11 @@
  - type: ProjectileBatteryAmmoProvider
    proto: BulletTrailLaserHeavy
    fireCost: 100
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#C07F7F"

 - type: entity
  name: portable particle decelerator
@@ -607,6 +653,11 @@
    price: 750
  - type: StealTarget
    stealGroup: WeaponAntiqueLaser
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#C07F7F"

 - type: entity
  name: advanced laser pistol
@@ -642,6 +693,11 @@
  - type: Appearance
  - type: StaticPrice
    price: 63
+  - type: PointLightBattery
+  - type: PointLight
+    radius: 1.3
+    energy: 0.15
+    color: "#C07F7F"

 - type: entity
  name: C.H.I.M.P. handcannon
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -798,7 +798,7 @@
    muzzleFlash: null
  - type: PointLight
    radius: 3.5
-    color: blue
+    color: "#164CAC"
    energy: 0.5

 - type: entity
@@ -1090,9 +1090,9 @@
    - 1, 0, 0, 1
    - 1, 0, 0, 0
  - type: PointLight
-    radius: 3.5
+    radius: 1.4
    color: red
-    energy: 1
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
@@ -1166,9 +1166,9 @@
    - 1, 0, 0, 1
    - 1, 0, 0, 0
  - type: PointLight
-    radius: 3.5
+    radius: 1.4
    color: red
-    energy: 1
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
@@ -1217,9 +1217,9 @@
    - 0, 0, 1, 1
    - 0, 0, 1, 0
  - type: PointLight
-    radius: 3.5
-    color: blue
-    energy: 1
+    radius: 1.7
+    color: "#164CAC"
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
@@ -1267,9 +1267,9 @@
    - 1, 0, 0, 1
    - 1, 0, 0, 0
  - type: PointLight
-    radius: 3.5
+    radius: 1.9
    color: red
-    energy: 1
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
@@ -1317,9 +1317,9 @@
    - 0, 1, 0, 1
    - 0, 1, 0, 0
  - type: PointLight
-    radius: 3.5
+    radius: 1.7
    color: green
-    energy: 1
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
@@ -1367,9 +1367,9 @@
    - 1, 0, 0, 1
    - 1, 0, 0, 0
  - type: PointLight
-    radius: 3.5
+    radius: 1.7
    color: red
-    energy: 1
+    energy: 0.7
  - type: Reflective
    reflective:
    - Energy
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -15,7 +15,6 @@
    - Back
    - suitStorage
  - type: AmmoCounter
-  - type: WeaponModules
  - type: Gun
    fireRate: 5
    selectedMode: FullAuto
@@ -81,10 +80,15 @@
      visible: false
      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
      map: [ "enum.ModuleVisualState.HandGuardModule" ]
+    - state: aim_module
+      visible: false
+      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+      map: [ "enum.ModuleVisualState.AimModule" ]
  - type: Gun
    fireRate: 5
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/ak.ogg
+  - type: WeaponModules
  - type: ChamberMagazineAmmoProvider
    soundRack:
      path: /Audio/Weapons/Guns/Cock/ltrifle_cock.ogg
@@ -122,12 +126,21 @@
        whitelist:
          tags:
          - BaseBarrelModule
+      aim_module:
+        name: Aim Module
+        insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+        ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+        priority: 3
+        whitelist:
+          tags:
+          - BaseAimModule
  - type: ContainerContainer
    containers:
      gun_magazine: !type:ContainerSlot
      gun_chamber: !type:ContainerSlot
      handguard_module: !type:ContainerSlot
      barrel_module: !type:ContainerSlot
+      aim_module: !type:ContainerSlot
  - type: MagazineVisuals
    magState: mag
    steps: 1
@@ -201,11 +214,16 @@
      visible: false
      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
      map: [ "enum.ModuleVisualState.HandGuardModule" ]
+    - state: aim_module
+      visible: false
+      sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+      map: [ "enum.ModuleVisualState.AimModule" ]
  - type: Clothing
    sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
  - type: Gun
    soundGunshot:
      path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg
+  - type: WeaponModules
  - type: ItemSlots
    slots:
      gun_magazine:
@@ -240,12 +258,21 @@
        whitelist:
          tags:
          - BaseBarrelModule
+      aim_module:
+        name: Aim Module
+        insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+        ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+        priority: 3
+        whitelist:
+          tags:
+          - BaseAimModule
  - type: ContainerContainer
    containers:
      gun_magazine: !type:ContainerSlot
      gun_chamber: !type:ContainerSlot
      handguard_module: !type:ContainerSlot
      barrel_module: !type:ContainerSlot
+      aim_module: !type:ContainerSlot
  - type: MagazineVisuals
    magState: mag
    steps: 1
@@ -261,6 +288,7 @@
  id: WeaponRifleLecterRubber
  suffix: Non-lethal
  components:
+  - type: WeaponModules
  - type: ItemSlots
    slots:
      gun_magazine:
@@ -295,3 +323,11 @@
        whitelist:
          tags:
          - BaseBarrelModule
+      aim_module:
+        name: Aim Module
+        insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+        ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+        priority: 3
+        whitelist:
+          tags:
+          - BaseAimModule
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -108,6 +108,10 @@
      visible: false
      sprite: White/Objects/Weapons/modulesOnSMGs.rsi
      map: [ "enum.ModuleVisualState.HandGuardModule" ]
+    - state: aim_module
+      visible: false
+      sprite: White/Objects/Weapons/modulesOnSMGs.rsi
+      map: [ "enum.ModuleVisualState.AimModule" ]
  - type: Clothing
    sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
  - type: Gun
@@ -150,12 +154,21 @@
        whitelist:
          tags:
          - BaseHandGuardModule
+      aim_module:
+        name: Aim Module
+        insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+        ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+        priority: 3
+        whitelist:
+          tags:
+          - BaseAimModule
  - type: ContainerContainer
    containers:
      gun_magazine: !type:ContainerSlot
      gun_chamber: !type:ContainerSlot
      handguard_module: !type:ContainerSlot
      barrel_module: !type:ContainerSlot
+      aim_module: !type:ContainerSlot
  - type: MagazineVisuals
    magState: mag
    steps: 6
@@ -186,6 +199,10 @@
          visible: false
          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
          map: [ "enum.ModuleVisualState.HandGuardModule" ]
+        - state: aim_module
+          visible: false
+          sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+          map: [ "enum.ModuleVisualState.AimModule" ]
    - type: Clothing
      sprite: Objects/Weapons/Guns/SMGs/drozd.rsi
    - type: Gun
@@ -230,12 +247,21 @@
          whitelist:
            tags:
            - BaseHandGuardModule
+        aim_module:
+          name: Aim Module
+          insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+          ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+          priority: 3
+          whitelist:
+            tags:
+            - BaseAimModule
    - type: ContainerContainer
      containers:
        gun_magazine: !type:ContainerSlot
        gun_chamber: !type:ContainerSlot
        handguard_module: !type:ContainerSlot
        barrel_module: !type:ContainerSlot
+        aim_module: !type:ContainerSlot
    - type: MagazineVisuals
      magState: mag
      steps: 1
@@ -319,6 +345,10 @@
        visible: false
        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
        map: [ "enum.ModuleVisualState.HandGuardModule" ]
+      - state: aim_module
+        visible: false
+        sprite: White/Objects/Weapons/modulesOnWeapon.rsi
+        map: [ "enum.ModuleVisualState.AimModule" ]
  - type: Clothing
    sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
  - type: ChamberMagazineAmmoProvider
@@ -363,12 +393,21 @@
        whitelist:
          tags:
            - BaseHandGuardModule
+      aim_module:
+        name: Aim Module
+        insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+        ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+        priority: 2
+        whitelist:
+          tags:
+            - BaseAimModule
  - type: ContainerContainer
    containers:
      gun_magazine: !type:ContainerSlot
      gun_chamber: !type:ContainerSlot
      handguard_module: !type:ContainerSlot
      barrel_module: !type:ContainerSlot
+      aim_module: !type:ContainerSlot
  - type: MagazineVisuals
    magState: mag
    steps: 6
@@ -419,6 +458,14 @@
          whitelist:
            tags:
            - BaseHandGuardModule
+        aim_module:
+          name: Aim Module
+          insertSound: /Audio/White/Gun/Modules/insertmodule.ogg
+          ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg
+          priority: 3
+          whitelist:
+            tags:
+            - BaseAimModule

 - type: entity
  name: Vector
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -62,7 +62,7 @@
  - type: PointLight
    enabled: false
    radius: 2
-    energy: 2
+    energy: 0.6
    color: white
    netsync: false
  - type: Appearance
--- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
+++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
@@ -116,7 +116,7 @@
  - type: RCDDeconstructable
    cost: 6
    delay: 8
-    fx: EffectRCDDeconstruct8    
+    fx: EffectRCDDeconstruct8
  - type: Destructible
    thresholds:
    - trigger:
@@ -149,9 +149,15 @@
      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
  - type: PryUnpowered
  - type: BlockWeather
+  - type: PointLight
+    enabled: false
+    radius: 1.5
+    energy: 0.7
+  - type: PointLightAirlock
  placement:
    mode: SnapgridCenter
- 
+
+
 - type: entity
  id: AirlockRCDResistant
  parent: Airlock
@@ -200,4 +206,4 @@
  - type: Tag
    tags:
      - GlassAirlock
-      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
+      # This tag is used to nagivate the Airlock construction graph. It's needed because the construction graph is shared between Airlock, AirlockGlass, and HighSecDoor
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -42,8 +42,8 @@
          False: { visible: true, shader: shaded }
  - type: LitOnPowered
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.6
+    energy: 0.7
    enabled: false
    mask: /Textures/Effects/LightMasks/cone.png
    autoRot: true
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -1090,6 +1090,7 @@
      - CarpetBlack
      - CarpetPink
      - CarpetBlue
+      - CarpetSBlue
      - CarpetGreen
      - CarpetOrange
      - CarpetPurple
--- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
@@ -88,8 +88,8 @@
    usesApcPower: true
  - type: PointLight
    enabled: false
-    castShadows: false
-    radius: 1.5
+    radius: 1.3
+    energy: 0.7
  - type: LitOnPowered
  - type: ApcPowerReceiver
    powerLoad: 200
@@ -221,8 +221,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1
-    energy: 1.3
+    radius: 1.3
+    energy: 0.7
    color: "#ffb0b0"
  - type: AccessReader
    access: [["HeadOfPersonnel"]]
@@ -256,8 +256,8 @@
  - type: AccessReader
    access: [["Service"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#4b93ad"

 - type: entity
@@ -324,8 +324,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.8
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#3db83b"
  - type: CargoSellBlacklist

@@ -361,8 +361,8 @@
    - state: panel
      map: [ "enum.WiresVisualLayers.MaintenancePanel" ]
  - type: PointLight
-    radius: 1.8
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#3db83b"

 - type: entity
@@ -403,8 +403,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.3
+    radius: 1.3
+    energy: 0.7
    color: "#ad7c4b"

 - type: entity
@@ -440,8 +440,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#3c5eb5"

 - type: entity
@@ -460,8 +460,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#423438"

 - type: entity
@@ -481,8 +481,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#A50824"

 - type: entity
@@ -505,8 +505,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#44964A"

 - type: entity
@@ -528,8 +528,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#CBC6BE"

 - type: entity
@@ -552,8 +552,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#D3A44D"

 - type: entity
@@ -587,8 +587,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#66538F"

 - type: entity
@@ -624,8 +624,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#6927C5"

 - type: entity
@@ -660,8 +660,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#D82929"

 - type: entity
@@ -693,8 +693,8 @@
  - type: AccessReader
    access: [["Service"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#4b93ad"

 - type: entity
@@ -723,8 +723,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#9a18d6"

 - type: entity
@@ -757,8 +757,8 @@
    - texture: Structures/Machines/VendingMachines/maintenance_panel.png
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#6148c7"

 - type: entity
@@ -787,8 +787,8 @@
  - type: AccessReader
    access: [["Engineering"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#b89e2a"

 - type: entity
@@ -822,8 +822,8 @@
  - type: AccessReader
    access: [["Medical"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#9dc5c9"
  - type: GuideHelp
    guides:
@@ -859,8 +859,8 @@
  - type: AccessReader
    access: [["Hydroponics"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#326e3f"

 - type: entity
@@ -929,8 +929,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#326e3f"

 - type: entity
@@ -973,8 +973,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#c73434"

 - type: entity
@@ -1004,8 +1004,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#737785"

 - type: entity
@@ -1024,8 +1024,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#3c5eb5"

 - type: entity
@@ -1044,8 +1044,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#CE3401"

 - type: entity
@@ -1064,8 +1064,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#5F6A1C"

 - type: entity
@@ -1084,8 +1084,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#207E79"

 - type: entity
@@ -1120,8 +1120,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#389690"

 - type: entity
@@ -1158,8 +1158,8 @@
      map: ["enum.VendingMachineVisualLayers.Screen"]
      shader: unshaded
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#c73434"
  - type: Tag
    tags:
@@ -1194,8 +1194,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#9dc5c9"

 - type: entity
@@ -1229,8 +1229,8 @@
  - type: AccessReader
    access: [["Research"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#B0ADA9"
  - type: GuideHelp
    guides:
@@ -1260,8 +1260,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#d4ab33"
  - type: Tag
    tags:
@@ -1295,8 +1295,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#326e3f"

 - type: entity
@@ -1329,8 +1329,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#ffe599"

 - type: entity
@@ -1356,8 +1356,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#9dc5c9"
  - type: AccessReader
    access: [["Salvage"]]
@@ -1395,8 +1395,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#d4ab33"

 # wallmounted machines
@@ -1591,8 +1591,8 @@
  - type: AccessReader
    access: [["Chapel"]]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#CCCCCC" #The holy C

 - type: entity
@@ -2022,8 +2022,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#48CF48"
  - type: AccessReader
    access: [["CentralCommand"]]
@@ -2056,8 +2056,8 @@
    - state: panel
      map: ["enum.WiresVisualLayers.MaintenancePanel"]
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.3
+    energy: 0.7
    color: "#3c5eb5"
  - type: Advertise
    pack: HappyHonkAds
--- a/Resources/Prototypes/Entities/Structures/Power/apc.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml
@@ -13,10 +13,9 @@
    sound:
      path: /Audio/Ambience/Objects/hdd_buzz.ogg
  - type: PointLight
-    radius: 1.5
-    energy: 1.6
+    radius: 1.4
+    energy: 0.7
    color: "#3db83b"
-    castShadows: false
    netsync: false
  - type: Clickable
  - type: AccessReader
--- a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/base_structurelockers.yml
@@ -49,6 +49,11 @@
    node: done
    containers:
    - entity_storage
+  - type: PointLight
+    enabled: false
+    radius: 1.15
+    energy: 0.45
+  - type: PointLightLocker

 - type: entity
  id: LockerBaseSecure
--- a/Resources/Prototypes/Magic/white.yml
+++ b/Resources/Prototypes/Magic/white.yml
@@ -330,6 +330,7 @@
        components:
        - MindContainer
        - ActionContainer
+        - MobState
      canTargetSelf: false
      checkCanInteract: false
      useDelay: 60
@@ -339,3 +340,24 @@
        state: mindswap
      event: !type:MindswapSpellEvent
        speech: "GIN'YU CAPAN!"
+
+- type: entity
+  id: ActionTimestopSpell
+  name: Stop time
+  noSpawn: true
+  components:
+    - type: Magic
+      requiresClothes: true
+    - type: InstantAction
+      alwaysPlaySound: false
+      sound: !type:SoundPathSpecifier
+        path: /Audio/White/Magic/timeparadox2.ogg
+      useDelay: 50
+      itemIconStyle: BigAction
+      checkCanInteract: false
+      icon:
+        sprite: Objects/Magic/magicactions.rsi
+        state: time
+      event: !type:StopTimeSpellEvent
+        prototype: Timestop
+        speech: "TOKI YO TOMARE!"
--- a/Resources/Prototypes/Reagents/botany.yml
+++ b/Resources/Prototypes/Reagents/botany.yml
@@ -247,6 +247,8 @@
          groups:
            Brute: -5
            Burn: -5
+          types:
+            Bloodloss: -5


 - type: reagent
--- a/Resources/Prototypes/Recipes/Lathes/clothing.yml
+++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml
@@ -1248,6 +1248,13 @@
  materials:
    Cloth: 100

+- type: latheRecipe
+  id: CarpetSBlue
+  result: FloorCarpetItemSkyBlue
+  completetime: 1
+  materials:
+    Cloth: 100
+
 - type: latheRecipe
  id: CarpetGreen
  result: FloorCarpetItemGreen
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -701,3 +701,12 @@
     Plastic: 1000
     Glass: 500
     Gold: 1000
+
+- type: latheRecipe
+  id: EightAimRecipe
+  result: EightAimModule
+  completetime: 15
+  materials:
+     Steel: 500
+     Plastic: 700
+     Glass: 300
--- a/Resources/Prototypes/Recipes/Reactions/medicine.yml
+++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml
@@ -577,9 +577,12 @@

 - type: reaction
  id: Synthflesh
+  minTemp: 370
  reactants:
    Blood:
-      amount: 1
+      amount: 2
+    WeldingFuel:
+      amount: 2
    Carbon:
      amount: 1
    Bicaridine:
--- a/Resources/Prototypes/_White/Entities/Effects/timestop.yml
+++ b/Resources/Prototypes/_White/Entities/Effects/timestop.yml
@@ -0,0 +1,31 @@
+- type: entity
+  id: Timestop
+  name: "chronofield"
+  description: "ZA WARUDO"
+  components:
+  - type: Sprite
+    drawdepth: FloorObjects
+    sprite: White/Effects/timestop.rsi
+    state: icon
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 2.5
+        density: 0
+        hard: false
+        mask:
+        - None
+        layer:
+        - Impassable
+        - HighImpassable
+        - MidImpassable
+        - LowImpassable
+        - Opaque
+        - BulletImpassable
+  - type: Physics
+    bodyType: Static
+  - type: TimedDespawn
+    lifetime: 10
+  - type: FreezeContacts
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml
@@ -32,6 +32,23 @@
    - 0,0,0,0
  - type: Appearance

+- type: entity
+  id: BaseAimModule
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/modules.rsi
+  - type: Tag
+    tags:
+      - BaseAimModule
+  - type: Item
+    sprite: White/Objects/Weapons/modules.rsi
+    size: Small
+    shape:
+    - 0,0,0,0
+  - type: Appearance
+
 # modules
 - type: entity
  id: LightModule
@@ -97,3 +114,16 @@
  - type: Sprite
    state: accelerator
  - type: Appearance
+
+- type: entity
+  id: EightAimModule
+  description: 8X Aim Module for rifles.
+  name: "aim module"
+  parent: BaseAimModule
+  components:
+  - type: AimModule
+    value: "eightaim"
+    module_type: "aim_module"
+  - type: Sprite
+    state: eightaim
+  - type: Appearance
--- a/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml
+++ b/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml
@@ -160,3 +160,12 @@
    - type: Scroll
      actionId: ActionMindswapSpell
      learnPopup: scroll-component-mindswap
+
+- type: entity
+  id: ScrollTimestop
+  parent: BaseScroll
+  name: "Stop time scroll"
+  components:
+    - type: Scroll
+      actionId: ActionTimestopSpell
+      learnPopup: scroll-component-timestop
--- a/Resources/Prototypes/_White/Wizard/spellbook_catalog.yml
+++ b/Resources/Prototypes/_White/Wizard/spellbook_catalog.yml
@@ -30,6 +30,22 @@
  - !type:ListingLimitedStockCondition
    stock: 1

+- type: listing
+  id: SpellBookTimestop
+  name: spellbook-timestop-name
+  description: spellbook-timestop-desc
+  productEntity: ScrollTimestop
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: time
+  cost:
+    SpellPoint: 2
+  categories:
+  - DefenceSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 - type: listing
  id: SpellBookKnock
  name: spellbook-knock-name
--- a/Resources/Prototypes/_White/tags.yml
+++ b/Resources/Prototypes/_White/tags.yml
@@ -75,3 +75,6 @@

 - type: Tag
  id: BaseHandGuardModule
+
+- type: Tag
+  id: BaseAimModule
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -361,6 +361,10 @@
 - type: Tag
  id: Chicken

+# Allowed to control someone wearing a Chef's hat if inside their hat.
+- type: Tag
+  id: ChefPilot
+
 - type: Tag
  id: ChemDispensable # container that can go into the chem dispenser

--- a/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/meta.json
@@ -60,6 +60,9 @@
      },
      {
          "name": "mindswap"
+      },
+      {
+          "name": "time"
      }
  ]
 }
--- a/Resources/Textures/Objects/Magic/magicactions.rsi/time.png
+++ b/Resources/Textures/Objects/Magic/magicactions.rsi/time.png
--- a/Resources/Textures/White/Effects/timestop.rsi/icon.png
+++ b/Resources/Textures/White/Effects/timestop.rsi/icon.png
--- a/Resources/Textures/White/Effects/timestop.rsi/meta.json
+++ b/Resources/Textures/White/Effects/timestop.rsi/meta.json
@@ -0,0 +1,37 @@
+{
+  "version": 1,
+  "license":  "CC-BY-SA-3.0",
+  "copyright":  "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
+  "size": {
+    "x": 160,
+    "y": 160
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
--- a/Resources/Textures/White/Objects/Weapons/modules.rsi/aim_module.png
+++ b/Resources/Textures/White/Objects/Weapons/modules.rsi/aim_module.png
--- a/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png
+++ b/Resources/Textures/White/Objects/Weapons/modules.rsi/eightaim.png
--- a/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/modules.rsi/meta.json
@@ -22,11 +22,17 @@
    {
      "name": "accelerator"
    },
+    {
+      "name": "eightaim"
+    },
    {
      "name": "barrel_module"
    },
    {
      "name": "handguard_module"
+    },
+    {
+      "name": "aim_module"
    }
  ]
 }
--- a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/aim_module.png
--- a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/eightaim.png
--- a/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnSMGs.rsi/meta.json
@@ -22,11 +22,17 @@
        {
            "name": "accelerator"
        },
+        {
+            "name": "eightaim"
+        },
        {
            "name": "handguard_module"
        },
        {
            "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
        }
    ]
 }
--- a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/aim_module.png
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/aim_module.png
--- a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/eightaim.png
--- a/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/modulesOnWeapon.rsi/meta.json
@@ -22,11 +22,17 @@
        {
            "name": "accelerator"
        },
+        {
+            "name": "eightaim"
+        },
        {
            "name": "handguard_module"
        },
        {
            "name": "barrel_module"
+        },
+        {
+            "name": "aim_module"
        }
    ]
 }
				`@@ -0,0 +1 @@`
				`handheld-teleporter-instability-fizzle = The portal fizzles as you try to place it, destroying both ends!`