Merge remote-tracking branch 'origin/master' into weapon-modules

Resources/Changelog/ChangelogWhite.yml

@@ -2604,3 +2604,171 @@
   id: 212
   time: '2024-03-21T20:20:10.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/228
+- author: Aviu
+  changes:
+  - message: "\u0417\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u0441\u043E\
+      \u043A\u0440\u044B\u0442\u0438\u044F \u043F\u0440\u0438\u0441\u0443\u0442\u0441\
+      \u0442\u0432\u0438\u044F \u0434\u043B\u044F \u043A\u0443\u043B\u044C\u0442\u0430\
+      ."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E\
+      \ \u0441\u0434\u0435\u043B\u0430\u0442\u044C \u043A\u0440\u043E\u0432\u0430\u0432\
+      \u043E\u0435 \u043A\u043E\u043F\u044C\u0435 \u0438 \u0437\u0430\u043B\u043F\
+      \ \u043A\u0440\u043E\u0432\u0430\u0432\u044B\u0445 \u0441\u043D\u0430\u0440\u044F\
+      \u0434\u043E\u0432, \u043A\u043B\u0438\u043A\u043D\u0443\u0432 \u041F\u041A\u041C\
+      \ \u043F\u043E \u0441\u0435\u0431\u0435 -> \u041A\u0443\u043B\u044C\u0442 ->\
+      \ \u041A\u0440\u043E\u0432\u0430\u0432\u044B\u0435 \u043E\u0431\u0440\u044F\u0434\
+      \u044B."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u043E \u043E\u043F\u0438\
+      \u0441\u0430\u043D\u0438\u0435 \u043A \u0440\u0443\u043D\u0430\u043C."
+    type: Add
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u043F\u043E\
+      \u043B\u0443\u0447\u0438\u043B\u0438 \u043F\u0435\u0440\u0435\u043A\u043B\u044E\
+      \u0447\u0430\u0435\u043C\u043E\u0435 \u043D\u043E\u0447\u043D\u043E\u0435 \u0437\
+      \u0440\u0435\u043D\u0438\u0435."
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043F\u043E\u043F\
+      \u0430\u043F\u044B \u043F\u0440\u0438 \u0432\u043E\u0441\u043A\u0440\u0435\u0448\
+      \u0435\u043D\u0438\u0438\u0438 \u043D\u0430 \u0440\u0443\u043D\u0435 \u0438\
+      \ \u043F\u0440\u0438 \u043F\u043E\u043F\u044B\u0442\u043A\u0435 \u043D\u0430\
+      \u0447\u0435\u0440\u0442\u0438\u0442\u044C \u0440\u0438\u0442\u0443\u0430\u043B\
+      \ \u043F\u0440\u043E\u0441\u0442\u0440\u0430\u043D\u0441\u0442\u0432\u0435\u043D\
+      \u043D\u043E\u0433\u043E \u0440\u0430\u0437\u0440\u044B\u0432\u0430."
+    type: Add
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u0432\u0438\u0434\u044F\u0442 \u0438\u043A\u043E\u043D\
+      \u043A\u0438 \u043A\u0443\u043B\u044C\u0442\u0430."
+    type: Add
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u043C\u043E\u0433\u0443\u0442 \u043B\u0435\u0447\u0438\
+      \u0442\u044C\u0441\u044F \u043E\u0442 \u043F\u0438\u043B\u043E\u043D\u0430."
+    type: Add
+  - message: "\u0414\u0432\u0435\u0440\u044C \u043A\u0443\u043B\u044C\u0442\u0430\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u0433\u043D\u043E\u0432\u0435\u043D\
+      \u043D\u043E \u0440\u0430\u0437\u0431\u0438\u0440\u0430\u0435\u0442\u0441\u044F\
+      \ \u0440\u0438\u0442\u0443\u0430\u043B\u044C\u043D\u044B\u043C \u043A\u0438\u043D\
+      \u0436\u0430\u043B\u043E\u043C."
+    type: Add
+  - message: "\u041A\u0443\u043B\u044C\u0442\u0438\u0441\u0442 \u0441 \u0432\u044B\
+      \u0440\u0435\u0437\u0430\u043D\u043D\u044B\u043C \u043C\u043E\u0437\u0433\u043E\
+      \u043C \u043C\u043E\u0436\u0435\u0442 \u0432\u0435\u0440\u043D\u0443\u0442\u044C\
+      \u0441\u044F \u0432 \u0442\u0435\u043B\u043E \u043F\u0440\u0438 \u0432\u043E\
+      \u0441\u043A\u0440\u0435\u0448\u0435\u043D\u0438\u0438 \u043D\u0430 \u0440\u0443\
+      \u043D\u0435."
+    type: Add
+  - message: "\u0417\u0430\u0440\u044F\u0434\u044B \u0440\u0443\u043D\u044B \u0432\
+      \u043E\u0441\u043A\u0440\u0435\u0448\u0435\u043D\u0438\u044F \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u043D\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u044F\u044E\
+      \u0442\u0441\u044F \u043C\u0435\u0436\u0434\u0443 \u0440\u0430\u0443\u043D\u0434\
+      \u0430\u043C\u0438."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0447\u0435\u0440\u0442\u0438\u0442\u044C \u0440\u0443\u043D\u044B \u0431\
+      \u0435\u0437 \u043A\u0438\u043D\u0436\u0430\u043B\u0430 \u0432 \u0440\u0443\u043A\
+      \u0430\u0445."
+    type: Fix
+  - message: "\u0426\u0435\u043B\u044C \u043A\u0443\u043B\u044C\u0442\u0430 \u0431\
+      \u0443\u0434\u0435\u0442 \u0441\u0447\u0438\u0442\u0430\u0442\u044C\u0441\u044F\
+      \ \u043C\u0435\u0440\u0442\u0432\u043E\u0439, \u0435\u0441\u043B\u0438 \u043F\
+      \u0440\u0435\u0432\u0440\u0430\u0442\u0438\u0442\u044C \u0435\u0451 \u0432 \u043A\
+      \u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442."
+    type: Fix
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0445\u043F\
+      \ \u0441\u0442\u0435\u043D\u0435 \u043A\u0443\u043B\u044C\u0442\u0430 \u0434\
+      \u043E 300, \u0434\u0432\u0435\u0440\u0438 \u043A\u0443\u043B\u044C\u0442\u0430\
+      \ \u0434\u043E 200."
+    type: Tweak
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u0434\u0432\u0438\u0433\u0430\u044E\u0442\u0441\u044F\
+      \ \u0438 \u0430\u0442\u0430\u043A\u0443\u044E\u0442 \u0431\u044B\u0441\u0442\
+      \u0440\u0435\u0435."
+    type: Tweak
+  - message: "\u0424\u0430\u043D\u0442\u043E\u043C \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u043D\u0430\u043D\u043E\u0441\u0438\u0442 40 \u0441\u0442\u0440\u0443\u043A\
+      \u0442\u0443\u0440\u043D\u043E\u0433\u043E \u0443\u0440\u043E\u043D\u0430."
+    type: Tweak
+  - message: "\u041C\u0430\u043A\u0441\u0438\u043C\u0443\u043C \u0437\u0430\u043A\u043B\
+      \u0438\u043D\u0430\u043D\u0438\u0439 \u043A\u0440\u043E\u0432\u0438 \u0431\u0435\
+      \u0437 \u0440\u0443\u043D\u044B \u043C\u043E\u0433\u0443\u0449\u0435\u0441\u0442\
+      \u0432\u0430: 1 -> 2, \u0441 \u0440\u0443\u043D\u043E\u0439: 4 -> 5."
+    type: Tweak
+  - message: "\u0417\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u0442\u0435\
+      \u043B\u0435\u043F\u043E\u0440\u0442\u0430 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0440\u0430\u0431\u043E\u0442\u0430\u0435\u0442 \u043D\u0430 \u0441\u0432\
+      \u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0446\u0435\u043B\u0435\u0439."
+    type: Tweak
+  - message: "\u0416\u0443\u0442\u043A\u0438\u0439 \u043A\u043B\u0438\u043D\u043E\u043A\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u043F\
+      \u043E\u0432\u0435\u0441\u0438\u0442\u044C \u043D\u0430 \u0431\u0440\u043E\u043D\
+      \u044E."
+    type: Tweak
+  - message: "\u0414\u0432\u0435\u0440\u044C \u043A\u0443\u043B\u044C\u0442\u0430\
+      \ \u0442\u0435\u043F\u0435\u0440\u044C \u043D\u0435 \u043E\u0442\u043A\u0440\
+      \u044B\u0432\u0430\u0435\u0442\u0441\u044F \u043F\u0440\u0438 \u043A\u043E\u043D\
+      \u0442\u0430\u043A\u0442\u0435 \u0441 \u0436\u0438\u0432\u044B\u043C \u043D\u0435\
+      \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u043C \u043A\u0443\u043B\u044C\
+      \u0442\u0438\u0441\u0442\u043E\u043C \u0438\u043B\u0438 \u043A\u043E\u043D\u0441\
+      \u0442\u0440\u0443\u043A\u0442\u043E\u043C."
+    type: Tweak
+  id: 213
+  time: '2024-03-22T08:23:33.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/220
+- author: ThereDrD
+  changes:
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D \u0434\u044E\u043F\
+      \ \u0434\u0435\u043D\u0435\u0433 \u0432 \u043A\u0430\u0440\u0433\u043E"
+    type: Fix
+  id: 214
+  time: '2024-03-24T02:10:19.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/234
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0437\u0430\u043F\
+      \u043E\u043B\u043D\u0435\u043D\u043D\u044B\u0435 \u0432\u0435\u0440\u0441\u0438\
+      \u0438 \u0448\u043A\u0430\u0444\u043E\u0432 \u043A\u043B\u043E\u0443\u043D\u0430\
+      \ \u0438 \u043C\u0438\u043C\u0430"
+    type: Add
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0440\u0430\u0437\
+      \u043B\u0438\u0447\u043D\u044B\u0435 \u0436\u0438\u0432\u043E\u0442\u043D\u044B\
+      \u0435 \u0432 \u0442\u0435\u0445\u043D\u0438\u0447\u0435\u0441\u043A\u0438\u0435\
+      \ \u0448\u043A\u0430\u0444\u044B. \u041A\u0430\u043A \u0430\u0433\u0440\u0435\
+      \u0441\u0441\u0438\u0432\u043D\u044B\u0435, \u0441 \u043D\u0438\u0437\u043A\u0438\
+      \u043C \u0448\u0430\u043D\u0441\u043E\u043C, \u0442\u0430\u043A \u0438 \u043C\
+      \u0438\u0440\u043D\u044B\u0435."
+    type: Add
+  - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043E\
+      \ \u0441\u043E\u0434\u0435\u0440\u0436\u0438\u043C\u043E\u0435 \u0448\u043A\u0430\
+      \u0444\u043E\u0432 \u0433\u043B\u0430\u0432. \u0412\u0441\u044F \u043E\u0434\
+      \u0435\u0436\u0434\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u0445\u0440\u0430\
+      \u043D\u0438\u0442\u0441\u044F \u0432 \u043A\u043E\u043C\u043E\u0434\u0430\u0445\
+      ."
+    type: Tweak
+  - message: "\u041D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0448\u043A\u0430\
+      \u0444\u044B \u0440\u043E\u043B\u0435\u0439 \u043F\u043E\u043F\u043E\u043B\u043D\
+      \u0435\u043D\u044B \u043D\u043E\u0432\u044B\u043C\u0438 \u043F\u0440\u0435\u0434\
+      \u043C\u0435\u0442\u0430\u043C\u0438"
+    type: Tweak
+  - message: "\u041F\u043E\u0444\u0438\u043A\u0448\u0435\u043D\u044B \u043F\u0443\u0441\
+      \u0442\u044B\u0435 \u043F\u043E\u044F\u0441\u0430, \u0430\u043F\u0442\u0435\u0447\
+      \u043A\u0438 \u0438 \u043F\u0440\u043E\u0447\u0438\u0435 \u043F\u0440\u0435\u0434\
+      \u043C\u0435\u0442\u044B \u0432 \u0448\u043A\u0430\u0444\u0430\u0445."
+    type: Fix
+  id: 215
+  time: '2024-03-24T03:21:27.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/193
+- author: CaypenNow
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u0434\u0435\u043B\u0430\u043D\u044B \u043D\u0435\
+      \u0433\u0430\u0442\u0438\u0432\u043D\u044B\u0435 \u044D\u0444\u0444\u0435\u043A\
+      \u0442\u044B \u0441\u0442\u0438\u043C\u0443\u043B\u044F\u0442\u043E\u0440\u043E\
+      \u0432."
+    type: Add
+  - message: "\u0410\u0442\u043C\u043E\u0441 \u0433\u043E\u043B\u043E\u043F\u0440\u043E\
+      \u0435\u043A\u0442\u043E\u0440 \u0441\u043D\u043E\u0432\u0430 \u043C\u043E\u0436\
+      \u043D\u043E \u043F\u043E\u043B\u043E\u0436\u0438\u0442\u044C \u0432 \u0440\u044E\
+      \u043A\u0437\u0430\u043A!"
+    type: Fix
+  id: 216
+  time: '2024-03-24T08:59:57.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/227

Resources/Locale/ru-RU/White/cult.ftl

@@ -1,12 +1,15 @@
-cult-role-greeting =
+cult-role-greeting =
     Вы - член культа!
         Ваши цели перечислены в меню персонажа.
         В ваш рюкзак были добавлены предметы, которые помогут вам.
         И помните - вы не единственный.
         Слава Нар`си!
 
+cult-role-briefing-short = Используйте '^' для связи с другими членами культа.
+
 cult-cond-cultwin = Культ одержал победу
 cult-cond-cultfailure = Экипаж уничтожил культ
+cult-cond-cultdraw = Ничейный исход
 
 cultists-list-start = Культистами были:
 cultists-list-name = - [color=White]{ $name }[/color] ([color=gray]{ $user }[/color])

Resources/Locale/ru-RU/White/stuff.ftl/pylon.ftl

@@ -1,4 +1,4 @@
 pylon-toggle-on = Кристалл воспаряет над пьедесталом, начиная пульсировать
 pylon-toggle-off = Кристалл перестаёт пульсировать, опускаясь на пьедестал
 ent-CultPylon = пилон
-    .desc = Мистический конструкция.
+    .desc = Мистическая конструкция.

Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl

@@ -1,11 +1,28 @@
-ent-OfferingRune = руна предпонесения
+ent-OfferingRune = руна предпонесения
+    .desc = Мгновенно превращает обычного члена экипажа в культиста, для чего требуется 2 культиста вокруг руны. Члена экипажа с имплантом защиты разума нельзя перевоплотить, можно только принести в жертву, для чего нужно 3 культиста, которые встанут вокруг руны. Если цель мертва, то она будет принесена в жертву, для чего требуется 1 культист.
+
 ent-BuffRune = руна усиления
+    .desc = При активации усиливает вас, уменьшая затраты и ускоряя процесс подготовки заклинаний крови и черчения рун.
+
 ent-EmpoweringRune = руна могущества
+    .desc = Позволяет культистам приготовить до 5 заклинаний крови.
+
 ent-TeleportRune = руна телепортации
+    .desc = Эта руна при использовании переносит всё, что находится на ней, к другой руне телепортации.
+
 ent-SummoningRune = руна призыва
+    .desc = Эта руна позволяет мгновенно призвать к руне любого несвязанного культиста. Для использования требуются 2 культиста, стоящих вокруг руны.
+
 ent-ReviveRune = руна воскрешения
+    .desc = Каждый раз, когда кого-то приносят в жертву на Руне Преподнесения, этой руне добавляется один глобальный заряд. Размещение трупа культиста на руне и её активация вернет его к жизни, расходуя при этом заряд.
+
 ent-BarrierRune = руна барьера
+    .desc = При активации на создаёт барьер, блокирующую проход. Может быть повторно активирована, чтобы отменить заклинание.
+
 ent-BloodBoilRune = руна кипящей крови
+    .desc = При активации отнимает у призывателей некоторое количество крови, чтобы отправить несколько разрушительных импульсов любому не-культисту поблизости. Когда эффект закончится, руна ненадолго подожжет все, что находится вокруг нее. Для активации требуются 3 культиста, стоящих вокруг руны.
+
 ent-ApocalypseRune = ритуал пространственного разрыва
+    .desc = Руна призыва Нар'Си.
 
 runes-window-title = Руны

Resources/Locale/ru-RU/_white/implants/mindshield.ftl

@@ -0,0 +1,2 @@
+ent-BoxMindshield = коробка имплантов
+    .desc = Хранит набор имплантов защиты разума.

Resources/Locale/ru-RU/_white/mobs/angry.ftl

@@ -0,0 +1,3 @@
+ent-MobMonkeyAngry = { ent-MobMonkey }
+.desc = { ent-MobMonkey.desc }
+.suffix = Агрессивная

Resources/Locale/ru-RU/cult/abilities.ftl

@@ -35,3 +35,9 @@ ent-ActionCultShadowShackles = Теневые Узы
 
 ent-InstantActionEmpPulse = Электромагнитный Импульс
     .desc = Большое заклинание, которое позволяет пользователю направлять темную энергию в ЭМИ.
+
+ent-InstantActionConcealPresence = Сокрытие Присутствия
+    .desc = Многофункциональное заклинание, чередующееся между скрытием и обнаружением ближайших рун и структур культа.
+
+ent-InstantActionRecallBloodSpear = Призвать Кровавое Копьё
+    .desc = Призывает кровавое копье в вашу руку.

Resources/Locale/ru-RU/cult/bolt-barrage.ftl

@@ -0,0 +1,2 @@
+bolt-barrage-component-no-empty-hand = Вам нужно иметь свободную руку, чтобы стрелять.
+bolt-barrage-component-not-cultist = Вы не умеете пользоваться магией.

Resources/Locale/ru-RU/cult/cult-item.ftl

@@ -1,3 +1,4 @@
 cult-item-component-pickup-fail = Вы не можете подобрать {$name}
 cult-item-component-attack-fail = Оружие не позволяет вам атаковать
 cult-item-component-equip-fail = Вы не можете это надеть
+cult-item-component-throw-fail = Оружие не позволяет вам его бросить

Resources/Locale/ru-RU/cult/cultist-factory.ftl

@@ -9,3 +9,9 @@ ent-CultMirrorShield = зеркальный щит
     .desc = Щит с зеркалом на лицевой стороне, на котором изображен какой-то религиозный знак.
 ent-CultOuterArmor = бронированная мантия
     .desc = С первого взгляда кажется, что это простая мантия, но на ней имеется элементы брони.
+ent-ShadowShackles = теневые оковы
+    .desc = Оковы, сковывающие запястья с помощью зловещей магии.
+ent-BloodSpear = кровавое копьё
+    .desc = Ужасающее копьё, полностью состоящее из кристаллизованной крови.
+ent-BloodBarrage = залп кровавых снарядов
+    .desc = Кровь за кровь.

Resources/Locale/ru-RU/cult/gui.ftl

@@ -0,0 +1,4 @@
+apocalypse-rune-title = Вы готовы к финальной битве?
+apocalypse-rune-text = Это последний шаг к вызову Нар'Си; это долгий, болезненный ритуал, и экипаж будет предупрежден о вашем присутствии.
+apocalypse-rune-accept-button = Жизнь за Нар'Си!
+apocalypse-rune-deny-button = Нет

Resources/Locale/ru-RU/cult/pylon.ftl

@@ -1,4 +1,4 @@
 pylon-toggle-on = Кристалл воспаряет над пьедесталом, начиная пульсировать
 pylon-toggle-off = Кристалл перестаёт пульсировать, опускаясь на пьедестал
 ent-CultPylon = пилон
-    .desc = Мистический конструкция.
+    .desc = Мистическая конструкция.

Resources/Locale/ru-RU/cult/verb.ftl

@@ -1,9 +1,14 @@
 verb-categories-cult = Культ
 
 verb-spell-create-text = Создать заклинание крови
-verb-spell-create-message = Вы можете создать одно заклинание крови без руны могущества.
-verb-spell-create-too-much = Начертите руну могущества, чтобы создать больше одного заклинания крови.
+verb-spell-create-message = Вы можете создать два заклинания крови без руны могущества.
+verb-spell-create-too-much = Начертите руну могущества, чтобы создать больше двух заклинаний крови.
 
 verb-spell-remove-text = Удалить заклинание крови
 verb-spell-remove-message = Убрать любое из созданных заклинаний крови.
 verb-spell-remove-no-spells = Заклинания крови отсутствуют.
+
+verb-blood-rites-text = Кровавые обряды
+verb-blood-rites-message = Всего высосано крови: { $blood }.
+verb-blood-rites-no-blood = Для обряда необходимо высосать { $required } крови с помощью заклинания Кровавые Обряды. Всего высосано: { $blood }.
+verb-blood-rites-no-hand = Вам нужна свободная рука для обряда.

Resources/Locale/ru-RU/ss14-ru/prototypes/catalog/fills/lockers/service.ftl

@@ -16,3 +16,9 @@ ent-LockerBotanistFilled = { ent-LockerBotanist }
 ent-LockerBotanistLoot = { ent-LockerBotanist }
     .suffix = Лут
     .desc = { ent-LockerBotanist.desc }
+ent-LockerClownFilled = { ent-LockerClown }
+    .suffix = Заполненный
+    .desc = { ent-LockerClown.desc }
+ent-LockerMimeFilled = { ent-LockerMime }
+    .suffix = Заполненный
+    .desc = { ent-LockerMime.desc }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/lockers/lockers.ftl

@@ -73,3 +73,9 @@ ent-LockerSyndicatePersonal = оружейный шкаф
 ent-LockerInspector = шкаф инспектора
     .desc = Содержит уникальный гардероб по последнему слову моды.
     .suffix = { "" }
+ent-LockerMime = шкаф клоуна
+    .desc = Содержит рабочую экипировку станционного клоуна. Для хранения смешного
+    .suffix = { "" }
+ent-LockerClown = шкаф мима
+    .desc = Содержит рабочую экипировку станционного мима.
+    .suffix = { "" }

Resources/Locale/ru-RU/ss14-ru/prototypes/entities/structures/storage/closets/wardrobe.ftl

@@ -34,8 +34,8 @@ ent-WardrobeSecurity = гардероб службы безопасности
 ent-WardrobeAtmospherics = гардероб атмосферного снаряжения
     .desc = { ent-WardrobeBase.desc }
     .suffix = { "" }
-ent-ClosetJanitor = шкаф уборщика
-    .desc = Здесь хранится санитарно-технические одежда и оборудование .
+ent-ClosetJanitor = шкаф оборудования уборщика
+    .desc = Здесь хранится санитарно-техническое оборудование.
     .suffix = { "" }
 ent-WardrobeFormal = официально-деловой гардероб
     .desc = Хранилище одежды строгого стиля.

Resources/Locale/ru-RU/white/gamemodes/cult.ftl

@@ -1,7 +0,0 @@
-cult-cond-cultwin = Экипаж пососал
-cult-cond-cultfailure = Экипаж не пососал
-cultists-list-start = Культистами были:
-cultists-list-name = - [color=White]{ $name }[/color] ([color=gray]{ $user }[/color])
-soul-shard-name = Душа { $soul }
-soul-shard-description = В этом камне заключена душа { $soul }
-cult-too-much-empowers = Слишком много способностей

Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml

@@ -138,6 +138,6 @@
     sprite: Structures/Storage/canister.rsi
     state: darkblue
   product: PluoxiumCanister
-  cost: 3500
+  cost: 12000
   category: Atmospherics
   group: market

Resources/Prototypes/Catalog/Cargo/cargo_vending.yml

@@ -33,7 +33,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 10500
+  cost: 14000
   category: Service
   group: market
 

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

@@ -14,6 +14,11 @@
       - id: ClothingHandsGlovesCaptain
       - id: ClothingNeckMantleCap
       - id: ClothingEyesGlassesSunglasses
+      - id: ClothingOuterArmorCaptainCarapace
+      - id: ClothingHeadsetAltCommand
+      - id: ClothingMaskGasCaptain
+      - id: ClothingUniformJumpskirtCaptain
+      - id: ClothingOuterWinterCap
 
 - type: entity
   id: DresserChiefEngineerFilled
@@ -27,6 +32,11 @@
       - id: ClothingUniformJumpskirtChiefEngineerTurtle
       - id: ClothingNeckCloakCe
       - id: ClothingHeadHatBeretEngineering
+      - id: ClothingEyesGlassesMeson
+      - id: ClothingHeadsetAltEngineering
+      - id: ClothingHeadHatHardhatWhite
+      - id: ClothingHandsGlovesColorYellow
+      - id: ClothingShoesBootsMagAdv
 
 - type: entity
   id: DresserChiefMedicalOfficerFilled
@@ -35,10 +45,18 @@
   components:
   - type: StorageFill
     contents:
+      - id: ClothingUniformJumpsuitCMO
+      - id: ClothingUniformJumpskirtCMO
+      - id: ClothingOuterWinterCMO
+      - id: ClothingOuterCoatLabCmo
       - id: ClothingNeckMantleCMO
       - id: ClothingCloakCmo
-      - id: ClothingOuterCoatLabCmo
       - id: ClothingHeadHatBeretCmo
+      - id: ClothingHandsGlovesNitrile
+      - id: ClothingEyesHudMedical
+      - id: ClothingHeadsetAltMedical
+      - id: ClothingMaskSterile
+      - id: ClothingEyesEyepatchHudMedical
 
 - type: entity
   id: DresserHeadOfPersonnelFilled
@@ -52,6 +70,10 @@
       - id: ClothingHeadHatHopcap
       - id: ClothingOuterWinterHoP
       - id: ClothingHandsGlovesHop
+      - id: ClothingNeckGoldmedal
+      - id: ClothingShoesLeather
+      - id: ClothingUniformJumpsuitHoP
+      - id: ClothingUniformJumpskirtHoP
 
 - type: entity
   id: DresserHeadOfSecurityFilled
@@ -70,6 +92,10 @@
       - id: ClothingUniformJumpsuitHosFormal
       - id: ClothingMaskNeckGaiter
       - id: ClothingHandsGlovesCombat
+      - id: ClothingShoesBootsJack
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingMaskGasSwat
 
 - type: entity
   id: DresserQuarterMasterFilled
@@ -86,6 +112,11 @@
       - id: ClothingUniformJumpskirtQMTurtleneck
       - id: ClothingHandsGlovesColorBrown
       - id: ClothingNeckMantleQM
+      - id: ClothingHeadsetAltCargo
+      - id: ClothingOuterWinterQM
+      - id: ClothingUniformJumpsuitQM
+      - id: ClothingUniformJumpskirtQM
+      - id: ClothingHeadHatQMsoft
 
 - type: entity
   id: DresserResearchDirectorFilled
@@ -99,6 +130,10 @@
       - id: ClothingHeadHatBeretRND
       - id: ClothingHandsGlovesColorPurple
       - id: ClothingHeadsetAltScience
+      - id: ClothingUniformJumpskirtResearchDirector
+      - id: ClothingUniformJumpsuitResearchDirector
+      - id: ClothingOuterWinterRD
+      - id: ClothingOuterCoatRD
 
 - type: entity
   id: DresserWardenFilled
@@ -109,3 +144,11 @@
     contents:
       - id: ClothingHeadHatWarden
       - id: ClothingHeadHatBeretWarden
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHandsGlovesCombat
+      - id: ClothingShoesBootsJack
+      - id: ClothingOuterCoatWarden
+      - id: ClothingOuterWinterWarden
+      - id: ClothingUniformJumpsuitWarden
+      - id: ClothingUniformJumpskirtWarden

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

@@ -92,6 +92,8 @@
       - id: DoorRemoteFirefight
       - id: ClothingBeltUtilityEngineering
       - id: ClothingEyesGlassesMeson
+      - id: ClothingShoesBootsMag
+      - id: ClothingHandsGlovesColorYellow
 
 - type: entity
   id: LockerAtmosphericsFilled
@@ -109,6 +111,8 @@
       - id: DoorRemoteFirefight
       - id: ClothingBeltUtilityEngineering
       - id: ClothingEyesGlassesMeson
+      - id: ClothingShoesBootsMag
+      - id: ClothingHandsGlovesColorYellow
 
 - type: entity
   id: LockerEngineerFilledHardsuit

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

@@ -11,12 +11,10 @@
       - id: CargoShuttleConsoleCircuitboard
       - id: SalvageShuttleConsoleCircuitboard
       - id: CargoBountyComputerCircuitboard
-      - id: CigPackGreen
-        prob: 0.50
       - id: DoorRemoteCargo
       - id: RubberStampQm
-      - id: ClothingHeadsetAltCargo
       - id: BoxEncryptionKeyCargo
+      - id: BoxFolderClipboard
 
 - type: entity
   id: LockerCaptainFilledHardsuit
@@ -25,19 +23,13 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorCaptainCarapace
+      - id: WeaponEgun
       - id: NukeDisk
       - id: PinpointerNuclear
       - id: CaptainIDCard
-      - id: ClothingOuterHardsuitCap
-      - id: ClothingMaskGasCaptain
-      - id: WeaponEgun
       - id: CommsComputerCircuitboard
-      - id: ClothingHeadsetAltCommand
       - id: PlushieNuke
         prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
       - id: ClothingBeltSheathFilled
       - id: DoorRemoteCommand
       - id: RubberStampCaptain
@@ -46,6 +38,9 @@
       - id: MedalCase
       - id: CommandBudgetCard
       - id: CommandBudgetPinPaper
+      - id: MedalCase
+      - id: ClothingOuterHardsuitCap
+      - id: OxygenTankFilled
 
 - type: entity
   id: LockerCaptainFilled
@@ -54,25 +49,22 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorCaptainCarapace
-      - id: NukeDisk
-      - id: PinpointerNuclear
-      - id: CaptainIDCard
-      - id: WeaponDisabler
-      - id: CommsComputerCircuitboard
-      - id: ClothingHeadsetAltCommand
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
-      - id: ClothingBeltSheathFilled
-      - id: DoorRemoteCommand
-      - id: RubberStampCaptain
-      - id: WeaponAntiqueLaser
-      - id: JetpackCaptainFilled
-      - id: MedalCase
-      - id: CommandBudgetCard
-      - id: CommandBudgetPinPaper
+    - id: WeaponEgun
+    - id: NukeDisk
+    - id: PinpointerNuclear
+    - id: CaptainIDCard
+    - id: CommsComputerCircuitboard
+    - id: PlushieNuke
+      prob: 0.1
+    - id: ClothingBeltSheathFilled
+    - id: DoorRemoteCommand
+    - id: RubberStampCaptain
+    - id: WeaponAntiqueLaser
+    - id: JetpackCaptainFilled
+    - id: MedalCase
+    - id: CommandBudgetCard
+    - id: CommandBudgetPinPaper
+    - id: MedalCase
 
 - type: entity
   id: LockerCaptainFilledNoLaser
@@ -81,23 +73,22 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterArmorCaptainCarapace
-      - id: NukeDisk
-      - id: PinpointerNuclear
-      - id: CaptainIDCard
-      - id: WeaponDisabler
-      - id: CommsComputerCircuitboard
-      - id: ClothingHeadsetAltCommand
-      - id: SpaceCash1000
-      - id: PlushieNuke
-        prob: 0.1
-      - id: CigarGoldCase
-        prob: 0.25
-      - id: ClothingBeltSheathFilled
-      - id: DoorRemoteCommand
-      - id: RubberStampCaptain
-      - id: JetpackCaptainFilled
-      - id: MedalCase
+    - id: WeaponEgun
+    - id: NukeDisk
+    - id: PinpointerNuclear
+    - id: CaptainIDCard
+    - id: WeaponDisabler
+    - id: CommsComputerCircuitboard
+    - id: PlushieNuke
+      prob: 0.1
+    - id: ClothingBeltSheathFilled
+    - id: DoorRemoteCommand
+    - id: RubberStampCaptain
+    - id: JetpackCaptainFilled
+    - id: MedalCase
+    - id: CommandBudgetCard
+    - id: CommandBudgetPinPaper
+    - id: MedalCase
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
@@ -113,18 +104,35 @@
       - id: BoxHeadset
       - id: IDComputerCircuitboard
       - id: WeaponEgun
-      - id: CigarGoldCase
-        prob: 0.25
-        # Fuck the HoP they don't deserve fucking cigars.
-        # Yes they do fuck you.
       - id: DoorRemoteService
       - id: ClothingNeckGoldmedal
       - id: RubberStampHop
       - id: BoxEncryptionKeyPassenger
       - id: BoxEncryptionKeyService
-      - id: ClothingBackpackIan
-        prob: 0.5
-      - id: AccessConfigurator
+      - id: BoxFolderClipboard
+
+- type: entity
+  id: LockerHeadOfPersonnelFilledHardsuit
+  suffix: Filled, Hardsuit
+  parent: LockerHeadOfPersonnel
+  components:
+  - type: StorageFill
+    contents:
+    - id: HoPIDCard
+    - id: ClothingHeadsetCommand
+    - id: BoxPDA
+    - id: BoxID
+    - id: BoxHeadset
+    - id: IDComputerCircuitboard
+    - id: WeaponEgun
+    - id: DoorRemoteService
+    - id: ClothingNeckGoldmedal
+    - id: RubberStampHop
+    - id: BoxEncryptionKeyPassenger
+    - id: BoxEncryptionKeyService
+    - id: BoxFolderClipboard
+    - id: ClothingOuterHardsuitHOP
+    - id: OxygenTankFilled
 
 - type: entity
   id: LockerChiefEngineerFilledHardsuit
@@ -133,24 +141,18 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingOuterHardsuitEngineeringWhite
-      - id: ClothingMaskBreath
-      - id: OxygenTankFilled
-      - id: NitrogenTankFilled
-      - id: ClothingEyesGlassesMeson
       - id: ClothingBeltChiefEngineerFilled
-      - id: ClothingShoesBootsMagAdv
-      - id: ClothingHandsGlovesColorYellow
-      - id: CigarCase
-        prob: 0.15
       - id: DoorRemoteEngineering
       - id: RubberStampCE
-      - id: JetpackVoidFilled
-      - id: ClothingHeadsetAltEngineering
       - id: BoxEncryptionKeyEngineering
       - id: AccessConfigurator
       - id: RCD
       - id: RCDAmmo
+        amount: 2
+      - id: HolofanProjector
+      - id: ClothingOuterHardsuitEngineeringWhite
+      - id: ClothingMaskBreath
+      - id: OxygenTankFilled
 
 - type: entity
   id: LockerChiefEngineerFilled
@@ -159,19 +161,15 @@
   components:
   - type: StorageFill
     contents:
-      - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltChiefEngineerFilled
-      - id: ClothingHandsGlovesColorYellow
-      - id: CigarCase
-        prob: 0.15
-      - id: DoorRemoteEngineering
-      - id: RubberStampCE
-      - id: ClothingHeadsetAltEngineering
-      - id: BoxEncryptionKeyEngineering
-      - id: AccessConfigurator
-      - id: RCD
-      - id: RCDAmmo
-      - id: ClothingHeadHatHardhatWhite
+    - id: ClothingBeltChiefEngineerFilled
+    - id: DoorRemoteEngineering
+    - id: RubberStampCE
+    - id: BoxEncryptionKeyEngineering
+    - id: AccessConfigurator
+    - id: RCD
+    - id: RCDAmmo
+      amount: 2
+    - id: HolofanProjector
 
 - type: entity
   id: LockerChiefMedicalOfficerFilledHardsuit
@@ -181,15 +179,6 @@
   - type: StorageFill
     contents:
       - id: MedkitFilled
-      - id: ClothingHandsGlovesNitrile
-      - id: ClothingEyesHudMedical
-      - id: ClothingHeadsetAltMedical
-      - id: ClothingCloakCmo
-      - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingOuterCoatLabCmo
-      - id: ClothingMaskSterile
-      - id: ClothingHeadHatBeretCmo
-      - id: ClothingOuterHardsuitMedical
       - id: Hypospray
       - id: HandheldCrewMonitor
       - id: DoorRemoteMedical
@@ -197,7 +186,10 @@
       - id: MedicalTechFabCircuitboard
       - id: BoxEncryptionKeyMedical
       - id: Eftpos
-      - id: ClothingBeltMedical
+      - id: ClothingBeltMedicalFilled
+      - id: MedkitFilled
+      - id: ClothingOuterHardsuitMedical
+      - id: OxygenTankFilled
 
 - type: entity
   id: LockerChiefMedicalOfficerFilled
@@ -207,11 +199,6 @@
   - type: StorageFill
     contents:
       - id: MedkitFilled
-      - id: ClothingHandsGlovesNitrile
-      - id: ClothingEyesHudMedical
-      - id: ClothingHeadsetAltMedical
-      - id: ClothingBackpackDuffelSurgeryFilled
-      - id: ClothingMaskSterile
       - id: Hypospray
       - id: HandheldCrewMonitor
       - id: DoorRemoteMedical
@@ -219,7 +206,7 @@
       - id: MedicalTechFabCircuitboard
       - id: BoxEncryptionKeyMedical
       - id: Eftpos
-      - id: ClothingBeltMedical
+      - id: ClothingBeltMedicalFilled
 
 - type: entity
   id: LockerResearchDirectorFilledHardsuit
@@ -261,28 +248,24 @@
 - type: entity
   id: LockerHeadOfSecurityFilledHardsuit
   suffix: Filled, Hardsuit
-  parent: LockerHeadOfSecurity
+  parent: LockerHeadOfSecurityFilled
   components:
   - type: StorageFill
     contents:
-      - id: WeaponDisabler
-      - id: ClothingOuterCoatHoSTrench
-      - id: ClothingOuterHardsuitSecurityRed
-      - id: ClothingMaskGasSwat
-      - id: ClothingBeltSecurityFilled
-      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+      - id: WeaponEgun
+      - id: ClothingBeltAssaultFilled
       - id: DoorRemoteSecurity
       - id: RubberStampHos
       - id: SecurityTechFabCircuitboard
-      - id: JetpackSecurityFilled
       - id: BoxEncryptionKeySecurity
       - id: HoloprojectorSecurity
       - id: BookSecretDocuments
       - id: WeaponPistolMk58Nonlethal
+      - id: MagazinePistol
+      - id: BoxMindshield
+      - id: ClothingOuterHardsuitSecurityRed
+      - id: JetpackSecurityFilled
+      - id: OxygenTankFilled
 
 - type: entity
   id: LockerHeadOfSecurityFilled
@@ -292,16 +275,7 @@
   - type: StorageFill
     contents:
       - id: WeaponEgun
-      - id: ClothingHeadHatBeretHoS
-      - id: ClothingHeadHatHoshat
-      - id: ClothingNeckCloakHos
-      - id: ClothingOuterCoatHoSTrench
-      - id: ClothingBeltSecurityFilled
-      - id: ClothingHeadsetAltSecurity
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingShoesBootsJack
-      - id: CigarGoldCase
-        prob: 0.50
+      - id: ClothingBeltAssaultFilled
       - id: DoorRemoteSecurity
       - id: RubberStampHos
       - id: SecurityTechFabCircuitboard
@@ -310,6 +284,7 @@
       - id: BookSecretDocuments
       - id: WeaponPistolMk58Nonlethal
       - id: MagazinePistol
+      - id: BoxMindshield
 
 - type: entity
   id: LockerFreezerVaultFilled

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

@@ -15,6 +15,9 @@
       - id: Bloodpack
         amount: 2
       - id: Gauze
+      - id: MedkitFilled
+      - id: BoxPillCanister
+      - id: BoxBottle
 
 - type: entity
   id: LockerWallMedicalFilled
@@ -34,6 +37,7 @@
       - id: Bloodpack
         amount: 2
       - id: Gauze
+      - id: MedkitFilled
 
 
 - type: entity
@@ -44,7 +48,6 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        prob: 0.6
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical
       - id: ClothingEyesHudMedical
@@ -58,6 +61,8 @@
       - id: ClothingHeadHatSurgcapBlue
         prob: 0.90
         orGroup: Surgcaps
+      - id: ClothingUniformJumpsuitMedicalDoctor
+      - id: ClothingUniformJumpskirtMedicalDoctor
       - id: UniformScrubsColorBlue
         prob: 0.5
         orGroup: Surgshrubs
@@ -78,7 +83,6 @@
   - type: StorageFill
     contents:
       - id: HandheldHealthAnalyzer
-        prob: 0.6
       - id: ClothingHandsGlovesLatex
       - id: ClothingHeadsetMedical
       - id: ClothingEyesHudMedical
@@ -92,6 +96,8 @@
       - id: ClothingHeadHatSurgcapBlue
         prob: 0.90
         orGroup: Surgcaps
+      - id: ClothingUniformJumpsuitMedicalDoctor
+      - id: ClothingUniformJumpskirtMedicalDoctor
       - id: UniformScrubsColorBlue
         prob: 0.5
         orGroup: Surgshrubs
@@ -149,5 +155,6 @@
       - id: ClothingMaskSterile
       - id: HandheldGPSBasic
       - id: MedkitFilled
-        prob: 0.3
       - id: Eftpos
+      - id: ClothingBeltMedicalEMTFilled
+      - id: HandheldCrewMonitor

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

@@ -63,7 +63,7 @@
         orGroup: EmergencyNitrogenOrRegularNitrogen
       - id: EmergencyNitrogenTankFilled
         prob: 0.20
-        orGroup: EmergencyNitrogenOrRegularNitrogen  
+        orGroup: EmergencyNitrogenOrRegularNitrogen
       - id: ToolboxEmergencyFilled
         prob: 0.4
       - id: MedkitOxygenFilled
@@ -191,8 +191,37 @@
           prob: 0.005
           orGroup: syndiemaintloot
         - id: WeaponSniperMosin
-          prob: 0.0010
+          prob: 0.001
           orGroup: syndiemaintloot
+        # Angry animals
+        - id: null
+          prob: 0.95
+          orGroup: angryanimalsmaintloot
+        - id: MobCarp
+          prob: 0.05
+          orGroup: angryanimalsmaintloot
+        - id: MobGiantSpiderAngry
+          prob: 0.05
+          orGroup: angryanimalsmaintloot
+        - id: MobAngryBee
+          prob: 0.05
+          orGroup: angryanimalsmaintloot
+        - id: MobMonkeyAngry
+          prob: 0.05
+          orGroup: angryanimalsmaintloot
+        # Animals
+        - id: null
+          prob: 0.7
+          orGroup: animalsmaintloot
+        - id: MobMouse
+          prob: 0.1
+          orGroup: animalsmaintloot
+        - id: MobMouse1
+          prob: 0.1
+          orGroup: animalsmaintloot
+        - id: MobMouse2
+          prob: 0.1
+          orGroup: animalsmaintloot
 
 - type: entity
   id: ClosetWallMaintenanceFilledRandom
@@ -284,3 +313,32 @@
         - id: WeaponSniperMosin
           prob: 0.0010
           orGroup: syndiemaintloot
+        # Angry animals
+        - id: null
+          prob: 0.95
+          orGroup: angryanimalsmaintloot
+        - id: MobCarp
+          prob: 0.005
+          orGroup: angryanimalsmaintloot
+        - id: MobGiantSpiderAngry
+          prob: 0.005
+          orGroup: angryanimalsmaintloot
+        - id: MobAngryBee
+          prob: 0.005
+          orGroup: angryanimalsmaintloot
+        - id: MobMonkeyAngry
+          prob: 0.005
+          orGroup: angryanimalsmaintloot
+        # Animals
+        - id: null
+          prob: 0.7
+          orGroup: animalsmaintloot
+        - id: MobMouse
+          prob: 0.1
+          orGroup: animalsmaintloot
+        - id: MobMouse1
+          prob: 0.1
+          orGroup: animalsmaintloot
+        - id: MobMouse2
+          prob: 0.1
+          orGroup: animalsmaintloot

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

@@ -7,23 +7,17 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-        prob: 0.3
       - id: ClothingBeltSecurityFilled
       - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetAltSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingHeadHatWarden
-      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
-      - id: ClothingOuterHardsuitWarden
       - id: HoloprojectorSecurity
       - id: BoxBodyCamera
       - id: WeaponPistolMk58Nonlethal
       - id: MagazinePistol
+      - id: BoxMindshield
+      - id: ClothingOuterHardsuitWarden
+      - id: OxygenTankFilled
 
 - type: entity
   id: LockerWardenFilled
@@ -34,22 +28,15 @@
     contents:
       - id: FlashlightSeclite
       - id: WeaponDisabler
-      - id: ClothingHeadHatWarden
-      - id: ClothingHeadHatBeretWarden
       - id: ClothingBeltSecurityFilled
       - id: Flash
-      - id: ClothingEyesGlassesSecurity
-      - id: ClothingHeadsetAltSecurity
-      - id: ClothingHandsGlovesCombat
-      - id: ClothingShoesBootsJack
-      - id: ClothingOuterCoatWarden
-      - id: ClothingOuterWinterWarden
       - id: RubberStampWarden
       - id: DoorRemoteArmory
       - id: HoloprojectorSecurity
       - id: BoxBodyCamera
       - id: WeaponPistolMk58Nonlethal
       - id: MagazinePistol
+      - id: BoxMindshield
 
 - type: entity
   id: LockerSecurityFilled
@@ -77,7 +64,7 @@
         prob: 0.6
       - id: WeaponTempGun
       - id: WeaponPistolMk58Nonlethal
-      - id: BoxBodyCamera
+      - id: SurveillanceBodyCamera
       - id: MagazinePistol
 
 - type: entity

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -209,6 +209,21 @@
     sprite: Clothing/Belt/belt_overlay.rsi
   - type: Appearance
 
+- type: entity
+  parent: ClothingBeltAssault # WD edit
+  id: ClothingBeltAssaultFilled
+  suffix: Filled
+  name: assault belt
+  description: A tactical assault belt.
+  components:
+  - type: StorageFill
+    contents:
+    - id: GrenadeFlashBang
+    - id: TearGasGrenade
+    - id: Stunbaton
+    - id: Handcuffs
+    - id: Handcuffs
+
 - type: entity
   parent: ClothingBeltStorageBase
   id: ClothingBeltJanitor

Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml

@@ -250,10 +250,10 @@
     - WhitelistChameleon
 
 - type: entity
-  parent: ClothingOuterBaseLarge
+  parent: ClothingOuterBaseMedium
   id: ClothingOuterArmorCaptainCarapace
-  name: "captain's carapace"
-  description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest."
+  name: captain's carapace
+  description: An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest.
   components:
   - type: Sprite
     sprite: Clothing/OuterClothing/Armor/captain_carapace.rsi
@@ -262,14 +262,11 @@
   - type: Armor
     modifiers:
       coefficients:
-        Blunt: 0.5
-        Slash: 0.5
+        Blunt: 0.6
+        Slash: 0.6
         Piercing: 0.6
-        Heat: 0.5
+        Heat: 0.6
         Caustic: 0.9
-  - type: ClothingSpeedModifier
-    walkModifier: 1.0
-    sprintModifier: 1.0
   - type: HeldSpeedModifier
   - type: ExplosionResistance
     damageCoefficient: 0.65

Resources/Prototypes/Entities/Debugging/debug_sweps.yml

@@ -40,6 +40,7 @@
         whitelist:
           tags:
             - CartridgePistol
+  - type: GiftIgnore
 
 - type: entity
   id: MagazinePistolDebug
@@ -55,6 +56,7 @@
     capacity: 1000
   - type: Sprite
     sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi
+  - type: GiftIgnore
 
 - type: entity
   id: BulletDebug
@@ -103,6 +105,7 @@
   - type: Item
     size: Tiny
     sprite: Objects/Weapons/Melee/debug.rsi
+  - type: GiftIgnore
 
 - type: entity
   name: bang stick 100dmg
@@ -116,6 +119,7 @@
     damage:
       types:
         Blunt: 100
+  - type: GiftIgnore
 
 - type: entity
   name: bang stick 200dmg
@@ -129,3 +133,4 @@
     damage:
       types:
         Blunt: 200
+  - type: GiftIgnore

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

@@ -2188,6 +2188,21 @@
       description: ghost-role-information-giant-spider-description
     - type: GhostTakeoverAvailable
 
+- type: entity
+  name: angry monkey
+  parent: MobMonkey
+  id: MobMonkeyAngry
+  suffix: Angry
+  components:
+  - type: NpcFactionMember
+    factions:
+    - SimpleHostile
+  - type: InputMover
+  - type: MobMover
+  - type: HTN
+    rootTask:
+      task: SimpleHostileCompound
+
 - type: entity
   name: clown spider
   parent: MobGiantSpiderAngry
@@ -3205,4 +3220,4 @@
   components:
   - type: ReplacementAccent
     accent: nymph
-    
+

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

@@ -87,6 +87,7 @@
   - type: IgnoreUIRange
   - type: ShowRevIcons
   - type: ShowZombieIcons
+  - type: ShowCultHud
   - type: Inventory
     templateId: aghost
   - type: InventorySlots

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -217,6 +217,8 @@
         type: SpellSelectorBUI
       - key: enum.CultEmpowerRemoveUiKey.Key
         type: SpellRemoverBUI
+      - key: enum.BloodRitesUi.Key
+        type: CultistFactoryBUI
       # WD-EDIT END
   - type: Puller
   - type: Butcherable

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

@@ -40,6 +40,7 @@
           map: [ "implantFull" ]
           visible: false
     - type: Item
+      storedRotation: -90
       sprite: Objects/Specific/Medical/implanter.rsi
       heldPrefix: 0
       size: Small

Resources/Prototypes/Entities/Objects/Specific/Security/body-camera.yml

@@ -5,7 +5,7 @@
   description: MP3 player sized pocket camera for security officers.
   components:
     - type: SurveillanceBodyCamera
-    - type: Sprite # Sprites section
+    - type: Sprite
       sprite: Objects/Specific/Security/body-camera.rsi
       layers:
         - state: unpowered
@@ -66,6 +66,7 @@
       slots:
         cell_slot:
           name: power-cell-slot-component-slot-name-default
+          startingItem: PowerCellMedium
     - type: UserInterface
       interfaces:
         - key: enum.SurveillanceCameraSetupUiKey.Camera

Resources/Prototypes/Entities/Objects/Specific/syndicate.yml

@@ -85,7 +85,6 @@
     preset: StorePresetUplink
     balance:
       Telecrystal: 20
-  - type: GiftIgnore
 
 - type: entity
   parent: BaseUplinkRadio
@@ -96,7 +95,6 @@
     preset: StorePresetUplink
     balance:
       Telecrystal: 25
-  - type: GiftIgnore
 
 #this uplink MUST be used for nukeops, as it has the tag for filtering the listing.
 - type: entity
@@ -111,7 +109,6 @@
   - type: Tag
     tags:
     - NukeOpsUplink
-  - type: GiftIgnore
 
 - type: entity
   parent: BaseUplinkRadio

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -340,6 +340,7 @@
           unshaded:
             True: { visible: true }
             False: { visible: false }
+    - type: GiftIgnore
 
 - type: entity
   name: force gun
@@ -382,6 +383,7 @@
           unshaded:
             True: { visible: true }
             False: { visible: false }
+    - type: GiftIgnore
 
 - type: entity
   name: meteor launcher
@@ -395,6 +397,7 @@
       tags:
         - CartridgeRocket
     proto: MeteorLarge
+  - type: GiftIgnore
 
 - type: entity
   name: immovable rod launcher
@@ -408,3 +411,4 @@
       tags:
         - CartridgeRocket
     proto: ImmovableRodSlow
+  - type: GiftIgnore

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml

@@ -1379,3 +1379,19 @@
       shader: unshaded
   - type: ChangeTemperatureOnCollide
     temperature: -20
+
+- type: entity
+  name: blood bolt
+  id: BloodBolt
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: White/Cult/Entities/arcane_barrage.rsi
+    state: bullet
+  - type: Ammo
+    muzzleFlash: null
+  - type: Projectile
+    damage:
+      types:
+        Piercing: 20

Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml

@@ -20,8 +20,10 @@
     size: Normal
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_dagger.rsi
+    quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: DisarmMalus
   - type: RuneDrawerProvider
     runePrototypes: [ OfferingRune,
@@ -33,6 +35,10 @@
                       SummoningRune,
                       BloodBoilRune,
                       ApocalypseRune ]
+  - type: ActivatableUI
+    key: enum.ListViewSelectorUiKey.Key
+    inHandsOnly: true
+    closeOnHandDeselect: true
   - type: UserInterface
     interfaces:
       - key: enum.ListViewSelectorUiKey.Key
@@ -64,8 +70,10 @@
     size: Huge
   - type: Clothing
     sprite: Objects/Weapons/Melee/cult_blade.rsi
+    quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: DisarmMalus
   - type: CultItem
 

Resources/Prototypes/Entities/Structures/Furniture/dresser.yml

@@ -15,7 +15,6 @@
     - trigger:
         !type:DamageTrigger
         damage: 50
-
       behaviors:
       - !type:SpawnEntitiesBehavior
         spawn:
@@ -26,8 +25,8 @@
         acts: [ "Destruction" ]
   - type: Storage
     grid:
-    - 0,0,6,3
-    maxItemSize: Normal
+    - 0,0,8,5
+    maxItemSize: Huge
   - type: ContainerContainer
     containers:
       storagebase: !type:Container

Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml

@@ -422,6 +422,47 @@
     stateDoorOpen: clown_open
     stateDoorClosed: clown_door
 
+- type: entity
+  id: LockerClownFilled
+  name: clown locker
+  parent: LockerClown
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: ClothingUniformJumpsuitClown
+      - id: ClothingShoesClown
+      - id: ClothingMaskClown
+      - id: ClownRecorder
+      - id: RubberStampClown
+      - id: ClothingHeadsetService
+      - id: CrayonRainbow
+      - id: ClothingBackpackClown
+        prob: 0.33
+        orGroup: clownbackpack
+      - id: ClothingBackpackSatchelClown
+        prob: 0.33
+        orGroup: clownbackpack
+      - id: ClothingBackpackDuffelClown
+        prob: 0.33
+        orGroup: clownbackpack
+      - id: ClothingShoesClownLarge
+        prob: 0.66
+      - id: ClothingNeckClownmedal
+        prob: 0.33
+      - id: ClothingOuterHardsuitClown
+        prob: 0.2
+      - id: ClothingShoesClownBanana
+        prob: 0.05
+      - id: ClothingUniformJumpsuitClownBanana
+        prob: 0.05
+      - id: ClothingMaskClownBanana
+        prob: 0.05
+      - id: BananiumHorn
+        prob: 0.1
+      - id: GoldenBikeHorn
+        prob: 0.1
+
 # Mime
 - type: entity
   id: LockerMime
@@ -436,6 +477,45 @@
     stateDoorOpen: mime_open
     stateDoorClosed: mime_door
 
+- type: entity
+  id: LockerMimeFilled
+  name: mime locker
+  parent: LockerMime
+  suffix: Filled
+  components:
+  - type: StorageFill
+    contents:
+    - id: ClothingUniformJumpsuitMime
+    - id: ClothingUniformJumpskirtMime
+    - id: ClothingMaskMime
+      prob: 0.25
+      onGroup: mimemask
+    - id: ClothingMaskSadMime
+      prob: 0.25
+      onGroup: mimemask
+    - id: ClothingMaskScaredMime
+      prob: 0.25
+      onGroup: mimemask
+    - id: ClothingMaskSexyMime
+      prob: 0.25
+      onGroup: mimemask
+    - id: ClothingShoesColorWhite
+    - id: ClothingHeadHatBeret
+    - id: ClothingHandsGlovesLatex
+    - id: ClothingHeadsetService
+    - id: RubberStampMime
+    - id: CrayonMime
+    - id: ClothingBackpackSatchelMime
+      prob: 0.5
+      onGroup: mimebackpack
+    - id: ClothingBackpackMime
+      prob: 0.5
+      onGroup: mimebackpack
+    - id: ClothingOuterWinterMime
+      prob: 0.5
+    - id: ClothingOuterHardsuitMime
+      prob: 0.2
+
 # Representative
 - type: entity
   id: LockerRepresentative

Resources/Prototypes/Entities/Structures/Walls/walls.yml

@@ -197,13 +197,13 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 1200
+        damage: 600
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
     - trigger:
         !type:DamageTrigger
-        damage: 600
+        damage: 300
       behaviors:
       - !type:PlaySoundBehavior
         sound:
@@ -220,6 +220,16 @@
   - type: Construction
     graph: CultGirder
     node: wall
+  - type: Appearance
+  - type: Concealable
+    examinableWhileConcealed: true
+    concealedSprite: White/Cult/Structures/Concealed/cult.rsi
+    revealedSprite: Structures/Walls/cult.rsi
+    changeMeta: true
+    concealedName: обычная стена
+    concealedDesc: Удерживает воздух внутри, а ассистентов снаружи.
+    revealedName: стена культа
+    revealedDesc: Удерживает воздух внутри, а ассистентов снаружи.
 
 - type: entity
   parent: BaseWall

Resources/Prototypes/Reagents/narcotics.yml

@@ -32,8 +32,8 @@
         key: Stutter
         component: StutteringAccent
       - !type:GenericStatusEffect
-        key: BlurryVision
-        component: BlurryVision
+        key: NarcoticEffect
+        component: NarcoticEffect
       - !type:Jitter
       - !type:GenericStatusEffect
         key: Stun
@@ -76,8 +76,8 @@
             Asphyxiation: 2
       - !type:Jitter
       - !type:GenericStatusEffect
-        key: BlurryVision
-        component: BlurryVision
+        key: NarcoticEffect
+        component: NarcoticEffect
       - !type:GenericStatusEffect
         key: Stun
         time: 1

Resources/Prototypes/White/Fluff/fluff.yml

@@ -1014,34 +1014,33 @@
 
 # kreses
 - type: entity
-  parent: ClothingBackpack
-  id: KresesClothingBackpackDeath
-  name: рюкзак из исследователя пустоты
-  suffix: fluff
-  description: Кажется когда то это не было рюкзаком. Вы чувствуйте на себя взгляды из пустоты.
+  parent: ClothingBackpackSatchel
+  id: KresesClothingBackpackVoid
+  name: Сумка солдата сингулярности
+  description: В ней может храниться все, что угодно, даже сама сингулярность.
   components:
-    - type: Sprite
-      sprite: Clothing/Back/Backpacks/ertleader.rsi
+  - type: Sprite
+    sprite: White/Fluff/kreses/sachel.rsi
 
 - type: entity
-  parent: ClothingUniformJumpsuitDeathSquad
-  id: KresesClothingJumpsuitDeath
-  name: комбинезон исследователя из пустоты
-  suffix: fluff
-  description: Костюм тех, кто видел что внутри черной дыры. Если слишком долго смотреть в пустоту, то пустота начнёт смотреть в тебя.
+  parent: ClothingShoesBaseButcherable
+  id: KresesClothingShoesVoid
+  name: Ботинки солдата пустоты
+  description: Стандартная обувь исcледователей бездны, все еще покрыты бурлящей кровью.
+  components:
+  - type: Sprite
+    sprite: White/Fluff/kreses/boots.rsi
 
 - type: entity
-  parent: ClothingMaskGas
-  id: KresesClothingMaskGasDeath
-  name: противогаз исследователя пустоты
-  suffix: fluff
-  description: Стандартный противогаз для тех, кто любит полетать в космосе и понаблюдать вблизи за чёрной дырой.
+  parent: ClothingOuterBase
+  id: KresesClothingOuterVoid
+  name: Шинель солдата пустоты
+  description: Прямиком из сингулярности, как долго ты сможешь её носить?
   components:
-    - type: Sprite
-      sprite: Clothing/Mask/squadron.rsi
-    - type: Clothing
-      sprite: Clothing/Mask/squadron.rsi
+  - type: Sprite
+    sprite: White/Fluff/kreses/coat.rsi
 
+#Reider207
 - type: entity
   parent: ClothingOuterStorageBase
   id: ClothingOuterJacketReider207

Resources/Prototypes/White/Fluff/sponsor.yml

@@ -388,18 +388,18 @@
 
 # kreses
 - type: loadout
-  id: KresesGasMaskDeath
-  entity: KresesClothingMaskGasDeath
+  id: KresesBackpackVoid
+  entity: KresesClothingBackpackVoid
   sponsorOnly: true
 
 - type: loadout
-  id: KresesJumpsuitDeath
-  entity: KresesClothingJumpsuitDeath
+  id: KresesShoesVoid
+  entity: KresesClothingShoesVoid
   sponsorOnly: true
 
 - type: loadout
-  id: KresesBackpackDeath
-  entity: KresesClothingBackpackDeath
+  id: KresesCoatVoid
+  entity: KresesClothingOuterVoid
 
 # Reider207
 - type: loadout

Resources/Prototypes/White/Ghosts/custom_ghosts.yml

@@ -409,5 +409,5 @@
   ckey: kreses
   sprite: White/Ghosts/kreses-ghost.rsi
   alpha: 0.9
-  ghostName: Gawr
-  ghostDescription: Из океана...
+  ghostName: Дракон сингулярности
+  ghostDescription: Владыка сингулярности

Resources/Prototypes/White/Mobs/Species/harpy.yml

@@ -45,6 +45,8 @@
         type: SpellSelectorBUI
       - key: enum.CultEmpowerRemoveUiKey.Key
         type: SpellRemoverBUI
+      - key: enum.BloodRitesUi.Key
+        type: CultistFactoryBUI
       # WD-EDIT END
   - type: Sprite
     scale: 0.9, 0.9

Resources/Prototypes/White/Mood/generic_positveEffects.yml

@@ -50,3 +50,10 @@
   desc: "Знаю правду, славим великого!"
   moodChange: enum.MoodChangeLevel.Big
   positiveEffect: true
+
+- type: moodEffect
+  id: Stimulator
+  desc: "Я ЧУВСТВУЮ ЭТО, В МОЕЙ КРОВИ НАХОДИТСЯ ЧТО-ТО НЕОБЫЧНОЕ!!"
+  moodChange: enum.MoodChangeLevel.Medium
+  positiveEffect: true
+  timeout: 2

Resources/Prototypes/_White/Actions/cult_actions.yml

@@ -27,8 +27,6 @@
           - HumanoidAppearance
           - Cultist
       canTargetSelf: true
-      deselectOnMiss: true
-      repeat: false
       icon:
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: teleport
@@ -50,8 +48,6 @@
           - HumanoidAppearance
           - Cultist
       canTargetSelf: true
-      deselectOnMiss: true
-      repeat: false
       icon:
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: armor
@@ -72,8 +68,6 @@
         components:
           - HumanoidAppearance
       canTargetSelf: false
-      deselectOnMiss: true
-      repeat: false
       icon:
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: stun
@@ -94,8 +88,6 @@
         components:
           - HumanoidAppearance
       canTargetSelf: false
-      deselectOnMiss: true
-      repeat: false
       icon:
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: shackles
@@ -131,7 +123,7 @@
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: blood_rites
       event: !type:CultBloodRitesInstantActionEvent
-      charges: 4
+      charges: 5
       temporary: true
       removeOnNoCharges: true
 
@@ -149,3 +141,27 @@
       charges: 1
       temporary: true
       removeOnNoCharges: true
+
+- type: entity
+  id: InstantActionConcealPresence
+  name: Conceal Presence
+  description: A multi-function spell that alternates between hiding and revealing nearby runes and cult structures.
+  noSpawn: true
+  components:
+    - type: InstantAction
+      icon:
+        sprite: /Textures/White/Cult/actions_cult.rsi
+        state: gone
+      event: !type:CultConcealInstantActionEvent
+      charges: 10
+      temporary: true
+      removeOnNoCharges: true
+    - type: ConcealPresenceSpell
+      concealEvent: !type:CultConcealInstantActionEvent
+      revealEvent: !type:CultRevealInstantActionEvent
+      concealIcon:
+        sprite: /Textures/White/Cult/actions_cult.rsi
+        state: gone
+      revealIcon:
+        sprite: /Textures/White/Cult/actions_cult.rsi
+        state: telerune

Resources/Prototypes/_White/Construction/Cult/graphs.yml

@@ -64,6 +64,18 @@
               doAfter: 1
     - node: airlock
       entity: AirlockGlassCult
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+              prototype: CultRunicMetal1
+              amount: 1
+            - !type:DeleteEntity { }
+          conditions:
+            - !type:EntityAnchored
+          steps:
+            - tool: Dagger
+              cultistOnly: true
 
 - type: constructionGraph
   id: CultPylon

Resources/Prototypes/_White/Construction/Cult/structures.yml

@@ -1,4 +1,4 @@
-- type: construction
+- type: construction
   id: CultGirder
   name: руническая балка
   description: Большой конструктивный элемент, изготовленный из металла. На этом есть руна.
@@ -37,7 +37,7 @@
 - type: construction
   id: CultPylon
   name: пилон
-  description: Мистический конструкция.
+  description: Мистическая конструкция.
   graph: CultPylon
   startNode: start
   targetNode: pylon

Resources/Prototypes/_White/Entities/Boxes/mindshiled.yml

@@ -0,0 +1,14 @@
+- type: entity
+  name: mindshield implanters box
+  parent: BoxCardboard
+  id: BoxMindshield
+  description: A box full of implants.
+  components:
+  - type: StorageFill
+    contents:
+    - id: MindShieldImplanter
+      amount: 4
+  - type: Sprite
+    layers:
+    - state: box
+    - state: syringe

Resources/Prototypes/_White/Entities/Cult/Altars/cult_altars.yml

@@ -68,6 +68,7 @@
   - type: Construction
     graph: CultPylon
     node: pylon
+  - type: Concealable
 
 - type: entity
   id: AltarTome
@@ -127,6 +128,7 @@
   - type: Construction
     graph: AltarTome
     node: tome
+  - type: Concealable
 
 - type: entity
   id: CultBloodAltar
@@ -185,6 +187,7 @@
   - type: Construction
     graph: CultBloodAltar
     node: altar
+  - type: Concealable
 
 - type: entity
   id: CultForge
@@ -247,6 +250,7 @@
   - type: Construction
     graph: CultForge
     node: forge
+  - type: Concealable
 
 - type: cultStructure
   id: CultStructureAltarTome

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

@@ -0,0 +1,34 @@
+- type: entity
+  name: blood bolt barrage
+  parent: BaseItem
+  id: BloodBarrage
+  description: Blood for blood.
+  components:
+  - type: Sprite
+    sprite: White/Cult/Entities/arcane_barrage.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: White/Cult/Entities/arcane_barrage.rsi
+  - type: AmmoCounter
+  - type: Gun
+    fireRate: 4
+    selectedMode: SemiAuto
+    availableModes:
+    - SemiAuto
+    soundEmpty: null
+    soundGunshot:
+      path: /Audio/White/Cult/wand_teleport.ogg
+  - type: BasicEntityAmmoProvider
+    proto: BloodBolt
+    capacity: 25
+  - type: BoltBarrage
+  - type: GiftIgnore
+
+- type: cultistFactoryProduction
+  id: FactoryCultBloodBarrage
+  name: Залп Кровавых Снарядов (300 крови)
+  icon: "/Textures/White/Cult/Entities/arcane_barrage.rsi/icon.png"
+  bloodCost: 300
+  item:
+    - BloodBarrage

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

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   name: soul shard
   description: Mysterious glowing shard.
   parent: BaseItem
@@ -25,6 +25,7 @@
             True: { state: "soulstone2" }
             False: { state: "soulstone" }
     - type: Speech
+    - type: IsDeadIC
 
 - type: entity
   parent: SoulShard

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

@@ -49,6 +49,7 @@
     - type: ShowHealthIcons
       damageContainers:
       - Biological
+    - type: ShowSecurityIcons
 
 - type: entity
   name: veil shifter

Resources/Prototypes/_White/Entities/Cult/Runes/cult_runes.yml

@@ -14,6 +14,7 @@
     invokePhrase: "Mah'weyh pleggh at e'ntrath!"
   - type: CultRuneOffering
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -31,6 +32,7 @@
     invokePhrase: "Qu'laris ver'don, thal'sorin mik'thar!"
   - type: CultRuneBuff
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -52,6 +54,8 @@
     - key: enum.CultEmpowerUiKey.Key
       type: SpellSelectorBUI
   - type: CultRune
+  - type: Concealable
+    examinableWhileConcealed: true
 
 - type: entity
   parent: CollideRune
@@ -71,6 +75,7 @@
   - type: CultRuneTeleport
     label: "безымянная метка"
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -89,6 +94,7 @@
     gatherInvokers: true
   - type: CultRuneSummoning
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -106,6 +112,7 @@
     invokePhrase: "Pasnar val'keriam usinar. Savrae ines amutan. Yam'toth remium il'tarat!"
   - type: CultRuneRevive
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -123,6 +130,7 @@
     invokePhrase: "Khari'd! Eske'te tannin!"
   - type: CultRuneBarrier
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: CollideRune
@@ -141,6 +149,7 @@
   - type: CultRuneBloodBoil
     projectilePrototype: ProjectileCult
   - type: CultRune
+  - type: Concealable
 
 - type: entity
   parent: BaseRune
@@ -155,4 +164,5 @@
   - type: Appearance
   - type: CultRuneBase
     invokePhrase: "TOK-LYR RQA-NAP G'OLT-ULOFT!"
+    cultistGatheringRange: 1.5
   - type: CultRuneApocalypse

Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml

@@ -0,0 +1,82 @@
+- type: entity
+  name: blood spear
+  parent: BaseItem
+  id: BloodSpear
+  description: A sickening spear composed entirely of crystallized blood.
+  components:
+  - type: EmbeddableProjectile
+    offset: 0.15,0.15
+  - type: ThrowingAngle
+    angle: 225
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.20,-0.10
+            - -0.10,-0.20
+            - 0.40,0.30
+            - 0.30,0.40
+        density: 20
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: Sharp
+  - type: Sprite
+    sprite: White/Cult/Entities/blood_spear.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Piercing: 36
+    angle: 0
+    animation: WeaponArcThrust
+    soundHit:
+      path: /Audio/Weapons/bladeslice.ogg
+    range: 2
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 40
+  - type: Item
+    sprite: White/Cult/Entities/blood_spear.rsi
+    size: Ginormous
+  - type: Clothing
+    slots:
+    - back
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Piercing: 8
+  - type: UseDelay
+  - type: DisarmMalus
+  - type: CultItem
+  - type: BloodSpear
+    action: InstantActionRecallBloodSpear
+  - type: ChangeThrowForce
+    throwForce: 20
+
+- type: cultistFactoryProduction
+  id: FactoryCultBloodSpear
+  name: Кровавое Копьё (150 крови)
+  icon: "/Textures/White/Cult/Entities/blood_spear.rsi/icon.png"
+  bloodCost: 150
+  item:
+    - BloodSpear
+
+- type: entity
+  id: InstantActionRecallBloodSpear
+  name: Recall Blood Spear
+  description: Recalls blood spear to your hand.
+  noSpawn: true
+  components:
+    - type: InstantAction
+      icon:
+        sprite: /Textures/White/Cult/actions_cult.rsi
+        state: bloodspear
+      event: !type:CultBloodSpearRecallInstantActionEvent
+      useDelay: 1
+      temporary: true

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

@@ -60,6 +60,18 @@
     - type: Pullable
     - type: ContentEye
     - type: Actions
+    - type: Hands
+    - type: ShowCultHud
+    - type: IsDeadIC
+    - type: NightVision
+      toggleSound: null
+      color: White
+    - type: ShowWhiteHealthBars
+      damageContainers:
+      - Biological
+    - type: ShowHealthIcons
+      damageContainers:
+      - Biological
     - type: Tag
       tags:
         - CannotSuicide
@@ -77,17 +89,15 @@
       thresholds:
         0: Alive
         150: Dead
-    - type: MovementSpeedModifier
-      baseWalkSpeed: 2
-      baseSprintSpeed: 2
     - type: Construct
       actions:
       - InstantActionJuggernautCreateWall
     - type: MeleeWeapon
+      canHeavyAttack: false
       hidden: true
       angle: 30
-      animation: WeaponArcFist
-      attackRate: 0.25
+      animation: WeaponArcSmash
+      attackRate: 1
       damage:
         types:
           Structural: 90
@@ -114,13 +124,18 @@
           InstantActionArtificerCreateCultistWall,
           InstantActionArtificerCreateCultistAirlock,
         ]
+    - type: MovementSpeedModifier
+      baseWalkSpeed: 3
+      baseSprintSpeed: 3
+    - type: MovementIgnoreGravity
     - type: Puller
       needsHands: false
     - type: MeleeWeapon
+      canHeavyAttack: false
       hidden: true
       angle: 30
-      animation: WeaponArcFist
-      attackRate: 0.85
+      animation: WeaponArcPunch
+      attackRate: 1
       damage:
         types:
           Blunt: 5
@@ -133,8 +148,8 @@
   description: run...
   components:
     - type: MovementSpeedModifier
-      baseWalkSpeed: 3.0
-      baseSprintSpeed: 3.0
+      baseWalkSpeed: 4.0
+      baseSprintSpeed: 4.0
     - type: MobThresholds
       thresholds:
         0: Alive
@@ -148,14 +163,16 @@
       actions: [InstantActionWraithPhase]
     - type: MovementIgnoreGravity
     - type: MeleeWeapon
+      canHeavyAttack: false
       hidden: true
       angle: 30
-      animation: WeaponArcFist
-      attackRate: 0.5
+      animation: WeaponArcPunch
+      attackRate: 1
       damage:
         types:
           Blunt: 10
           Slash: 10
+          Structural: 40
 
 - type: entity
   id: ReaperConstruct
@@ -165,8 +182,8 @@
   components:
     - type: MovementIgnoreGravity
     - type: MovementSpeedModifier
-      baseWalkSpeed: 3.0
-      baseSprintSpeed: 3.0
+      baseWalkSpeed: 5.0
+      baseSprintSpeed: 5.0
     - type: MobThresholds
       thresholds:
         0: Alive
@@ -176,10 +193,11 @@
     - type: Puller
       needsHands: false
     - type: MeleeWeapon
+      canHeavyAttack: false
       hidden: true
       angle: 30
-      animation: WeaponArcFist
-      attackRate: 0.9
+      animation: WeaponArcPunch
+      attackRate: 1
       damage:
         types:
           Blunt: 20

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

@@ -9,7 +9,7 @@
       Brute:
         collection: GlassSmash
   - type: Sprite
-    sprite: /Textures/White/Cult/Structures/cult_airlock.rsi
+    sprite: White/Cult/Structures/cult_airlock.rsi
     layers:
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
@@ -18,8 +18,8 @@
   - type: Occluder
     enabled: false
   - type: Door
-    occludes: false
     bumpOpen: true
+    occludes: false
     crushDamage:
       types:
         Blunt: 15
@@ -27,8 +27,6 @@
       path: /Audio/Effects/stonedoor_openclose.ogg
     closeSound:
       path: /Audio/Effects/stonedoor_openclose.ogg
-    denySound:
-      path: /Audio/Machines/airlock_deny.ogg
   - type: Airtight
     fixVacuum: true
     noAirWhenFullyAirBlocked: false
@@ -38,7 +36,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 500
+        damage: 200
       behaviors:
       - !type:DoActsBehavior
         acts: ["Destruction"]
@@ -48,6 +46,22 @@
     node: airlock
   - type: PlacementReplacement
     key: walls
+  - type: Appearance
+  - type: Concealable
+    examinableWhileConcealed: true
+    iconSmooth: true
+    interactionOutline: true
+    concealedSprite: White/Cult/Structures/Concealed/cult_airlock.rsi
+    revealedSprite: White/Cult/Structures/cult_airlock.rsi
+    changeMeta: true
+    concealedName: обычная стена
+    concealedDesc: Удерживает воздух внутри, а ассистентов снаружи.
+    revealedName: рунический шлюз
+    revealedDesc: Странный стеклянный шлюз с руной.
+  - type: IconSmooth
+    enabled: false
+    key: walls
+    mode: NoSprite
   placement:
     mode: SnapgridCenter
 
@@ -75,7 +89,7 @@
             - GlassAirlockLayer
     - type: InteractionOutline
     - type: Sprite
-      sprite: /Textures/White/Cult/Structures/cult_girder.rsi
+      sprite: White/Cult/Structures/cult_girder.rsi
       state: cultgirder
     - type: Damageable
       damageContainer: StructuralInorganic
@@ -104,3 +118,13 @@
     - type: Construction
       graph: CultGirder
       node: girder
+    - type: Appearance
+    - type: Concealable
+      examinableWhileConcealed: true
+      concealedSprite: White/Cult/Structures/Concealed/cult_girder.rsi
+      revealedSprite: White/Cult/Structures/cult_girder.rsi
+      changeMeta: true
+      concealedName: каркас
+      concealedDesc: Большой металлический каркас; Необходимо покрыть листами металла, чтобы он считался стеной.
+      revealedName: руническая балка
+      revealedDesc: Большой конструктивный элемент, изготовленный из металла. На этом есть руна.

Resources/Prototypes/_White/Tiles/cult.yml

@@ -1,4 +1,4 @@
-- type: tile
+- type: tile
   id: CultFloor
   name: tiles-cult-floor
   sprite: /Textures/White/Cult/Tiles/cult_tile.rsi/cult.png
@@ -10,3 +10,20 @@
     collection: FootstepFloor
   itemDrop: FloorTileItemSteel
   heatCapacity: 10000
+
+- type: tile
+  id: CultFloorConcealed
+  name: tiles-steel-floor
+  sprite: /Textures/White/Cult/Tiles/concealed.png
+  variants: 3
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  baseTurf: Plating
+  isSubfloor: false
+  deconstructTools: [ Prying ]
+  footstepSounds:
+    collection: FootstepFloor
+  itemDrop: FloorTileItemSteel
+  heatCapacity: 10000

Resources/Prototypes/_White/narsie.yml

@@ -1,7 +1,20 @@
-- type: entity
+- type: entity
   id: Narsie
+  parent: BaseMob
   name: Nar'si
   components:
+  - type: AnnounceOnSpawn
+    message: narsie-has-risen
+    sender: narsie-has-risen-sender
+    sound:
+      path: /Audio/Misc/narsie_rises.ogg
+    color: darkred
+  - type: CargoSellBlacklist
+  - type: ContentEye
+    maxZoom: 2.0,2.0
+  - type: WarpPoint
+    follow: true
+    location: Nar'Sie
   - type: Sprite
     layers:
       - map: [ "enum.NarsieLayer.Default" ]
@@ -15,6 +28,8 @@
   - type: Narsie
   - type: Physics
     bodyType: Dynamic
+    bodyStatus: InAir
+  - type: CanMoveInAir
   - type: Fixtures
     fixtures:
       Penis:

Resources/Prototypes/status_effects.yml

@@ -64,6 +64,10 @@
   id: BlurryVision
   alwaysAllowed: true
 
+- type: statusEffect
+  id: NarcoticEffect
+  alwaysAllowed: true
+
 #WD EDIT
 - type: statusEffect
   id: Incorporeal

Resources/Textures/White/Cult/Entities/arcane_barrage.rsi/meta.json

@@ -0,0 +1,77 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+        "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "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
+        ]
+      ]
+    },
+    {
+      "name": "bullet",
+      "delays": [
+        [
+          0.2,
+          0.2,
+          0.2,
+          0.2
+        ]
+      ]
+    }
+  ]
+}

Resources/Textures/White/Cult/Entities/blood_spear.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from yogstation",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+        "name": "inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "inhand-right",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-left",
+        "directions": 4
+    },
+    {
+        "name": "wielded-inhand-right",
+        "directions": 4
+    }
+  ]
+}

Resources/Textures/White/Cult/Structures/Concealed/cult.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi", "states": [{"name": "cult0", "directions": 4}, {"name": "cult1", "directions": 4}, {"name": "cult2", "directions": 4}, {"name": "cult3", "directions": 4}, {"name": "cult4", "directions": 4}, {"name": "cult5", "directions": 4}, {"name": "cult6", "directions": 4}, {"name": "cult7", "directions": 4}, {"name": "full"}]}

Resources/Textures/White/Cult/Structures/Concealed/cult_airlock.rsi/meta.json

@@ -0,0 +1,60 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by Nimfar11 (GitHub) for Space Station 14",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "assembly"
+        },
+        {
+            "name": "closed",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "closing",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        },
+        {
+            "name": "open",
+            "directions": 1,
+            "delays": [
+                [
+                    1.0
+                ]
+            ]
+        },
+        {
+            "name": "opening",
+            "directions": 1,
+            "delays": [
+                [
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2,
+                    0.2
+                ]
+            ]
+        }
+    ]
+}

Resources/Textures/White/Cult/Structures/Concealed/cult_girder.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/frosty-dev/white",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "cultgirder"
+    }
+  ]
+}

Resources/Textures/White/Fluff/kreses/boots.rsi/meta.json

@@ -0,0 +1,30 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by @ninruB#7795, based off tgstation's jackboots at commit https://github.com/tgstation/tgstation/commit/7e4e9d432d88981fb9bb463970c5b98ce85c0abe, reptilian made by kuro(388673708753027083)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-FEET",
+      "directions": 4
+    },
+    {
+      "name": "equipped-FEET-reptilian",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}