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

2024-07-29 12:58:16 +03:00
parent d73a5c5f2b 5ae99b4e37
commit cb0da4cf65
167 changed files with 2923 additions and 468 deletions
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -6814,3 +6814,159 @@
  id: 422
  time: '2024-07-27T15:48:25.0000000+00:00'
  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/492
+- author: Aviu
+  changes:
+  - message: "\u041F\u0435\u0440\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u043D\u043E\
+      \ \u0437\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0435 \u043E\u0433\u043B\
+      \u0443\u0448\u0435\u043D\u0438\u044F \u0443 \u043A\u0443\u043B\u044C\u0442\u0430\
+      . \u0422\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u043E \u0434\u0430\u0451\
+      \u0442 \u0432 \u0440\u0443\u043A\u0443 \u0430\u0443\u0440\u0443, \u043A\u043E\
+      \u0442\u043E\u0440\u043E\u0439 \u043D\u0430\u0434\u043E \u0443\u0434\u0430\u0440\
+      \u0438\u0442\u044C \u043A\u043E\u0441\u043C\u043E\u043D\u0430\u0432\u0442\u0438\
+      \u043A\u0430, \u0447\u0442\u043E\u0431\u044B \u043E\u0433\u043B\u0443\u0448\u0438\
+      \u0442\u044C. \u0412\u0440\u0435\u043C\u044F \u0441\u0442\u0430\u043D\u0430\
+      : 16 \u0441\u0435\u043A\u0443\u043D\u0434, 1.5 \u0441\u0435\u043A\u0443\u043D\
+      \u0434\u044B \u0441 \u043F\u0435\u043D\u0442\u0430\u0433\u0440\u0430\u043C\u043C\
+      \u043E\u0439 \u043D\u0430\u0434 \u0433\u043E\u043B\u043E\u0432\u043E\u0439.\
+      \ \u0422\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\u043E\u0442\u0430\u0435\
+      \u0442 \u043D\u0430 \u0447\u0438\u043F\u0438\u0440\u043E\u0432\u0430\u043D\u043D\
+      \u044B\u0445."
+    type: Add
+  - message: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u044B \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u043C\u043E\u0433\u0443\u0442 \u043E\u0431\u0449\u0430\
+      \u0442\u044C\u0441\u044F \u0432 \u0447\u0430\u0442\u0435 \u043A\u0443\u043B\u044C\
+      \u0442\u0430."
+    type: Add
+  - message: "\u041A\u0443\u043B\u044C\u0442\u0438\u0441\u0442\u044B \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u0448\u0435\u043F\u0447\u0443\u0442 \u0441\u043C\u0435\u0448\
+      \u043D\u044B\u0435 \u0444\u0440\u0430\u0437\u044B \u043F\u0440\u0438 \u043A\u0430\
+      \u0441\u0442\u0435 \u0437\u0430\u043A\u043B\u0438\u043D\u0430\u043D\u0438\u0439\
+      ."
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u0440\u0438 \u0430\u043A\
+      \u0442\u0438\u0432\u0430\u0446\u0438\u0438 \u0431\u043E\u043B\u044C\u0448\u0438\
+      \u043D\u0441\u0442\u0432\u0430 \u0440\u0443\u043D \u043A\u0443\u043B\u044C\u0442\
+      \u0438\u0441\u0442\u044B \u0448\u0435\u043F\u0447\u0443\u0442, \u0430 \u043D\
+      \u0435 \u0433\u043E\u0432\u043E\u0440\u044F\u0442."
+    type: Tweak
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0432\u0440\u0435\
+      \u043C\u044F \u0441\u0442\u0430\u043D\u0430 \u043A\u0440\u043E\u0432\u0430\u0432\
+      \u043E\u0433\u043E \u043A\u043E\u043F\u044C\u044F \u0434\u043E 4 \u0441\u0435\
+      \u043A\u0443\u043D\u0434, \u0442\u0435\u043F\u0435\u0440\u044C \u043E\u043D\u043E\
+      \ \u043E\u0442\u0441\u043A\u0430\u043A\u0438\u0432\u0430\u0435\u0442 \u043E\u0442\
+      \ \u043A\u0443\u043B\u044C\u0442\u0438\u0441\u0442\u043E\u0432 \u0438 \u043A\
+      \u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0432 \u0438 \u043D\u0435\
+      \ \u0441\u0442\u0430\u043D\u0438\u0442 \u043A\u043E\u0441\u043C\u043E\u043D\u0430\
+      \u0432\u0442\u0438\u043A\u043E\u0432 \u0441\u043E \u0441\u0432\u044F\u0449\u0435\
+      \u043D\u043D\u044B\u043C \u043E\u0440\u0443\u0436\u0438\u0435\u043C \u0432 \u0440\
+      \u0443\u043A\u0430\u0445."
+    type: Tweak
+  - message: "\u041E\u0442\u043A\u0430\u0442 \u0431\u0430\u0444\u0444\u0430 \u043A\
+      \u0440\u043E\u0432\u0430\u0432\u043E\u0433\u043E \u0437\u0430\u043B\u043F\u0430\
+      ."
+    type: Tweak
+  - message: "\u0411\u0430\u0433\u0444\u0438\u043A\u0441\u044B \u043A\u0443\u043B\u044C\
+      \u0442\u0430."
+    type: Fix
+  id: 423
+  time: '2024-07-28T16:54:32.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/507
+- author: Spatison
+  changes:
+  - message: "\u041F\u043E\u0434\u043D\u044F\u0442\u044B\u0439 \u0449\u0438\u0442\
+      \ \u0441\u043D\u043E\u0432\u0430 \u043D\u0435 \u0434\u0430\u0435\u0442 \u043F\
+      \u0440\u043E\u0439\u0442\u0438"
+    type: Fix
+  - message: "\u0411\u043E\u0434\u0438\u043A\u0430\u043C\u0435\u0440\u044B \u0442\u0435\
+      \u043F\u0435\u0440\u044C \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0430\u0435\
+      \u0442\u0441\u044F \u043D\u0430 \u043C\u043E\u043D\u0438\u0442\u043E\u0440\u0438\
+      \u043D\u0433\u0435 \u0431\u0435\u0441\u043F\u0440\u043E\u0432\u043E\u0434\u043D\
+      \u044B\u0445 \u043A\u0430\u043C\u0435\u0440 \u043F\u0440\u0438 \u043D\u0430\u043B\
+      \u0438\u0447\u0438\u0438 \u043D\u0430 \u0441\u0442\u0430\u043D\u0446\u0438\u0438\
+      \ \u0431\u0435\u0441\u043F\u0440\u043E\u0432\u043E\u0434\u043D\u043E\u0433\u043E\
+      \ \u043C\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043E\u0440\
+      \u0430 \u0421\u0411"
+    type: Fix
+  id: 424
+  time: '2024-07-28T18:02:55.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/508
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D \u0420\u041F\u0414\
+      , \u0443\u0441\u0442\u0440\u043E\u0439\u0441\u0442\u0432\u043E, \u043F\u043E\
+      \u0437\u0432\u043E\u043B\u044F\u044E\u0449\u0435\u0435 \u0431\u044B\u0441\u0442\
+      \u0440\u043E \u0441\u0442\u0440\u043E\u0438\u0442\u044C \u0430\u0442\u043C\u043E\
+      \u0441\u0444\u0435\u0440\u043D\u044B\u0435 \u0438 \u043C\u0443\u0441\u043E\u0440\
+      \u043D\u044B\u0435 \u0442\u0440\u0443\u0431\u044B. \u0410 \u0442\u0430\u043A\
+      \ \u0436\u0435 \u0441\u043E\u043F\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0449\
+      \u0438\u0435 \u044D\u0442\u043E\u043C\u0443 \u0443\u0441\u0442\u0440\u043E\u0439\
+      \u0441\u0442\u0432\u0430"
+    type: Add
+  - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0432\u0441\u0435 \u0420\u0426\
+      \u0414 \u0438 \u0420\u041F\u0414 \u043C\u043E\u0436\u043D\u043E \u0437\u0430\
+      \u0440\u044F\u0436\u0430\u0442\u044C \u0440\u0435\u0441\u0443\u0440\u0441\u0430\
+      \u043C\u0438, \u0432\u0440\u043E\u0434\u0435 \u043C\u0435\u0442\u0430\u043B\u043B\
+      \u0430, \u0441\u0442\u0430\u043B\u0438, \u0441\u0442\u0435\u043A\u043B\u0430\
+      \ \u0438 \u0442.\u043F. \u0414\u0430\u0436\u0435 \u043F\u0440\u043E\u0432\u043E\
+      \u0434\u0430\u043C\u0438. \u0420\u0430\u0437\u043D\u044B\u0435 \u0440\u0435\u0441\
+      \u0443\u0440\u0441\u044B \u0434\u0430\u044E\u0442 \u0440\u0430\u0437\u043D\u044B\
+      \u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044B \u0434\u0430\u044E\u0442 \u0440\
+      \u0430\u0437\u043D\u043E\u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\
+      \u0432\u043E \u0437\u0430\u0440\u044F\u0434\u043E\u0432"
+    type: Add
+  - message: "\u0420\u0426\u0414 \u043D\u0430\u0443\u0447\u0438\u043B\u0441\u044F\
+      \ \u0441\u0442\u0440\u043E\u0438\u0442\u044C \u043A\u0430\u043C\u0435\u0440\u044B\
+      \ \u0438 \u0410\u041F\u0426"
+    type: Add
+  - message: "\u0420\u041F\u0414 \u0438 \u0420\u0426\u0414 \u0434\u043E\u0431\u0430\
+      \u0432\u043B\u0435\u043D\u044B \u0432 \u0438\u0441\u0441\u043B\u0435\u0434\u043E\
+      \u0432\u0430\u043D\u0438\u044F \u0420\u043D\u0414 1\u0433\u043E \u0443\u0440\
+      \u043E\u0432\u043D\u044F."
+    type: Add
+  - message: "\u0418\u0433\u0440\u043E\u043A\u0438, \u0438\u0433\u0440\u0430\u0432\
+      \u0448\u0438\u0435 \u043C\u0435\u043D\u044C\u0448\u0435 3 \u0434\u043D\u0435\
+      \u0439 \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u043F\u043E\u043C\
+      \u0435\u0447\u0430\u044E\u0442\u0441\u044F \u0447\u0430\u0441\u0430\u043C\u0438\
+      \ \u0432 \u0430\u0434\u043C\u0438\u043D-\u043C\u0435\u043D\u044E, \u0447\u0442\
+      \u043E\u0431\u044B \u043F\u0435\u0434\u0430\u043B\u0438 \u043C\u043E\u0433\u043B\
+      \u0438 \u043B\u0435\u0433\u0447\u0435 \u043E\u0442\u043B\u0438\u0447\u0430\u0442\
+      \u044C \u043D\u043E\u0432\u044B\u0445 \u0438\u0433\u0440\u043E\u043A\u043E\u0432\
+      ."
+    type: Add
+  - message: "\u0428\u0430\u0442\u0442\u043B \u043F\u0440\u0438\u0431\u044B\u0442\u0438\
+      \u044F \u043F\u0440\u0438\u0431\u044B\u0432\u0430\u044E\u0442 \u043D\u0430 \u0432\
+      \u043E\u043A\u0437\u0430\u043B \u043F\u0440\u0438\u0431\u044B\u0442\u0438\u044F\
+      \ \u0431\u044B\u0441\u0442\u0440\u0435\u0435"
+    type: Tweak
+  - message: "\u041F\u0435\u0434\u0430\u043B\u0438 \u0442\u0435\u043F\u0435\u0440\u044C\
+      \ \u0441\u043F\u0430\u0432\u043D\u044F\u0442\u0441\u044F \u0432 \u0434\u0435\
+      \u0430\u0434\u043C\u0438\u043D\u0435, \u043A\u043E\u0433\u0434\u0430 \u0437\u0430\
+      \u0445\u043E\u0434\u044F\u0442 \u0437\u0430 \u0440\u043E\u043B\u044C \u0432\
+      \ \u0440\u0430\u0443\u043D\u0434\u0435"
+    type: Tweak
+  - message: "\u0426\u0435\u043D\u044B \u0438 \u0432\u0440\u0435\u043C\u044F \u043F\
+      \u043E\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0432 \u0420\u0426\u0414 \u0441\
+      \u0442\u0430\u043B\u0438 \u043C\u0435\u043D\u044C\u0448\u0435."
+    type: Tweak
+  - message: "\u0420\u0430\u0434\u0438\u0430\u043B\u044C\u043D\u043E\u0435 \u043C\u0435\
+      \u043D\u044E \u0420\u0426\u0414 \u0438 \u0420\u041F\u0414 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\
+      \u0441\u043A\u0438 \u0438\u0437\u043C\u0435\u043D\u044F\u0435\u0442 \u0441\u0432\
+      \u043E\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 \u043E\u0442 \u043A\u043E\u043B\
+      \u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0438\u043A\u043E\u043D\u043E\u043A"
+    type: Tweak
+  - message: "\u0423\u0431\u0440\u0430\u043D \u0434\u0435\u0431\u0430\u0444\u0444\
+      \ \u043D\u0430\u0441\u0442\u0440\u043E\u0435\u043D\u0438\u044F \u043E\u0442\
+      \ \u043F\u0435\u0440\u0435\u0435\u0434\u0430\u043D\u0438\u044F \u0438 \u043F\
+      \u0435\u0440\u0435\u043F\u0438\u0442\u0438\u044F \u0432 \u0432\u0438\u0434\u0443\
+      \ \u0435\u0433\u043E \u043D\u0435\u043E\u0447\u0435\u0432\u0438\u0434\u043D\u043E\
+      \u0439 \u043C\u0435\u0445\u0430\u043D\u0438\u043A\u0438 \u043F\u043E\u044F\u0432\
+      \u043B\u0435\u043D\u0438\u044F. \u041F\u0440\u0435\u0434\u0443\u0433\u0430\u0434\
+      \u0430\u0442\u044C, \u043A\u043E\u0433\u0434\u0430 \u043F\u0435\u0440\u0441\u043E\
+      \u043D\u0430\u0436 \u043F\u0435\u0440\u0435\u0435\u0441\u0442 \u0438\u043B\u0438\
+      \ \u043F\u0435\u0440\u0435\u043F\u044C\u0435\u0442 \u043D\u0435\u0432\u043E\u0437\
+      \u043C\u043E\u0436\u043D\u043E."
+    type: Remove
+  id: 425
+  time: '2024-07-29T03:04:21.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/510
--- a/Resources/Locale/ru-RU/_white/cult/abilities.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/abilities.ftl
@@ -34,8 +34,8 @@ ent-InstantActionSummonCultDagger = Призыв Ритуального Кинж
 ent-InstantActionBloodRites = Кровавые Обряды
    .desc = Высасывает кровь и исцеляет вас.

-ent-ActionCultStun = Оглушение
-    .desc = Сильное заклинание, которое оглушает и обезмолвливает жертв. Не работает на цели со священным оружием в руках или с чипом защиты разума.
+ent-InstantActionCultStun = Оглушение
+    .desc = Сильное заклинание, которое оглушает и обезмолвливает жертв. Не работает на цели со священным оружием в руках. При наличии пентаграммы над головой эффект сильно ослабевает.

 ent-ActionCultShadowShackles = Теневые Узы
    .desc = Бесшумное заклинание, которое наложит на человека теневые наручники и заставит вашу жертву замолчать на 10 секунд.
--- a/Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
@@ -1,3 +1,4 @@
 bolt-barrage-component-no-empty-hand = Вам нужно иметь свободную руку, чтобы стрелять.
 bolt-barrage-component-not-cultist = Вы не умеете пользоваться магией.
-bolt-barrage-component-extra-desc = [color=darkgray]Для стрельбы залпом необходимо иметь свободную руку. Вобросите залп, чтобы навсегда избавиться от него.[/color]
+bolt-barrage-component-extra-desc = [color=darkgray]Для стрельбы залпом необходимо иметь свободную руку.[/color]
+bolt-barrage-component-extra-message = [color=darkgray]Выбросите залп, чтобы навсегда избавиться от него.[/color]
--- a/Resources/Locale/ru-RU/_white/cult/cult.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/cult.ftl
@@ -32,7 +32,7 @@ cult-blood-boil-rune-need-minimum = Необходимо минимум 3 кул
 cult-blood-boil-rune-no-blood = Кому-то из культистов не хватает крови.
 cult-blood-boil-rune-no-targets = Нет целей.
 cult-teleport-rune-default-label = безымянная метка
-cult-narsie-summon-drawn-position = Культ закончил рисовать руну ритуала разрыва измерений! Координаты: { $posText }
+cult-narsie-summon-drawn-position = Культ закончил рисовать руну ритуала разрыва измерений! Локация: { $location }
 cult-cant-draw-rune = Нельзя рисовать руну в космосе.

 runes-window-title = Руны
--- a/Resources/Locale/ru-RU/_white/cult/entities.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/entities.ftl
@@ -5,11 +5,11 @@ ent-SoulShardGhost = камень душ
    .desc = Мистический светящийся осколок.
    .suffix = Роль призраков

-ent-WetStone = точильный камень
-    .desc = Используется для заточки кромок стальных инструментов.
+ent-StunHand = оглушающая аура
+    .desc = Оглушит и обезмолвит жертву при ударе.

-ent-CultSharpener = древний точильный камень
-    .desc = Используется для заточки кромок стальных инструментов.
+ent-ShadowShackles = теневые оковы
+    .desc = Оковы, сковывающие запястья с помощью зловещей магии.

 ent-CultRunicMetal = рунический металл
    .desc = Необычный лист металла с пульсирующей руной.
@@ -19,10 +19,17 @@ ent-CultRunicMetal1 = рунический металл
    .desc = Необычный лист металла с пульсирующей руной.
    .suffix = Один

+ent-CultRunicMetal4 = рунический металл
+    .desc = Необычный лист металла с пульсирующей руной.
+    .suffix = 4
+
 ent-CultRunicMetal20 = рунический металл
    .desc = Необычный лист металла с пульсирующей руной.
    .suffix = 20

+ent-AltarTome = архивы
+    .desc = Стол, заваленный тайными рукописями и книгами на неизвестных языках.
+
 ent-CultBloodAltar = алтарь
    .desc = Кровавый алтарь, посвященный какому-то существу.

@@ -38,9 +45,6 @@ ent-AirlockGlassCult = рунический шлюз
 ent-WallForceCult = светящаяся стена
    .desc = Нечестивый щит, блокирующий все атаки.

-ent-CultClothingBlindfold = повязка Зилота
-    .desc = Повязка, наделенная странной силой.
-
 ent-OfferingRune = руна предпонесения
    .desc = Мгновенно превращает обычного члена экипажа в культиста, для чего требуется 2 культиста вокруг руны. Члена экипажа с имплантом защиты разума нельзя перевоплотить, можно только принести в жертву, для чего нужно 3 культиста, которые встанут вокруг руны. Если цель мертва, то она будет принесена в жертву, для чего требуется 1 культист.

--- a/Resources/Locale/ru-RU/_white/cult/factory.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/factory.ftl
@@ -2,9 +2,6 @@ cultist-factory-charging = { $name } будут заряжаться ещё { $s
 cultist-factory-create = Создать { $itemName }
 cultist-factory-too-far = Слишком далеко

-ent-AltarTome = архивы
-    .desc = Стол, заваленный тайными рукописями и книгами на неизвестных языках.
-
 ent-CultRobeModify = одеяние флагелланта
    .desc = Какая-то религиозная роба.

@@ -13,9 +10,18 @@ ent-CultMirrorShield = зеркальный щит

 ent-CultOuterArmor = бронированная мантия
    .desc = С первого взгляда кажется, что это простая мантия, но на ней имеется элементы брони.
-ent-ShadowShackles = теневые оковы
-    .desc = Оковы, сковывающие запястья с помощью зловещей магии.
+
+ent-WetStone = точильный камень
+    .desc = Используется для заточки кромок стальных инструментов.
+
+ent-CultSharpener = древний точильный камень
+    .desc = Используется для заточки кромок стальных инструментов.
+
+ent-CultClothingBlindfold = повязка Зилота
+    .desc = Повязка, наделенная странной силой.
+
 ent-BloodSpear = кровавое копьё
    .desc = Ужасающее копьё, полностью состоящее из кристаллизованной крови.
+
 ent-BloodBarrage = залп кровавых снарядов
    .desc = Кровь за кровь.
--- a/Resources/Locale/ru-RU/_white/cult/messages.ftl
+++ b/Resources/Locale/ru-RU/_white/cult/messages.ftl
@@ -0,0 +1,3 @@
+cult-stun-component-extra-message = [color=darkgray]Выбросите ауру, чтобы навсегда избавиться от неё.[/color]
+cult-magic-holy = Сила священного предмета в руках цели препятствует магии!
+cult-magic-no-empty-hand = Вам нужна свободная рука для использования заклинания!
--- a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
@@ -43,6 +43,7 @@ arcane-barrage-no-empty-hand = Вам нужна свободная рука д

 mindswap-success = Ваш разум подменили!
 mindswap-borer-failed = Его разумом кто-то управляет.
+mindswap-cultist-failed = Нечестивая сила препятствует подмене сознания.

 store-currency-display-spell-point = Очки заклинаний

--- a/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl
+++ b/Resources/Locale/ru-RU/rcd/components/rcd-component.ftl
@@ -1,30 +1,59 @@
-### UI
+# WD EDIT ALL

-# Shown when an RCD is examined in details range
-rcd-component-examine-detail = В данный момент выбран режим { $mode }.
-# Shown when an RCD is examined in details range
-rcd-component-examine-detail-count =
-    Находится в режиме { $mode ->
-       *[other] _
-        [floors] полы
-        [walls] стены
-        [airlock] шлюзы
-        [deconstruct] разбор
-    }, и { $ammoCount ->
-       *[zero] не содержит зарядов.
-        [one] содержит 1 заряд.
-        [few] содержит { $ammoCount } заряда.
-        [other] содержит { $ammoCount } зарядов.
-    }
+# UI

-### Interaction Messages
+rcd-component-examine-mode-details = Текущий режим: '{$mode}'.
+rcd-component-examine-build-details = Текущий режим строительства: {$name}.

-# Shown when changing RCD Mode
-rcd-component-change-mode = РЦД переключён в режим { $mode }.
+
+## Interaction Messages
+
+# Mode change
+rcd-component-change-mode = РЦД переключён в режим '{$mode}'.
+rcd-component-change-build-mode = РЦД переключён в режим строительства {$name}.
+
+# Ammo count
 rcd-component-no-ammo-message = В РЦД закончились заряды!
-rcd-component-tile-indestructible-message = Эта плитка не может быть уничтожена!
-rcd-component-tile-obstructed-message = Этот тайл заблокирован!
-rcd-component-deconstruct-target-not-on-whitelist-message = Вы не можете это деконструировать!
-rcd-component-cannot-build-floor-tile-not-empty-message = Пол можно построить только в космосе или на покрытии!
-rcd-component-cannot-build-wall-tile-not-empty-message = Вы не можете построить стену в космосе!
-rcd-component-cannot-build-airlock-tile-not-empty-message = Вы не можете построить шлюз в космосе!
+rcd-component-insufficient-ammo-message = В РЦД недостаточно зарядов!
+
+# Deconstruction
+rcd-component-tile-indestructible-message = Эта плитка неразрушима!
+rcd-component-deconstruct-target-not-on-whitelist-message = Вы не можете это демонтировать!
+rcd-component-nothing-to-deconstruct-message = Здесь нечего демонтировать!
+rcd-component-tile-obstructed-message = Вы не можете демонтировать плитку, если на ней что-то есть!
+
+# Construction
+rcd-component-no-valid-grid = Вы слишком далеко в открытом космосе, чтобы строить здесь!
+rcd-component-must-build-on-empty-tile-message = Здесь уже есть фундамент!
+rcd-component-cannot-build-on-empty-tile-message = Вы не можете строить это без фундамента!
+rcd-component-must-build-on-subfloor-message = Вы можете строить это только на открытом полу!
+rcd-component-cannot-build-on-subfloor-message = Вы не можете строить это на открытом полу!
+rcd-component-cannot-build-on-occupied-tile-message = Вы не можете строить здесь, это место уже занято!
+rcd-component-cannot-build-identical-tile = Эта плитка уже существует!
+
+
+### Category names
+
+# RCD
+rcd-category-WallsAndFlooring = Стены и пол
+rcd-category-WindowsAndGrilles = Окна и решётки
+rcd-category-Airlocks = Шлюзы
+rcd-category-Electrical = Электрика
+rcd-category-Lighting = Освещение
+
+# RPD
+rcd-category-Pipes = Трубы
+rcd-category-GasDevices = Атмосферные приборы
+rcd-category-DisposalPipes = Мусорные трубы
+rcd-category-DisposalUnits = Мусорные приборы
+
+### Prototype names (note: constructable items will be puralized)
+
+rcd-component-deconstruct = демонтаж
+rcd-component-floor-steel = стальная плитка
+rcd-component-plating = лист обшивки
+
+# RPD naming
+
+ent-RapidPipeDispenser = РПД
+    .desc = Новейшее ручное строительное устройство, которое может быстро размещать трубы и атмосферные приборы.
--- a/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml
@@ -92,6 +92,7 @@
      - id: ClothingEyesGlassesMeson
      - id: ClothingShoesBootsMag
      - id: ClothingHandsGlovesColorYellow
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerAtmosphericsFilled
@@ -111,6 +112,7 @@
      - id: ClothingEyesGlassesMeson
      - id: ClothingShoesBootsMag
      - id: ClothingHandsGlovesColorYellow
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerEngineerFilledHardsuit
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -152,6 +152,7 @@
      - id: ClothingOuterHardsuitEngineeringWhite
      - id: ClothingMaskBreath
      - id: OxygenTankFilled
+      - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerChiefEngineerFilled
@@ -169,6 +170,7 @@
    - id: RCDAmmo
      amount: 2
    - id: HolofanProjector
+    - id: RapidPipeDispenser # WD

 - type: entity
  id: LockerChiefMedicalOfficerFilledHardsuit
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
@@ -12,6 +12,5 @@
    GeigerCounter: 3
    InflatableWallStack1: 24
    InflatableDoorStack1: 8
-  emaggedInventory:
-    RCD: 1
-    RCDAmmo: 3
+    RCD: 3 # WD
+    RCDAmmo: 3 # WD
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -82,7 +82,9 @@
  - type: EmitSoundOnDrop
    sound:
      path: /Audio/White/Items/handling/drinkglass_drop.ogg
-
+  - type: Tag
+    tags:
+      - DrinkGlass
 # Transformable container - normal glass
 - type: entity
  name: metamorphic glass
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -34,6 +34,9 @@
    solution: food
  - type: TrashOnSolutionEmpty
    solution: food
+  - type: Tag
+    tags:
+      - Ingredient

 - type: entity
  abstract: true
@@ -272,6 +275,9 @@
        reagents:
        - ReagentId: Nutriment
          Quantity: 15
+  - type: Tag
+    tags:
+      - Ingredient

 - type: entity
  name: dough
@@ -648,3 +654,6 @@
      reagents:
      - ReagentId: CocoaPowder
        Quantity: 2
+  - type: Tag
+    tags:
+      - Ingredient
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
@@ -86,6 +86,8 @@
        reagents:
        - ReagentId: Silicon
          Quantity: 10
+  - type: RCDAmmo # WD
+    canBeExamined: false

 - type: entity
  parent: SheetGlass
@@ -172,6 +174,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetRGlass
@@ -249,6 +254,9 @@
            max: 1
      - !type:DoActsBehavior
        acts: [ "Destruction" ]
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetPGlass
@@ -315,6 +323,9 @@
        - ReagentId: Carbon
          Quantity: 0.5
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 3

 - type: entity
  parent: SheetRPGlass
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
@@ -70,6 +70,8 @@
          Quantity: 9
        - ReagentId: Carbon
          Quantity: 1
+  - type: RCDAmmo # WD
+    canBeExamined: false

 - type: entity
  parent: SheetSteel
@@ -206,6 +208,9 @@
        - ReagentId: Carbon
          Quantity: 1
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 2

 - type: entity
  parent: SheetPlasteel
--- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
@@ -164,6 +164,9 @@
        - ReagentId: Phosphorus
          Quantity: 5
        canReact: false
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.5

 - type: entity
  parent: SheetPlastic
--- a/Resources/Prototypes/Entities/Objects/Materials/parts.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -74,6 +74,9 @@
          Quantity: 4.5
        - ReagentId: Carbon
          Quantity: 0.5
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.5

 - type: entity
  parent: PartRodMetal
--- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
@@ -27,6 +27,9 @@
    price: 0
  - type: StackPrice
    price: 1
+  - type: RCDAmmo # WD
+    canBeExamined: false
+    chargeCountModifier: 0.2

 - type: entity
  id: CableHVStack
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -395,32 +395,11 @@
      path: "/Audio/Items/drill_hit.ogg"

 - type: entity
-  id: RCD
+  id: BaseRCD
  parent: BaseItem
  name: RCD
  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:
-    - WallSolid
-    - FloorSteel
-    - Plating
-    - Catwalk
-    - Grille
-    - Window
-    - WindowDirectional
-    - WindowReinforcedDirectional
-    - ReinforcedWindow
-    - Airlock
-    - AirlockGlass
-    - Firelock
-    - TubeLight
-    - BulbLight
-    - LVCable
-    - MVCable
-    - HVCable
-    - CableTerminal
-    - Deconstruct
  - type: LimitedCharges
    maxCharges: 30
    charges: 30
@@ -449,13 +428,18 @@
    key: enum.RcdUiKey.Key

 - type: entity
-  id: RCDEmpty
-  parent: RCD
-  suffix: Empty
+  id: RCD
+  parent: BaseRCD
+  name: RCD
+  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: LimitedCharges
-    charges: 0
  - type: RCD
+    categoryPrototypes: # WD
+    - WallsAndFlooring # WD
+    - WindowsAndGrilles # WD
+    - Airlocks # WD
+    - Electrical # WD
+    - Lighting # WD
    availablePrototypes:
    - WallSolid
    - FloorSteel
@@ -469,6 +453,76 @@
    - Airlock
    - AirlockGlass
    - Firelock
+    - TubeLight
+    - BulbLight
+    - LVCable
+    - MVCable
+    - HVCable
+    - CableTerminal
+    - APC # WD
+    - Camera # WD
+    - Deconstruct
+
+- type: entity
+  id: RCDEmpty
+  parent: RCD
+  suffix: Empty
+  components:
+  - type: LimitedCharges
+    charges: 0
+
+- type: entity # WD
+  id: RapidPipeDispenser
+  parent: BaseRCD
+  components:
+  - type: Sprite
+    sprite: White/Items/Tools/rpd.rsi
+  - type: Item
+    size: Normal
+    shape:
+    - 0, 0, 1, 0
+  - type: Clothing
+    sprite: White/Items/Tools/rpd.rsi
+    quickEquip: false
+    slots:
+    - Belt
+  - type: RCD
+    categoryPrototypes:
+    - Pipes
+    - GasDevices
+    - DisposalPipes
+    - DisposalUnits
+    availablePrototypes:
+    - PipeStraight # pipes
+    - PipeBend
+    - PipeTJunction
+    - PipeFourway
+    - GasCanisterPort # gas devices
+    - GasFilter
+    - GasMixer
+    - GasOutletInjector
+    - GasPressurePump
+    - GasVolumePump
+    - GasValve
+    - SignalControlledValve
+    - PressureControlledValve
+    - GasVentScrubber
+    - GasVentPump
+    - GasPassiveVent
+    - DisposalPipe # disposal pipes
+    - DisposalBend
+    - DisposalJunction
+    - DisposalJunctionFlipped
+    - DisposalYJunction
+    - DisposalRouter
+    - DisposalRouterFlipped
+    - DisposalTagger
+    - DisposalSignalRouter
+    - DisposalSignalRouterFlipped
+    - DisposalTrunk
+    - DisposalUnit # disposal units
+    - MailingUnit
+    - ToiletEmpty

 - type: entity
  id: RCDRecharging
@@ -500,6 +554,7 @@
  description: A cartridge of raw matter compacted by bluespace technology. Used in rapid construction devices.
  components:
  - type: RCDAmmo
+    chargeCountModifier: 1.5
  - type: Sprite
    sprite: Objects/Tools/rcd.rsi
    state: ammo
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml
@@ -1442,7 +1442,7 @@
  - type: Projectile
    damage:
      types:
-        Piercing: 25
+        Piercing: 20

 - type: entity
  name: arcane bolt
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -349,6 +349,8 @@
      - KitchenKnife # WD EDIT
      - ButchCleaver # WD EDIT
      - WeaponTempGun # WD EDIT
+      - RapidPipeDispenserRecipe # WD edit
+      - RCDRecipe # WD edit
      - DeviceQuantumSpinInverter
  - type: EmagLatheRecipes
    emagDynamicRecipes:
--- a/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
@@ -164,3 +164,4 @@
  components:
    - type: SurveillanceCameraRouter
      subnetFrequency: SurveillanceCameraSecurity
+      subnetColor: "#DE3A3AFF"
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml
@@ -0,0 +1,475 @@
+# Parents
+- type: entity
+  abstract: true
+  id: ShelfBase
+  parent: BaseStructure
+  name: shelf
+  description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.'
+  components:
+  - type: Sprite
+    drawdepth: WallMountedItems
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.35,-0.35,0.35,0.35"
+        density: 35
+        layer:
+        - BulletImpassable
+  - type: Transform
+  - type: Damageable
+    damageModifierSet: Wood
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: WallMount
+    arc: 175
+  - type: Storage
+    grid:
+    - 0,0,3,1
+    - 0,3,3,4
+    maxItemSize: Normal
+  - type: UserInterface
+    interfaces:
+    - key: enum.StorageUiKey.Key
+      type: StorageBoundUserInterface
+  - type: InteractionOutline
+  - type: ContainerContainer
+    containers:
+      storagebase: !type:Container
+  - type: Tag
+    tags:
+    - Structure
+
+- type: entity
+  abstract: true
+  id: ShelfBaseReinforced
+  parent: ShelfBase
+  name: reinforced shelf
+  description: It looks as strong as reality itself.
+  components:
+  - type: Lock
+  - type: LockVisuals
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+      # used to keep the unlocked light visible while open.
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateDoorOpen: open
+    stateDoorClosed: closed
+
+  - type: AccessReader
+
+# Normal
+- type: entity
+  id: ShelfWood
+  parent: ShelfBase
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  components:
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 60
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 3
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+    - Wooden
+  - type: Construction
+    graph: Shelf
+    node: ShelfWood
+
+- type: entity
+  id: ShelfMetal
+  parent: ShelfBase
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Metallic
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 120
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 2
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfMetal
+
+- type: entity
+  id: ShelfGlass
+  parent: ShelfBase
+  name: glass shelf
+  description: A fragile place to place, well, anything really.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  - type: Damageable
+    damageModifierSet: Glass
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          ShardGlass:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Tag
+    tags:
+    - Structure
+  - type: Construction
+    graph: Shelf
+    node: ShelfGlass
+
+# Reinforced
+- type: entity
+  id: ShelfRWood
+  parent: ShelfBaseReinforced
+  name: sturdy wood shelf
+  description: A safe place to put your favorite bottle of whiskey
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+    layers:
+    - state: rbase
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 215
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank:
+            min: 2
+            max: 5
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRWood
+
+- type: entity
+  id: ShelfRMetal
+  parent: ShelfBaseReinforced
+  name: sturdy metal shelf
+  description: A strong & shiny place to keep all your vials safe
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/metal.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 450
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 2
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 1
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRMetal
+
+- type: entity
+  id: ShelfRGlass
+  parent: ShelfBaseReinforced
+  name: sturdy glass shelf
+  description: Crystal clear reinforced glass doors to show off all your fancy bottles you definitely didn't sell a co-worker's favorite mothroach for.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/glass.rsi
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 250
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlastic1:
+            min: 1
+            max: 3
+          ShardGlass:
+            min: 1
+            max: 2
+          PartRodMetal1:
+            min: 0
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Construction
+    graph: Shelf
+    node: ShelfRGlass
+
+# Departmental
+- type: entity
+  id: ShelfBar
+  parent: ShelfBase
+  name: bar shelf
+  description: Made out of the finest synthetic wood for all alcohol holding needs.
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+    layers:
+      - state: base
+      - state: bar-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: bar
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 100
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - DrinkBottle
+        - DrinkCan
+        - Beer
+  - type: Construction
+    graph: Shelf
+    node: ShelfBar
+
+- type: entity
+  id: ShelfKitchen
+  parent: ShelfBase
+  name: cooking shelf
+  description: Holds knifes, spice, and everything nice!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+    layers:
+      - state: base
+      - state: kitchen-0
+      - map: ["enum.StorageFillLayers.Fill"]
+  - type: Appearance
+  - type: StorageFillVisualizer
+    maxFillLevels: 13
+    fillBaseName: kitchen
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetSteel1:
+            min: 1
+            max: 4
+          MaterialWoodPlank1:
+            min: 0
+            max: 1
+          PartRodMetal1:
+            min: 0
+            max: 2
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - DrinkGlass
+        - BoxCardboard
+        - MonkeyCube
+        - Enzyme
+        - Mayo
+        - Packet
+        - Cleaver
+        - Knife
+        - KitchenKnife
+        - RollingPin
+        - Ingredient
+        - Trash
+  - type: Construction
+    graph: Shelf
+    node: ShelfKitchen
+
+- type: entity
+  id: ShelfChemistry
+  parent: ShelfBaseReinforced
+  name: chemical shelf
+  description: Keeps all your chemicals safe and out of the clow- er, public hands!
+  components:
+  - type: Sprite
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: unlocked
+      shader: unshaded
+    - state: chem-0
+    - map: ["enum.StorageFillLayers.Fill"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+    - state: locked
+      map: ["enum.LockVisualLayers.Lock"]
+      shader: unshaded
+  - type: StorageFillVisualizer
+    maxFillLevels: 7
+    fillBaseName: chem
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 330
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          SheetPlasteel1:
+            min: 1
+            max: 2
+          SheetPlastic1:
+            min: 1
+            max: 2
+          ShardGlass:
+            min: 1
+            max: 1
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: Storage
+    grid:
+    - 0,0,5,1
+    - 0,3,5,4
+    maxItemSize: Normal
+    whitelist:
+      tags:
+        - ChemDispensable
+        - GlassBeaker
+        - Bottle
+  - type: Construction
+    graph: Shelf
+    node: ShelfChemistry
+
+
+
+# Access presets
+# Try to keep alphabetical sorting if adding more
+
+- type: entity
+  parent: ShelfChemistry
+  id: ShelfChemistryChemistrySecure
+  suffix: Chemistry, Secure
+  components:
+  - type: AccessReader
+    access: [["Chemistry"]]
+
--- a/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/mannequin_inventory_template.yml
@@ -62,3 +62,23 @@
      uiWindowPos: 3,0
      strippingWindowPos: 0,2
      displayName: Back
+    - name: underwearb #WD slot
+      slotTexture: underwearb
+      slotFlags: UNDERWEARB
+      stripTime: 6
+      uiWindowPos: 3,0
+      strippingWindowPos: 2,1
+      displayName: Panties
+      whitelist:
+        tags:
+        - underwearb
+    - name: underweart #WD slot
+      slotTexture: underweart
+      slotFlags: UNDERWEART
+      stripTime: 6
+      uiWindowPos: 3,1
+      strippingWindowPos: 2,0
+      displayName: Bra
+      whitelist:
+        tags:
+        - underweart
--- a/Resources/Prototypes/RCD/rcd.yml
+++ b/Resources/Prototypes/RCD/rcd.yml
@@ -2,7 +2,7 @@
 - type: rcd
  id: Invalid   # Hidden prototype - do not add to RCDs
  mode: Invalid
-  
+
 - type: rcd
  id: Deconstruct
  name: rcd-component-deconstruct
@@ -13,14 +13,14 @@
  rotation: Camera

 - type: rcd
-  id: DeconstructLattice   # Hidden prototype - do not add to RCDs  
+  id: DeconstructLattice   # Hidden prototype - do not add to RCDs
  name: rcd-component-deconstruct
  mode: Deconstruct
  cost: 2
  delay: 0
  rotation: Camera
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: DeconstructTile      # Hidden prototype - do not add to RCDs
  name: rcd-component-deconstruct
@@ -30,7 +30,7 @@
  rotation: Camera
  fx: EffectRCDDeconstruct4

-# Flooring 
+# Flooring
 - type: rcd
  id: Plating
  name: rcd-component-plating
@@ -39,12 +39,12 @@
  mode: ConstructTile
  prototype: Plating
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - CanBuildOnEmptyTile
-  fx: EffectRCDConstruct1
-  
+  fx: EffectRCDConstruct0
+
 - type: rcd
  id: FloorSteel
  name: rcd-component-floor-steel
@@ -53,11 +53,11 @@
  mode: ConstructTile
  prototype: FloorSteel
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - CanBuildOnEmptyTile
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 - type: rcd
  id: Catwalk
@@ -66,13 +66,13 @@
  mode: ConstructObject
  prototype: Catwalk
  cost: 1
-  delay: 1
+  delay: 0
  collisionMask: InteractImpassable
  rules:
    - MustBuildOnSubfloor
    - IsCatwalk
  rotation: Fixed
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 # Walls
 - type: rcd
@@ -80,7 +80,7 @@
  category: WallsAndFlooring
  sprite: /Textures/Interface/Radial/RCD/solid_wall.png
  mode: ConstructObject
-  prototype: WallSolid 
+  prototype: WallSolid
  cost: 4
  delay: 2
  collisionMask: FullTileMask
@@ -93,11 +93,11 @@
  sprite: /Textures/Interface/Radial/RCD/grille.png
  mode: ConstructObject
  prototype: Grille
-  cost: 4
-  delay: 2
+  cost: 1
+  delay: 1
  collisionMask: FullTileMask
  rotation: Fixed
-  fx: EffectRCDConstruct2
+  fx: EffectRCDConstruct1

 # Windows
 - type: rcd
@@ -106,20 +106,49 @@
  sprite: /Textures/Interface/Radial/RCD/window.png
  mode: ConstructObject
  prototype: Window
-  cost: 3
-  delay: 2
+  cost: 2
+  delay: 1
  collisionMask: FullTileMask
  rules:
    - IsWindow
  rotation: Fixed
-  fx: EffectRCDConstruct2
-  
+  fx: EffectRCDConstruct1
+
 - type: rcd
  id: WindowDirectional
  category: WindowsAndGrilles
  sprite: /Textures/Interface/Radial/RCD/directional.png
  mode: ConstructObject
  prototype: WindowDirectional
+  cost: 1
+  delay: 1
+  collisionMask: FullTileMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: ReinforcedWindow
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
+  mode: ConstructObject
+  prototype: ReinforcedWindow
+  cost: 4
+  delay: 2
+  collisionMask: FullTileMask
+  rules:
+    - IsWindow
+  rotation: User
+  fx: EffectRCDConstruct2
+
+- type: rcd
+  id: WindowReinforcedDirectional
+  category: WindowsAndGrilles
+  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
+  mode: ConstructObject
+  prototype: WindowReinforcedDirectional
  cost: 2
  delay: 1
  collisionMask: FullTileMask
@@ -128,35 +157,6 @@
    - IsWindow
  rotation: User
  fx: EffectRCDConstruct1
-  
- type: rcd
-  id: ReinforcedWindow
-  category: WindowsAndGrilles
-  sprite: /Textures/Interface/Radial/RCD/window_reinforced.png
-  mode: ConstructObject
-  prototype: ReinforcedWindow
-  cost: 4
-  delay: 3
-  collisionMask: FullTileMask
-  rules:
-    - IsWindow
-  rotation: User
-  fx: EffectRCDConstruct3
-    
- type: rcd
-  id: WindowReinforcedDirectional
-  category: WindowsAndGrilles
-  sprite: /Textures/Interface/Radial/RCD/directional_reinforced.png
-  mode: ConstructObject
-  prototype: WindowReinforcedDirectional
-  cost: 3
-  delay: 2
-  collisionMask: FullTileMask
-  collisionBounds: "-0.23,-0.49,0.23,-0.36"
-  rules:
-    - IsWindow
-  rotation: User
-  fx: EffectRCDConstruct2

 # Airlocks
 - type: rcd
@@ -166,11 +166,11 @@
  mode: ConstructObject
  prototype: Airlock
  cost: 4
-  delay: 4
+  delay: 3
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct4
-  
+  fx: EffectRCDConstruct3
+
 - type: rcd
  id: AirlockGlass
  category: Airlocks
@@ -178,22 +178,22 @@
  mode: ConstructObject
  prototype: AirlockGlass
  cost: 4
-  delay: 4
+  delay: 3
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct4
-  
+  fx: EffectRCDConstruct3
+
 - type: rcd
  id: Firelock
  category: Airlocks
  sprite: /Textures/Interface/Radial/RCD/firelock.png
  mode: ConstructObject
  prototype: Firelock
-  cost: 4
-  delay: 3
+  cost: 2
+  delay: 2
  collisionMask: FullTileMask
  rotation: Camera
-  fx: EffectRCDConstruct3
+  fx: EffectRCDConstruct2

 # Lighting
 - type: rcd
@@ -202,25 +202,25 @@
  sprite: /Textures/Interface/Radial/RCD/tube_light.png
  mode: ConstructObject
  prototype: Poweredlight
-  cost: 2
-  delay: 1
+  cost: 1
+  delay: 0
  collisionMask: TabletopMachineMask
  collisionBounds: "-0.23,-0.49,0.23,-0.36"
  rotation: User
-  fx: EffectRCDConstruct1
-  
+  fx: EffectRCDConstruct0
+
 - type: rcd
  id: BulbLight
  category: Lighting
  sprite: /Textures/Interface/Radial/RCD/bulb_light.png
  mode: ConstructObject
  prototype: PoweredSmallLight
-  cost: 2
-  delay: 1
+  cost: 1
+  delay: 0
  collisionMask: TabletopMachineMask
  collisionBounds: "-0.23,-0.49,0.23,-0.36"
  rotation: User
-  fx: EffectRCDConstruct1
+  fx: EffectRCDConstruct0

 # Electrical
 - type: rcd
@@ -236,7 +236,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: MVCable
  category: Electrical
@@ -250,7 +250,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: HVCable
  category: Electrical
@@ -264,7 +264,7 @@
  - MustBuildOnSubfloor
  rotation: Fixed
  fx: EffectRCDConstruct0
-    
+
 - type: rcd
  id: CableTerminal
  category: Electrical
@@ -277,4 +277,29 @@
  rules:
  - MustBuildOnSubfloor
  rotation: User
-  fx: EffectRCDConstruct0
+  fx: EffectRCDConstruct0
+
+- type: rcd # WD
+  id: APC
+  category: Electrical
+  sprite: /Textures/Structures/Power/apc.rsi/static.png
+  mode: ConstructObject
+  prototype: APCConstructed
+  cost: 4
+  delay: 1
+  collisionMask: None
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd # WD
+  id: Camera
+  category: Electrical
+  sprite: /Textures/Structures/Wallmounts/camera.rsi/cameracase.png
+  mode: ConstructObject
+  prototype: SurveillanceCameraConstructed
+  cost: 1
+  delay: 1
+  collisionMask: TabletopMachineMask
+  collisionBounds: "-0.23,-0.49,0.23,-0.36"
+  rotation: User
+  fx: EffectRCDConstruct1
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/shelfs.yml
@@ -0,0 +1,268 @@
+- type: constructionGraph
+  id: Shelf
+  start: start
+  graph:
+    - node: start
+      actions:
+        - !type:DeleteEntity {}
+      edges:
+# Normal
+        - to: ShelfWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 4
+              doAfter: 2
+        - to: ShelfMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Steel
+              amount: 5
+              doAfter: 3
+        - to: ShelfGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Glass
+              amount: 4
+              doAfter: 2
+# Reinforced
+        - to: ShelfRWood
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 8
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+        - to: ShelfRMetal
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 5
+              doAfter: 3
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 3
+              doAfter: 1
+        - to: ShelfRGlass
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 3
+            - material: Cable
+              amount: 2
+              doAfter: 1
+# Departmental
+        - to: ShelfBar
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: WoodPlank
+              amount: 6
+              doAfter: 2
+        - to: ShelfKitchen
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: MetalRod
+              amount: 2
+              doAfter: 1
+            - material: Steel
+              amount: 5
+            - material: WoodPlank
+              amount: 3
+              doAfter: 2
+        - to: ShelfChemistry
+          completed:
+            - !type:SnapToGrid
+              southRotation: true
+          steps:
+            - material: Plasteel
+              amount: 2
+              doAfter: 2
+            - material: ReinforcedGlass
+              amount: 5
+              doAfter: 2
+            - material: Plastic
+              amount: 5
+              doAfter: 2
+            - material: Cable
+              amount: 2
+              doAfter: 1
+
+# Normal deconstructs
+    - node: ShelfWood
+      entity: ShelfWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 4
+          steps:
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfMetal
+      entity: ShelfMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+          steps:
+            - tool: Screwing
+              doAfter: 5
+
+    - node: ShelfGlass
+      entity: ShelfGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetGlass1
+                amount: 4
+          steps:
+            - tool: Screwing
+              doAfter: 2
+# Reinforced deconstructs
+    - node: ShelfRWood
+      entity: ShelfRWood
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 8
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Screwing
+              doAfter: 5
+            - tool: Prying
+              doAfter: 2
+
+    - node: ShelfRMetal
+      entity: ShelfRMetal
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 5
+
+    - node: ShelfRGlass
+      entity: ShelfRGlass
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 4
+
+# Departmental deconstructs
+    - node: ShelfBar
+      entity: ShelfBar
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 6
+          steps:
+            - tool: Prying
+              doAfter: 3
+
+    - node: ShelfKitchen
+      entity: ShelfKitchen
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: PartRodMetal
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetSteel1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: MaterialWoodPlank1
+                amount: 3
+          steps:
+            - tool: Screwing
+              doAfter: 2
+            - tool: Welding
+              doAfter: 2
+            - tool: Prying
+              doAfter: 1
+
+    - node: ShelfChemistry
+      entity: ShelfChemistry
+      edges:
+        - to: start
+          completed:
+            - !type:SpawnPrototype
+                prototype: SheetPlasteel1
+                amount: 2
+            - !type:SpawnPrototype
+                prototype: SheetPlastic1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: SheetRGlass1
+                amount: 5
+            - !type:SpawnPrototype
+                prototype: CableApcStack1
+                amount: 2
+          steps:
+            - tool: Welding
+              doAfter: 2
+            - tool: Screwing
+              doAfter: 1
+            - tool: Anchoring
+              doAfter: 2
+            - tool: Prying
+              doAfter: 4
--- a/Resources/Prototypes/Recipes/Construction/storage.yml
+++ b/Resources/Prototypes/Recipes/Construction/storage.yml
@@ -49,3 +49,150 @@
  canBuildInImpassable: false
  conditions:
    - !type:TileNotBlocked
+# Shelfs
+# Normals
+- type: construction
+  id: ShelfWood
+  name: wooden shelf
+  description: A convenient place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfMetal
+  name: metal shelf
+  description: A sturdy place to place, well, anything really.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfGlass
+  name: glass shelf
+  description: Just like a normal shelf! But fragile and without the walls!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Reinforced
+- type: construction
+  id: ShelfRWood
+  name: sturdy wooden shelf
+  description: The perfect place to store all your vintage records.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRWood
+  icon:
+    sprite: Structures/Storage/Shelfs/wood.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRMetal
+  name: sturdy metal shelf
+  description: Nice and strong, and keeps your maints loot secure.
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRMetal
+  icon:
+    sprite: Structures/Storage/Shelfs/metal.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfRGlass
+  name: sturdy glass shelf
+  description: See through, decent strength, shiny plastic case. Whats not to love?
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfRGlass
+  icon:
+    sprite: Structures/Storage/Shelfs/glass.rsi
+    state: rbase
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+# Departmental
+- type: construction
+  id: ShelfBar
+  name: bar shelf
+  description: A convenient place for all your extra booze, specifically designed to hold more bottles!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfBar
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/bar.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfKitchen
+  name: cooking shelf
+  description: Holds your knifes, spice, and everything nice!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfKitchen
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Service/kitchen.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
+
+- type: construction
+  id: ShelfChemistry
+  name: chemical shelf
+  description: Perfect for keeping the most important chemicals safe, and out of the clumsy clowns hands!
+  graph: Shelf
+  startNode: start
+  targetNode: ShelfChemistry
+  icon:
+    sprite: Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi
+    state: base
+  objectType: Structure
+  placementMode: SnapgridCenter
+  canBuildInImpassable: true
+  conditions:
+    - !type:WallmountCondition
--- a/Resources/Prototypes/Research/industrial.yml
+++ b/Resources/Prototypes/Research/industrial.yml
@@ -54,6 +54,7 @@
  - AutolatheHyperConvectionMachineCircuitboard
  - ProtolatheHyperConvectionMachineCircuitboard
  - SheetifierMachineCircuitboard
+  - RCDRecipe # WD

 - type: technology
  id: PowerGeneration
@@ -85,6 +86,7 @@
  recipeUnlocks:
  - ThermomachineFreezerMachineCircuitBoard
  - GasRecyclerMachineCircuitboard
+  - RapidPipeDispenserRecipe # WD

 - type: technology
  id: RipleyAPLU
--- a/Resources/Prototypes/_White/Actions/cult_actions.yml
+++ b/Resources/Prototypes/_White/Actions/cult_actions.yml
@@ -10,6 +10,7 @@
        sprite: /Textures/Objects/Materials/Sheets/metal.rsi
        state: steel
      event: !type:CultTwistedConstructionActionEvent
+        speech: "Ethra p'ni dedol!"
      itemIconStyle: BigAction
      charges: 1
      temporary: true
@@ -31,6 +32,7 @@
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: teleport
      event: !type:CultTeleportTargetActionEvent
+        speech: "Sas'so c'arta forbici!"
      itemIconStyle: BigAction
      charges: 1
      temporary: true
@@ -58,20 +60,16 @@
      removeOnNoCharges: true

 - type: entity
-  id: ActionCultStun
+  id: InstantActionCultStun
  name: Stun
  description: A potent spell that will stun and mute victims.
  noSpawn: true
  components:
-    - type: EntityTargetAction
-      whitelist:
-        components:
-          - HumanoidAppearance
-      canTargetSelf: false
+    - type: InstantAction
      icon:
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: stun
-      event: !type:CultStunTargetActionEvent
+      event: !type:CultStunActionEvent
      itemIconStyle: BigAction
      charges: 1
      temporary: true
@@ -92,6 +90,7 @@
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: shackles
      event: !type:CultShadowShacklesTargetActionEvent
+        speech: "In'totum Lig'abis!"
      itemIconStyle: BigAction
      charges: 4
      temporary: true
@@ -108,6 +107,7 @@
        sprite: /Textures/White/Cult/interface.rsi
        state: icon
      event: !type:CultSummonDaggerActionEvent
+        speech: "Wur d'dai leev'mai k'sagan!"
      charges: 1
      temporary: true
      removeOnNoCharges: true
@@ -123,6 +123,7 @@
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: blood_rites
      event: !type:CultBloodRitesInstantActionEvent
+        speech: "Fel'th Dol Ab'orod!"
      charges: 5
      temporary: true
      removeOnNoCharges: true
@@ -138,6 +139,7 @@
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: emp
      event: !type:CultElectromagneticPulseInstantActionEvent
+        speech: "Ta'gh fara'qha fel d'amar det!"
      charges: 1
      temporary: true
      removeOnNoCharges: true
@@ -153,12 +155,15 @@
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: gone
      event: !type:CultConcealInstantActionEvent
+        speech: "Kla'atu barada nikt'o!"
      charges: 10
      temporary: true
      removeOnNoCharges: true
    - type: ConcealPresenceSpell
      concealEvent: !type:CultConcealInstantActionEvent
+        speech: "Kla'atu barada nikt'o!"
      revealEvent: !type:CultRevealInstantActionEvent
+        speech: "Kla'atu barada nikt'o!"
      concealIcon:
        sprite: /Textures/White/Cult/actions_cult.rsi
        state: gone
--- a/Resources/Prototypes/_White/Entities/Cult/Effects/effects.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Effects/effects.yml
@@ -1,4 +1,4 @@
- type: entity
+- type: entity
  id: CultTileSpawnEffect
  name: Sparkle
  placement:
@@ -103,3 +103,18 @@
      drawdepth: Effects
    - type: PointLight
      color: "#FF0000"
+
+- type: entity
+  id: CultStunFlashEffect
+  noSpawn: true
+  components:
+    - type: PointLight
+      enabled: true
+      radius: 5
+      energy: 8
+      netsync: false
+      color: Red
+    - type: LightFade
+      duration: 0.5
+    - type: TimedDespawn
+      lifetime: 0.5
--- a/Resources/Prototypes/_White/Entities/Cult/Items/blood_barrage.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/blood_barrage.yml
@@ -24,6 +24,8 @@
    proto: BloodBolt
    capacity: 25
  - type: BoltBarrage
+  - type: DeleteOnDropAttempt
+    message: bolt-barrage-component-extra-message
  - type: GiftIgnore
  - type: CultItem
    canPickUp: false
--- a/Resources/Prototypes/_White/Entities/Cult/Items/stun_hand.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/stun_hand.yml
@@ -0,0 +1,34 @@
+- type: entity
+  parent: BaseItem
+  id: StunHand
+  name: stunning aura
+  description: Will stun and mute a weak-minded victim on hit.
+  components:
+  - type: Sprite
+    sprite: White/Cult/Entities/stun.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: White/Cult/Entities/stun.rsi
+  - type: MeleeWeapon
+    canHeavyAttack: false
+    canAttackSelf: false
+    canMiss: false
+    attackWhitelist:
+      components:
+      - StatusEffects
+    attackBlacklist:
+      components:
+      - Cultist
+      - Construct
+    wideAnimationRotation: 180
+    damage:
+      types:
+        Heat: 0
+  - type: CultStunHand
+  - type: DeleteOnDropAttempt
+    message: cult-stun-component-extra-message
+  - type: Unremoveable
+    deleteOnDrop: true
+  - type: CultItem
+    canPickUp: false
--- a/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Items/tome_craft.yml
@@ -187,6 +187,16 @@
    - type: Stack
      count: 1

+- type: entity
+  parent: CultRunicMetal
+  id: CultRunicMetal4
+  suffix: 4
+  components:
+    - type: Sprite
+      state: runic
+    - type: Stack
+      count: 4
+
 - type: entity
  parent: CultRunicMetal
  id: CultRunicMetal20
--- a/Resources/Prototypes/_White/Entities/Cult/Runes/cult_runes.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Runes/cult_runes.yml
@@ -165,4 +165,5 @@
  - type: CultRuneBase
    invokePhrase: "TOK-LYR RQA-NAP G'OLT-ULOFT!"
    cultistGatheringRange: 1.5
+    invokeChatType: Speak
  - type: CultRuneApocalypse
--- a/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/Weapons/blood_spear.yml
@@ -19,7 +19,7 @@
            - 0.30,0.40
        density: 20
        mask:
-        - ItemMask
+        - BulletImpassable
        restitution: 0.3
        friction: 0.2
  - type: Sharp
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
@@ -65,7 +65,7 @@
      types:
        Heat: 18
  - type: Item
-    size: Normal
+    size: Ginormous
    sprite: White/Objects/Weapons/Chaplain/godhand.rsi
  - type: Unremoveable
    deleteOnDrop: true
--- a/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml
+++ b/Resources/Prototypes/_White/Mood/generic_negativeEffects.yml
@@ -1,51 +1,43 @@
 - type: moodEffect
  id: Handcuffed
-  desc: "Кажется мои выходки кто-то заметил."
+  description: "Кажется мои выходки кто-то заметил."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false

 - type: moodEffect
  id: Suffocating
-  desc: "НЕ.. МОГУ... ДЫШАТЬ..."
+  description: "НЕ.. МОГУ... ДЫШАТЬ..."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  timeout: 1

 - type: moodEffect
  id: OnFire
-  desc: "ГОРЮ!!!"
+  description: "ГОРЮ!!!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false

 - type: moodEffect
  id: Creampied
-  desc: "Меня окремили. На вкус как пирог."
+  description: "Меня окремили. На вкус как пирог."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 3

 - type: moodEffect
  id: MobSlipped
-  desc: "Опять поскальзываюсь. Надо быть аккуратней."
+  description: "Опять поскальзываюсь. Надо быть аккуратней."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 3

 - type: moodEffect
  id: MobVomit
-  desc: "Меня только что вырвало. Мерзость."
+  description: "Меня только что вырвало. Мерзость."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  timeout: 8

 - type: moodEffect
  id: MobLowPressure
-  desc: "Меня сейчас разорвёт наружу!"
+  description: "Меня сейчас разорвёт наружу!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false

 - type: moodEffect
  id: MobHighPressure
-  desc: "На меня оказывается огромное давление!"
+  description: "На меня оказывается огромное давление!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
--- a/Resources/Prototypes/_White/Mood/generic_positveEffects.yml
+++ b/Resources/Prototypes/_White/Mood/generic_positveEffects.yml
@@ -1,66 +1,66 @@
 - type: moodEffect
  id: BeingHugged
-  desc: "Обнимашки - круто."
+  description: "Обнимашки - круто."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 2

 - type: moodEffect
  id: BeingPet
-  desc: "Меня погладили!"
+  description: "Меня погладили!"
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 2

 - type: moodEffect
  id: ArcadePlay
-  desc: "Я весело поиграл в интересную аркаду."
+  description: "Я весело поиграл в интересную аркаду."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: GotBlessed
-  desc: "Меня благословили."
+  description: "Меня благословили."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: PetAnimal
-  desc: "Животные такие милые! Не могу перестать их гладить!"
+  description: "Животные такие милые! Не могу перестать их гладить!"
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: true
+  positive: true
  timeout: 5

 - type: moodEffect
  id: SavedLife
-  desc: "Так приятно спасать чью-то жизнь."
+  description: "Так приятно спасать чью-то жизнь."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  timeout: 8

 - type: moodEffect
  id: TraitorFocused #Used for traitors to boost their goals completion.
-  desc: "У меня есть цель, и я добьюсь её, во что бы то ни стало!"
+  description: "У меня есть цель, и я добьюсь её, во что бы то ни стало!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: RevolutionFocused #Used for revolution
-  desc: "СЛАВА РЕВОЛЮЦИИ!!!"
+  description: "СЛАВА РЕВОЛЮЦИИ!!!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: CultFocused
-  desc: "Знаю правду, славим великого!"
+  description: "Знаю правду, славим великого!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: true
+  positive: true

 - type: moodEffect
  id: Stimulator
-  desc: "Я ЧУВСТВУЮ ЭТО, В МОЕЙ КРОВИ НАХОДИТСЯ ЧТО-ТО НЕОБЫЧНОЕ!!"
+  description: "Я ЧУВСТВУЮ ЭТО, В МОЕЙ КРОВИ НАХОДИТСЯ ЧТО-ТО НЕОБЫЧНОЕ!!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
-  timeout: 2
+  positive: true
+  timeout: 2
--- a/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
+++ b/Resources/Prototypes/_White/Mood/moodEffects_needs.yml
@@ -1,87 +1,78 @@
 #Hunger
 - type: moodEffect
  id: HungerOverfed
-  desc: "Во мне столько жира..."
+  description: "Во мне столько жира..."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Hunger"

 - type: moodEffect
  id: HungerOkay
-  desc: "Мой желудок полон!"
+  description: "Мой желудок полон!"
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  category: "Hunger"

 - type: moodEffect
  id: HungerPeckish
-  desc: "Хочу есть."
+  description: "Хочу есть."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Hunger"

 - type: moodEffect
  id: HungerStarving
-  desc: "Голодаю!"
+  description: "Голодаю!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false
  category: "Hunger"

 #Thirst
 - type: moodEffect
  id: ThirstOverHydrated
-  desc: "СЛИШКОМ МНОГО ВОДЫ..."
+  description: "СЛИШКОМ МНОГО ВОДЫ..."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Thirst"

 - type: moodEffect
  id: ThirstOkay
-  desc: "Не хочу пить."
+  description: "Не хочу пить."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: true
+  positive: true
  category: "Thirst"

 - type: moodEffect
  id: ThirstThirsty
-  desc: "Хочу пить."
+  description: "Хочу пить."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Thirst"

 - type: moodEffect
  id: ThirstParched
-  desc: "ВОДЫ!"
+  description: "ВОДЫ!"
  moodChange: enum.MoodChangeLevel.Big
-  positiveEffect: false
  category: "Thirst"

 #Health
 - type: moodEffect
  id: HealthNoDamage
-  desc: "Чувствую себя лишённым боли."
+  description: "Чувствую себя лишённым боли."
  moodChange: enum.MoodChangeLevel.None
-  positiveEffect: true
+  positive: true
  hidden: true
  category: "Health"

 - type: moodEffect
  id: HealthLightDamage
-  desc: "Мои ссадины жгутся."
+  description: "Мои ссадины жгутся."
  moodChange: enum.MoodChangeLevel.Small
-  positiveEffect: false
  category: "Health"

 - type: moodEffect
  id: HealthSevereDamage
-  desc: "Сильная боль пронзает меня."
+  description: "Сильная боль пронзает меня."
  moodChange: enum.MoodChangeLevel.Medium
-  positiveEffect: false
  category: "Health"

 - type: moodEffect
  id: HealthHeavyDamage
-  desc: "Агония гложет мою душу!"
+  description: "Агония гложет мою душу!"
  moodChange: enum.MoodChangeLevel.Large
-  positiveEffect: false
  category: "Health"
--- a/Resources/Prototypes/_White/RCD/categories.yml
+++ b/Resources/Prototypes/_White/RCD/categories.yml
@@ -0,0 +1,43 @@
+- type: rcdCategory
+  id: WallsAndFlooring
+  spritePath: /Textures/Interface/Radial/RCD/walls_and_flooring.png
+
+- type: rcdCategory
+  id: WindowsAndGrilles
+  spritePath: /Textures/Interface/Radial/RCD/windows_and_grilles.png
+
+- type: rcdCategory
+  id: Airlocks
+  spritePath: /Textures/Interface/Radial/RCD/airlocks.png
+
+- type: rcdCategory
+  id: Electrical
+  spritePath: /Textures/Interface/Radial/RCD/multicoil.png
+
+- type: rcdCategory
+  id: Lighting
+  spritePath: /Textures/Interface/Radial/RCD/lighting.png
+
+- type: rcdCategory
+  id: Pipes
+  spritePath:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeFourway
+
+- type: rcdCategory
+  id: GasDevices
+  spritePath:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+
+- type: rcdCategory
+  id: DisposalPipes
+  spritePath:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: conpipe-t
+
+- type: rcdCategory
+  id: DisposalUnits
+  spritePath:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: disposal
--- a/Resources/Prototypes/_White/RPD/rpd.yml
+++ b/Resources/Prototypes/_White/RPD/rpd.yml
@@ -0,0 +1,482 @@
+# Pipes
+
+- type: rcd
+  id: PipeStraight
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeStraight
+  mode: ConstructObject
+  prototype: GasPipeStraight
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeBend
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeBend
+  mode: ConstructObject
+  prototype: GasPipeBend
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeTJunction
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeTJunction
+  mode: ConstructObject
+  prototype: GasPipeTJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PipeFourway
+  category: Pipes
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pipe.rsi
+    state: pipeFourway
+  mode: ConstructObject
+  prototype: GasPipeFourway
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Gas devices
+
+- type: rcd
+  id: GasCanisterPort
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gascanisterport.rsi
+    state: gasCanisterPort
+  mode: ConstructObject
+  prototype: GasPort
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasFilter
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gasfilter.rsi
+    state: gasFilter
+  mode: ConstructObject
+  prototype: GasFilter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasMixer
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/gasmixer.rsi
+    state: gasMixer
+  mode: ConstructObject
+  prototype: GasMixer
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasOutletInjector
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/outletinjector.rsi
+    state: injector
+  mode: ConstructObject
+  prototype: GasOutletInjector
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasPressurePump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpPressure
+  mode: ConstructObject
+  prototype: GasPressurePump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVolumePump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpVolume
+  mode: ConstructObject
+  prototype: GasVolumePump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpManualValve
+  mode: ConstructObject
+  prototype: GasValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: SignalControlledValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pump.rsi
+    state: pumpDigitalValve
+  mode: ConstructObject
+  prototype: SignalControlledValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: PressureControlledValve
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/pneumaticvalve.rsi
+    state: off
+  mode: ConstructObject
+  prototype: PressureControlledValve
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVentScrubber
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/scrubber.rsi
+    state: scrub_off
+  mode: ConstructObject
+  prototype: GasVentScrubber
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasVentPump
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+  mode: ConstructObject
+  prototype: GasVentPump
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: GasPassiveVent
+  category: GasDevices
+  sprite:
+    sprite: /Textures/Structures/Piping/Atmospherics/vent.rsi
+    state: vent_off
+  mode: ConstructObject
+  prototype: GasPassiveVent
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Disposal pipes
+
+- type: rcd
+  id: DisposalPipe
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-s
+  mode: ConstructObject
+  prototype: DisposalPipe
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalBend
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-c
+  mode: ConstructObject
+  prototype: DisposalBend
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalJunction
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1
+  mode: ConstructObject
+  prototype: DisposalJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalJunctionFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1
+  mode: ConstructObject
+  prototype: DisposalJunctionFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalYJunction
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-y
+  mode: ConstructObject
+  prototype: DisposalYJunction
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalRouter
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j1s
+  mode: ConstructObject
+  prototype: DisposalRouter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalRouterFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-j2s
+  mode: ConstructObject
+  prototype: DisposalRouterFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalTagger
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: pipe-tagger
+  mode: ConstructObject
+  prototype: DisposalTagger
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalSignalRouter
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: signal-router
+  mode: ConstructObject
+  prototype: DisposalSignalRouter
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalSignalRouterFlipped
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: signal-router-flipped
+  mode: ConstructObject
+  prototype: DisposalSignalRouterFlipped
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+- type: rcd
+  id: DisposalTrunk
+  category: DisposalPipes
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: conpipe-t
+  mode: ConstructObject
+  prototype: DisposalTrunk
+  cost: 1
+  delay: 0
+  collisionMask: InteractImpassable
+  rules:
+  - MustBuildOnSubfloor
+  rotation: User
+  fx: EffectRCDConstruct0
+
+# Disposal units
+
+- type: rcd
+  id: DisposalUnit
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: disposal
+  mode: ConstructObject
+  prototype: DisposalUnit
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: MailingUnit
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Piping/disposal.rsi
+    state: mailing
+  mode: ConstructObject
+  prototype: MailingUnit
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
+- type: rcd
+  id: ToiletEmpty
+  category: DisposalUnits
+  sprite:
+    sprite: /Textures/Structures/Furniture/toilet.rsi
+    state: condisposal
+  mode: ConstructObject
+  prototype: ToiletEmpty
+  cost: 2
+  delay: 1
+  collisionMask: InteractImpassable
+  rotation: User
+  fx: EffectRCDConstruct1
+
--- a/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
+++ b/Resources/Prototypes/_White/Recipes/lathe_recipes.yml
@@ -166,4 +166,20 @@
  result: ShinanoGrenadeBeanbag
  completetime: 3
  materials:
-     Steel: 800
+     Steel: 800
+
+- type: latheRecipe
+  id: RapidPipeDispenserRecipe
+  result: RapidPipeDispenser
+  completetime: 1
+  materials:
+    Steel: 300
+    Glass: 300
+
+- type: latheRecipe
+  id: RCDRecipe
+  result: RCD
+  completetime: 1
+  materials:
+    Steel: 300
+    Glass: 300
--- a/Resources/Prototypes/_White/Wizard/magic_items.yml
+++ b/Resources/Prototypes/_White/Wizard/magic_items.yml
@@ -133,5 +133,7 @@
  - type: BasicEntityAmmoProvider
    proto: ArcaneBolt
    capacity: 30
+  - type: DeleteOnDropAttempt
+    message: bolt-barrage-component-extra-message
  - type: BoltBarrage
  - type: GiftIgnore
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -1323,6 +1323,12 @@
 - type: Tag
  id: Wrench

+- type: Tag
+  id: DrinkGlass
+
+- type: Tag
+  id: Ingredient
+
 - type: Tag
  id: Wringer

--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/base.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-0.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-1.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-2.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-3.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-4.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-5.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/chem-6.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/closed.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/locked.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/meta.json
@@ -0,0 +1,47 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "chem-0"
+    },
+    {
+      "name": "chem-1"
+    },
+    {
+      "name": "chem-2"
+    },
+    {
+      "name": "chem-3"
+    },
+    {
+      "name": "chem-4"
+    },
+    {
+      "name": "chem-5"
+    },
+    {
+      "name": "chem-6"
+    }
+  ]
+}
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/open.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Medical/chemistry.rsi/unlocked.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-0.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-1.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-10.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-11.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-12.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-2.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-3.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-4.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-5.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-6.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-7.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-8.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/bar-9.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/base.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/bar.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "bar-0"
+    },
+    {
+      "name": "bar-1"
+    },
+    {
+      "name": "bar-2"
+    },
+    {
+      "name": "bar-3"
+    },
+    {
+      "name": "bar-4"
+    },
+    {
+      "name": "bar-5"
+    },
+    {
+      "name": "bar-6"
+    },
+    {
+      "name": "bar-7"
+    },
+    {
+      "name": "bar-8"
+    },
+    {
+      "name": "bar-9"
+    },
+    {
+      "name": "bar-10"
+    },
+    {
+      "name": "bar-11"
+    },
+    {
+      "name": "bar-12"
+    }
+  ]
+}
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/base.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-0.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-1.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-10.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-11.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-12.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-2.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-3.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-4.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-5.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-6.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-7.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-8.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/kitchen-9.png
--- a/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/Departments/Service/kitchen.rsi/meta.json
@@ -0,0 +1,53 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "kitchen-0"
+    },
+    {
+      "name": "kitchen-1"
+    },
+    {
+      "name": "kitchen-2"
+    },
+    {
+      "name": "kitchen-3"
+    },
+    {
+      "name": "kitchen-4"
+    },
+    {
+      "name": "kitchen-5"
+    },
+    {
+      "name": "kitchen-6"
+    },
+    {
+      "name": "kitchen-7"
+    },
+    {
+      "name": "kitchen-8"
+    },
+    {
+      "name": "kitchen-9"
+    },
+    {
+      "name": "kitchen-10"
+    },
+    {
+      "name": "kitchen-11"
+    },
+    {
+      "name": "kitchen-12"
+    }
+  ]
+}
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/base.png
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/closed.png
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/locked.png
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/open.png
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/rbase.png
--- a/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/glass.rsi/unlocked.png
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/base.png
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/closed.png
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/locked.png
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by Kezu",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "rbase"
+    },
+    {
+      "name": "locked"
+    },
+    {
+      "name": "unlocked"
+    },
+    {
+      "name": "closed"
+    },
+    {
+      "name": "open"
+    }
+  ]
+}
--- a/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
+++ b/Resources/Textures/Structures/Storage/Shelfs/metal.rsi/open.png
--- a/Show More
+++ b/Show More