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

# Conflicts:
#	Resources/Prototypes/Recipes/Lathes/security.yml

Resources/Changelog/ChangelogWhite.yml

@@ -2411,3 +2411,155 @@
   id: 202
   time: '2024-03-17T22:20:34.0000000+00:00'
   url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/217
+- author: ThereDrD
+  changes:
+  - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u043E\u043A\u0441\
+      \u0438\u0434 \u0430\u0437\u043E\u0442\u0430, \u0411\u0417 \u0438 \u043F\u043B\
+      \u044E\u043E\u043A\u0441\u0438\u0443\u043C \u0432 \u043A\u0430\u0440\u0433\u043E\
+      -\u043A\u043E\u043D\u0441\u043E\u043B\u044C."
+    type: Add
+  id: 203
+  time: '2024-03-20T19:46:26.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/224
+- author: Valtos
+  changes:
+  - message: "\u0412\u043E\u0437\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u043D\
+      \u043E\u0432\u043E\u0433\u043E \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\
+      \u0441\u0430 \u0441 \u0444\u0438\u043A\u0441\u043E\u043C \u043D\u0435\u0434\u043E\
+      \u0447\u0451\u0442\u043E\u0432."
+    type: Add
+  id: 204
+  time: '2024-03-20T19:54:45.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/108
+- author: Aviu
+  changes:
+  - message: "\u041E\u0442 \u043C\u0435\u0442\u0430 \u0438 \u044D\u0444\u0435\u0434\
+      \u0440\u0438\u043D\u0430 \u0442\u0435\u043F\u0435\u0440\u044C \u043C\u0443\u0442\
+      \u043D\u0435\u0435\u0442 \u0432 \u0433\u043B\u0430\u0437\u0430\u0445."
+    type: Tweak
+  id: 205
+  time: '2024-03-20T19:53:45.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/196
+- author: Aviu
+  changes:
+  - message: "\u041F\u0440\u0438 \u0442\u0440\u0430\u043D\u0441\u0444\u043E\u0440\u043C\
+      \u0430\u0446\u0438\u0438 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430\
+      \ \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u0432\u044B\u043F\u0430\
+      \u0434\u0430\u044E\u0442 \u0432\u0435\u0449\u0438 \u0438\u0437 \u0441\u043B\u043E\
+      \u0442\u043E\u0432 \u043A\u0430\u0440\u043C\u0430\u043D\u043E\u0432, \u0436\u0438\
+      \u043B\u0435\u0442\u0430 \u0438 \u041F\u0414\u0410."
+    type: Fix
+  - message: "\u041F\u0440\u0438 \u0442\u0440\u0430\u043D\u0441\u0444\u043E\u0440\u043C\
+      \u0430\u0446\u0438\u0438 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430\
+      \ \u0431\u043E\u0440\u0435\u0440 \u0431\u043E\u043B\u044C\u0448\u0435 \u043D\
+      \u0435 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442\u0441\u044F\
+      \ \u0432 \u0434\u0440\u0443\u0433\u043E\u0435 \u0438\u0437\u043C\u0435\u0440\
+      \u0435\u043D\u0438\u0435."
+    type: Fix
+  - message: "\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F\
+      \ \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0436\
+      \u0430\u043B\u043E \u0442\u0440\u0430\u043D\u0441\u0444\u043E\u0440\u043C\u0430\
+      \u0446\u0438\u0438 \u043D\u0430 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\
+      \u0438\u0438."
+    type: Fix
+  - message: "\u0422\u0440\u0430\u043D\u0441\u0444\u043E\u0440\u043C\u0430\u0446\u0438\
+      \u044F \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E \u0440\
+      \u0430\u0431\u043E\u0442\u0430\u044E\u0442 \u043F\u0440\u0438 \u0442\u0430\u0441\
+      \u043A\u0430\u043D\u0438\u0438 \u043D\u0430 \u0440\u0443\u043A\u0430\u0445."
+    type: Fix
+  - message: "\u0413\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0443 \u0431\u043E\u043B\
+      \u044C\u0448\u0435 \u043D\u0435\u043B\u044C\u0437\u044F \u0432\u044B\u0440\u0435\
+      \u0437\u0430\u0442\u044C \u043E\u0440\u0433\u0430\u043D\u044B."
+    type: Fix
+  - message: "\u041E\u0431\u0440\u0435\u0437 \u0431\u043E\u043B\u044C\u0448\u0435\
+      \ \u043D\u0435 \u043F\u043E\u043B\u0443\u0447\u0430\u0435\u0442 \u043C\u0430\
+      \u0433\u0438\u0447\u0435\u0441\u043A\u0438\u043C \u043E\u0431\u0440\u0430\u0437\
+      \u043E\u043C \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u043D\u0443\u044E \u0441\
+      \u043A\u043E\u0440\u043E\u0441\u0442\u0440\u0435\u043B\u044C\u043D\u043E\u0441\
+      \u0442\u044C."
+    type: Tweak
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D \u0440\u0430\u0437\u043C\
+      \u0435\u0440 \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u043E\u0439 \u043E\u0434\
+      \u0435\u0436\u0434\u044B \u0438 \u0436\u0438\u043B\u0435\u0442\u043E\u0432."
+    type: Tweak
+  - message: "\u0423\u0431\u0440\u0430\u043D \u0438\u043C\u043F\u043B\u0430\u043D\u0442\
+      \ \u0441\u0432\u0435\u0442\u043E\u0432\u043E\u0433\u043E \u043A\u043E\u043F\u044C\
+      \u044F \u0438\u0437 \u0430\u043F\u043B\u0438\u043D\u043A\u0430 \u043E\u043F\u0435\
+      \u0440\u0430\u0442\u0438\u0432\u043D\u0438\u043A\u043E\u0432."
+    type: Tweak
+  - message: "\u041D\u0435\u043C\u043D\u043E\u0433\u043E \u0443\u0432\u0435\u043B\u0438\
+      \u0447\u0435\u043D\u044B \u0440\u0435\u0437\u0438\u0441\u0442\u044B \u0443 \u0431\
+      \u0440\u043E\u043D\u0438 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430\
+      ."
+    type: Tweak
+  - message: "\u0422\u0440\u0430\u043D\u043A\u0432\u0438\u043B\u0438\u0437\u0430\u0442\
+      \u043E\u0440\u044B \u0442\u0435\u043F\u0435\u0440\u044C \u043A\u043B\u0430\u0434\
+      \u0443\u0442 \u0441 3\u0445 \u043F\u043E\u043F\u0430\u0434\u0430\u043D\u0438\
+      \u0439, \u043D\u043E \u0438\u0437\u0433\u043E\u0442\u0430\u0432\u043B\u0438\u0432\
+      \u0430\u044E\u0442\u0441\u044F \u0437\u0430 \u043C\u0435\u043D\u044C\u0448\u0435\
+      \u0435 \u043A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043C\u0430\
+      \u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432."
+    type: Tweak
+  - message: "\u0423\u043C\u0435\u043D\u044C\u0448\u0435\u043D\u043E \u0432\u0440\u0435\
+      \u043C\u044F \u0441\u0442\u0430\u043D\u0430 \u0443 \u0442\u0435\u043D\u0442\u0430\
+      \u043A\u043B\u0438 \u0433\u0435\u043D\u043E\u043A\u0440\u0430\u0434\u0430."
+    type: Tweak
+  - message: "\u0412\u0437\u0440\u044B\u0432 \u0442\u043E\u043F\u043B\u0438\u0432\u043D\
+      \u044B\u0445 \u0431\u0430\u043A\u043E\u0432 \u0431\u043E\u043B\u044C\u0448\u0435\
+      \ \u043D\u0435 \u043F\u0440\u043E\u0431\u0438\u0432\u0430\u0435\u0442 \u043F\
+      \u043E\u043B."
+    type: Tweak
+  - message: "\u041E\u0442\u043A\u043B\u044E\u0447\u0435\u043D \u0430\u0441\u043F\u0435\
+      \u043A\u0442 \u0448\u0435\u043F\u043E\u0442\u0430."
+    type: Remove
+  id: 206
+  time: '2024-03-20T19:54:07.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/213
+- author: Aviu
+  changes:
+  - message: "\u0424\u0435\u043B\u0438\u043D\u0438\u0434\u043E\u0432 \u0442\u0435\u043F\
+      \u0435\u0440\u044C \u043C\u043E\u0436\u043D\u043E \u0433\u043B\u0430\u0434\u0438\
+      \u0442\u044C."
+    type: Add
+  id: 207
+  time: '2024-03-20T19:54:18.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/219
+- author: Aviu
+  changes:
+  - message: "\u0424\u0438\u043A\u0441 \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\
+      , \u043D\u0435 \u043F\u043E\u043B\u0443\u0447\u0430\u044E\u0449\u0438\u0445\
+      \ \u0441\u0442\u0440\u0443\u043A\u0442\u0443\u0440\u043D\u044B\u0439 \u0443\u0440\
+      \u043E\u043D."
+    type: Fix
+  id: 208
+  time: '2024-03-20T19:54:26.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/215
+- author: CaypenNow
+  changes:
+  - message: "\u0410\u0442\u043C\u043E\u0441 \u0433\u043E\u043B\u043E\u043F\u0440\u043E\
+      \u0435\u043A\u0442\u043E\u0440\u044B \u043F\u0435\u0440\u0435\u0434\u0435\u043B\
+      \u0430\u043D\u044B!"
+    type: Add
+  id: 209
+  time: '2024-03-20T23:44:18.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/225
+- author: Remuchi
+  changes:
+  - message: "\u0412\u043E\u0437\u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u0432\
+      \u0441\u0442\u0430\u0432\u0430\u0442\u044C \u0438 \u043B\u043E\u0436\u0438\u0442\
+      \u044C\u0441\u044F \u043D\u0430 \u043A\u043D\u043E\u043F\u043A\u0443 U. \u041C\
+      \u043E\u0436\u043D\u043E \u043F\u043E\u043C\u0435\u043D\u044F\u0442\u044C \u0432\
+      \ \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430\u0445"
+    type: Add
+  - message: "\u0421\u043D\u0430\u0440\u044F\u0434\u044B \u0442\u0435\u043F\u0435\u0440\
+      \u044C \u043F\u0440\u043E\u0445\u043E\u0434\u044F\u0442 \u0447\u0435\u0440\u0435\
+      \u0437 \u043B\u0435\u0436\u0430\u0447\u0438\u0445 \u0441\u0443\u0449\u0435\u0441\
+      \u0442\u0432. \u0415\u0441\u043B\u0438 \u0446\u0435\u043B\u0438\u0442\u044C\u0441\
+      \u044F \u043C\u044B\u0448\u043A\u043E\u0439 \u043F\u043E \u043D\u0438\u043C\
+      , \u0442\u043E \u0441\u043D\u0430\u0440\u044F\u0434\u044B \u0431\u0443\u0434\
+      \u0443\u0442 \u043F\u043E\u043F\u0430\u0434\u0430\u0442\u044C"
+    type: Add
+  id: 210
+  time: '2024-03-21T02:54:11.0000000+00:00'
+  url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/195

Resources/Locale/en-US/chemistry/components/patch-component.ftl

@@ -0,0 +1,10 @@
+## Entity
+
+patch-component-target-getting-injected = Someone trying to put a patch on you
+patch-component-injecting-user = You are trying to put a patch on {$target}.
+patch-component-inject-other-message = You put a patch on {$other}.
+patch-component-inject-self-message = You put a patch on yourself.
+patch-component-empty-message = It's empty!
+patch-component-feel-prick-message = You feel a little sting
+patch-cant-inject = Can't put a patch on {$target}!
+patch-cant-inject-now = Can't put a patch now

Resources/Locale/en-US/escape-menu/ui/options-menu.ftl

@@ -134,6 +134,7 @@ ui-options-function-examine-entity = Examine
 ui-options-function-swap-hands = Swap hands
 ui-options-function-move-stored-item = Move stored item
 ui-options-function-rotate-stored-item = Rotate stored item
+ui-options-function-lie-down = Lie down/Get up
 ui-options-static-storage-ui = Lock storage window to hotbar
 
 ui-options-function-smart-equip-backpack = Smart-equip to backpack

Resources/Locale/en-US/reagents/meta/medicine.ftl

@@ -129,3 +129,13 @@ reagent-desc-necrosol = A necrotic substance that seems to be able to heal froze
 
 reagent-name-aloxadone = aloxadone
 reagent-desc-aloxadone = A cryogenics chemical. Used to treat severe third degree burns via regeneration of the burnt tissue. Works regardless of the patient being alive or dead.
+
+reagent-name-synthflesh = synthflesh
+reagent-desc-synthflesh = A slightly toxic medicine capable of healing both bruises and burns.
+
+reagent-name-silversulfadiazine = silver sulfadiazine
+reagent-desc-silversulfadiazine = This compound with antibacterial properties is administered for the treatment of individuals suffering from burns.
+
+reagent-name-stypticpowder = styptic powder
+reagent-desc-stypticpowder = Aluminum sulfate styptic powder aids in managing bleeding and promoting the healing of bodily injuries.
+

Resources/Locale/en-US/reagents/meta/physical-desc.ftl

@@ -96,3 +96,4 @@ reagent-physical-desc-alkaline = alkaline
 reagent-physical-desc-reflective = reflective
 reagent-physical-desc-holy = holy
 reagent-physical-desc-slimy = slimy
+reagent-physical-desc-gelatinous = gelatinous

Resources/Locale/en-US/white/magnetic-gloves.ftl

@@ -0,0 +1,10 @@
+maggloves-ready = Gloves are ready to use.
+maggloves-ready-in = Gloves will be ready in
+research-technology-lightweight-magnets = Lightweight Magnets
+research-technology-advanced-grips = Advanced Grips
+maggloves-not-ready = The gloves are not ready yet
+maggloves-already-active = The gloves are already active
+maggloves-enabled-till = The gloves are enabled for
+maggloves-cant-strip = Magnetic gloves are strongly attached to the item
+maggloves-activated = Magnetic gloves activated
+maggloves-deactivated = Magnetic gloves deactivated

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

@@ -1,4 +1,4 @@
-chat-manager-changeling-channel-name = УЛЕЙ
+chat-manager-changeling-channel-name = УЛЕЙ
 hud-chatbox-select-channel-Changeling = Улей
 chat-manager-send-changeling-chat-wrap-message = [bold]\[УЛЕЙ\][/bold] [font size=13][italic][bold]{ $player }[/bold] шипит, "{ $message }"[/italic][/font]
 
@@ -21,6 +21,7 @@ changeling-popup-cant-sting = Мы не можем ужалить это!
 changeling-popup-transform-no-dna = У нас нет поглощенного ДНК!
 changeling-popup-cant-transform-someone = Мы не можем превратит это!
 changeling-popup-transform-not-effective = Вирус перевоплощения не сработал!
+changeling-popup-transform-too-far = Цель слишком далеко!
 
 changeling-popup-already-lesser-form = Мы уже заняли примитивную форму жизни!
 

Resources/Locale/ru-RU/White/magnetic-gloves.ftl

@@ -0,0 +1,19 @@
+ent-ClothingHandsGlovesMagnetic = магнитные перчатки
+    .desc = перчатки оснащенные специальными магнитными захватами, что позволяют вещам оставаться в ваших руках после свободного падения.
+ent-ClothingHandsGlovesMagneticAdvanced = продвинутые магнитные перчатки
+    .desc = продвинутые магнитные перчатки оснащенные более мощными захватами, что дополнительно предотвращают возможность разоружения и кражи из рук носителя.
+ent-ActionToggleMagneticGloves = активировать магнитные перчатки
+    .desc = Предотвращает выпадение предметов из рук при падении.
+ent-ActionToggleMagneticGlovesAdvanced = активировать продвинутые магнитные перчатки
+    .desc = Предотвращает выпадение предметов из рук при падении и предотвращает возможность разоружения и кражи из рук носителя.
+
+maggloves-ready = Перчатки готовы к использованию
+maggloves-ready-in = Перчатки будут готовы к использованию через
+research-technology-lightweight-magnets = Облегчённые магниты
+research-technology-advanced-grips = Продвинутые захваты
+maggloves-not-ready = Перчатки не готовы к использованию
+maggloves-already-active = Перчатки уже активированы
+maggloves-enabled-till = Перчатки будут активны еще
+maggloves-cant-strip = Магнитные перчатки надежно удерживают предмет
+maggloves-activated = Магнитные перчатки включены
+maggloves-deactivated = Магнитные перчатки выключены

Resources/Locale/ru-RU/chemistry/components/patch-component.ftl

@@ -0,0 +1,13 @@
+## Entity
+
+patch-component-injecting-user = Вы приклеиваете пластырь.
+patch-component-inject-other-message = Вы приклеили пластырь к {$other}.
+patch-component-inject-self-message = Вы наложили на себя пластырь.
+patch-component-empty-message = Пластырь пуст!
+patch-component-feel-prick-message = Вы чувствуете небольшое жжение.
+patch-cant-inject = Вы не моежете прикрепить пластырь к {$target}!
+patch-cant-inject-now = Вы не можете наложить пластырь сейчас
+
+## mob-inject doafter messages
+
+injector-component-injecting-target = {CAPITALIZE(THE($user))} пытается приклеить пластырь на вас!

Resources/Locale/ru-RU/escape-menu/ui/escape-menu.ftl

@@ -1,6 +1,6 @@
 ### EscapeMenu.xaml
 
-ui-escape-title = Esc Меню
+ui-escape-title = Меню
 ui-escape-options = Настройки
 ui-escape-rules = Правила
 ui-escape-guidebook = Руководство

Resources/Locale/ru-RU/escape-menu/ui/options-menu.ftl

@@ -136,6 +136,7 @@ ui-options-function-examine-entity = Изучить
 ui-options-function-swap-hands = Поменять руки
 ui-options-function-move-stored-item = Переместить хранящийся объект
 ui-options-function-rotate-stored-item = Повернуть хранящийся объект
+ui-options-function-lie-down = Лечь/встать
 ui-options-static-storage-ui = Закрепить интерфейс хранилища на хотбаре
 
 ui-options-function-smart-equip-backpack = Умная экипировка в рюкзак

Resources/Locale/ru-RU/interaction/interaction-popup-component.ftl

@@ -61,3 +61,5 @@ petting-failure-medibot = Вы тянетесь погладить { $target },
 hugging-success-generic = Вы обнимаете { $target }.
 hugging-success-generic-others = { CAPITALIZE($user) } обнимает { $target }.
 hugging-success-generic-target = { CAPITALIZE($user) } обнимает вас.
+
+petting-success-cat-others = { CAPITALIZE($user) } гладит { $target } по { POSS-ADJ($target) } маленькой пушистой голове.

Resources/Locale/ru-RU/launcher/launcher-connecting.ftl

@@ -1,34 +1,19 @@
 ### Connecting dialog when you start up the game
-
-connecting-title = White Dream
-
-connecting-exit = Exit
-
-connecting-retry = Retry
-
-connecting-reconnect = Reconnect
-
-connecting-redial = Relaunch
-
-connecting-redial-wait = Please wait: { TOSTRING($time, "G3") }
-
-connecting-in-progress = Connecting to server...
-
-connecting-disconnected = Disconnected from server:
-
-connecting-tip = OH FUCK!
-
-connecting-version = 1.0
-
-connecting-fail-reason = Failed to connect to server:
-                         { $reason }
-
-connecting-state-NotConnecting = Not connecting
-
-connecting-state-ResolvingHost = Resolving host
-
-connecting-state-EstablishingConnection = Establishing connection
-
+connecting-title = Space Station 14
+connecting-exit = Выйти
+connecting-retry = Повторить
+connecting-reconnect = Переподключиться
+connecting-redial = Перезапустить
+connecting-redial-wait = Пожалуйста подождите: { TOSTRING($time, "G3") }
+connecting-in-progress = Подключение к серверу...
+connecting-disconnected = Отключен от сервера:
+connecting-tip = Не умирай!
+connecting-version = версия 0.1
+connecting-fail-reason =
+    Не удалось подключиться к серверу:
+        { $reason }
+connecting-state-NotConnecting = Не подключен
+connecting-state-ResolvingHost = Определение хоста
+connecting-state-EstablishingConnection = Установка соединения
 connecting-state-Handshake = Handshake
-
-connecting-state-Connected = Connected
+connecting-state-Connected = Подключен

Resources/Locale/ru-RU/locales-new/autotranslate-54.ftl

@@ -18,3 +18,9 @@ ent-BaseLightTube = { ent-BaseItem }
    .desc = { ent-BaseItem.desc }
 ent-HandheldHealthAnalyzerEmpty = { ent-HandheldHealthAnalyzer }
    .desc = { ent-HandheldHealthAnalyzer.desc }
+ent-Patch = пластырь
+    .desc = Медицинский пластырь, доставляющий реагенты сквозь кожу прямо в кровь.
+ent-BurnPatch = пластырь от ожогов
+    .desc = Инновационный пластырь для ускоренного лечения мелких ожогов.
+ent-BrutePatch = пластырь от ушибов
+    .desc = Компоненты пластыря непрерывно поступают к источнику боли, заживляя мелкие порезы и царапины.

Resources/Locale/ru-RU/locales-new/autotranslate-56.ftl

@@ -8,4 +8,7 @@ ent-ZipLock = зип пакет
   .desc = Предназначен для хранения улик.
 ent-BoxZipLocks = коробка зип пакетов
   .desc = Заполнена зип пакетами. Обрадуйте детектива!
-clumsy-gun-delete-log = В следствии неуклюжести во время стрельбы от { $prettyUser }, было удалено { $prettyGun }
+clumsy-gun-delete-log = В следствии неуклюжести во время стрельбы от { $prettyUser }, было удалено { $prettyGun }
+holoprojector-active-holo = Активные проекции: [color=fuchsia]{ $activeholo }[/color]
+holoprojector-uses-limit = Было использовано максимальное количество проекций!
+holoprojector-delete-signs = Все проекции были удалены!

Resources/Locale/ru-RU/preferences/humanoid-character-profile.ftl

@@ -2,7 +2,7 @@
 
 # Displayed in the Character prefs window
 humanoid-character-profile-summary =
-    Это { $name }. { $gender ->
+    { $name }. { $gender ->
         [male] Ему
         [female] Ей
         [epicene] Им

Resources/Locale/ru-RU/preferences/ui/character-setup-gui.ftl

@@ -1,4 +1,5 @@
 character-setup-gui-character-setup-label = Настройки персонажа
+character-setup-gui-character-setup-stats-button = Статистика
 character-setup-gui-character-setup-rules-button = Правила
 character-setup-gui-character-setup-save-button = Сохранить
 character-setup-gui-character-setup-close-button = Закрыть

Resources/Locale/ru-RU/reagents/meta/medicine.ftl

@@ -129,3 +129,12 @@ reagent-desc-necrosol = Некротическое вещество, котор
 
 reagent-name-aloxadone = алоксадон
 reagent-desc-aloxadone = Криогенное химическое вещество. Используется для лечения тяжёлых ожогов третьей степени путём регенерации обожжённых тканей. Работает независимо от того, жив пациент или мертв.
+
+reagent-name-synthflesh = синтеплоть
+reagent-desc-synthflesh = Токсичное вещество. Заживляет как ожоги, так и мелкие царапины.
+
+reagent-name-silversulfadiazine = сульфадиазин серебра
+reagent-desc-silversulfadiazine = Это соединение, обладающее антибактериальными свойствами, применяется для лечения ожогов.
+
+reagent-name-stypticpowder = кровоостанавливающая пудра
+reagent-desc-stypticpowder = Кровоостанавливающий порошок из сульфата алюминия помогает остановить кровотечение и способствует заживлению телесных повреждений.

Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl

@@ -96,3 +96,4 @@ reagent-physical-desc-alkaline = щелочное
 reagent-physical-desc-reflective = отражающее
 reagent-physical-desc-holy = святое
 reagent-physical-desc-slimy = слизкое
+reagent-physical-desc-gelatinous = желеобразное

Resources/Locale/ru-RU/voting/ui/vote-call-menu.ftl

@@ -8,7 +8,7 @@ ui-vote-create-button = Запустить
 ui-vote-type-timeout = Это голосование было недавно запущено ({ $remaining })
 # Unavailable text if a vote type has been disabled manually.
 ui-vote-type-not-available = Этот тип голосования был отключен
-ui-vote-fluff = На основе Robust™ СЗИ-НСД
+ui-vote-fluff = Ваши крики никто не услышит
 
 ## Vote menu command
 

Resources/Locale/ru-RU/white/changeling/changeling-entities.ftl

@@ -1,53 +1,53 @@
 changeling-ability-fleshmend = Восстановление тканей
-changeling-ability-fleshmend-desc = Быстро вылечить большую часть повреждений
+changeling-ability-fleshmend-desc = Быстро вылечить большую часть повреждений. Стоит 20 химикатов.
 
 changeling-ability-biodegrade = Биоразложение
-changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы.
+changeling-ability-biodegrade-desc = Растворяет наручники и прочие сдерживающие элементы. Стоит 30 химикатов.
 
 changeling-ability-eyesight = Аугментация зрения
 changeling-ability-eyesight-desc = Развивает переключаемое ночное зрение. Когда способность неактивна, защищает вас от флешек и яркого света, например от сварки.
 
 changeling-ability-dissonant-shriek = Диссонирующий вопль
-changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг.
+changeling-ability-dissonant-shriek-desc = Испускает заряд ЭМИ, который нарушает работу всего оборудования вокруг. Стоит 20 химикатов.
 
 changeling-ability-void-adaptation = Пустотная адаптация
 changeling-ability-void-adaptation-desc = Наделяет пассивной способностью, позволяющей сопротивляться холоду, низкому давлению и потребности в кислороде. При использовании замедляет регенерацию химикатов на 25%.
 
 changeling-ability-adrenaline-sacks = Мешки с адреналином
-changeling-ability-adrenaline-sacks-desc = Дает кратковременный прилив адреналина в крови.
+changeling-ability-adrenaline-sacks-desc = Дает кратковременный прилив адреналина в крови. Стоит 30 химикатов.
 
 changeling-ability-cryo-sting = Жало заморозки
-changeling-ability-cryo-sting-desc = Вводит в кровь цели химикаты, которые со временем превращают её кровь в лед.
+changeling-ability-cryo-sting-desc = Вводит в кровь цели химикаты, которые со временем превращают её кровь в лед. Стоит 15 химикатов.
 
 changeling-ability-hallucination-sting = Жало галлюцинаций
-changeling-ability-hallucination-sting-desc = Вводит в кровь цели химикаты, вызывающие сильные галлюцинации.
+changeling-ability-hallucination-sting-desc = Вводит в кровь цели химикаты, вызывающие сильные галлюцинации. Стоит 5 химикатов.
 
 changeling-ability-mute-sting = Жало безмолвия
-changeling-ability-mute-sting-desc = Вводит в кровь цели химикаты, заставляющие цель замолчать за короткий срок.
+changeling-ability-mute-sting-desc = Вводит в кровь цели химикаты, заставляющие цель замолчать за короткий срок. Стоит 20 химикатов.
 
 changeling-ability-blind-sting = Жало слепоты
-changeling-ability-blind-sting-desc = Вводит в кровь цели химикаты, заставляющие цель временно ослепнуть.
+changeling-ability-blind-sting-desc = Вводит в кровь цели химикаты, заставляющие цель временно ослепнуть. Стоит 25 химикатов.
 
 changeling-ability-transform-sting = Жало трансформации
-changeling-ability-transform-sting-desc = Вводит в кровь цели вирус, заставляющий её превратиться в другое существо.
+changeling-ability-transform-sting-desc = Вводит в кровь цели вирус, заставляющий её превратиться в другое существо. Стоит 50 химикатов.
 
 changeling-ability-extraction-sting = Жало извлечения
-changeling-ability-extraction-sting-desc = Безшумно и безопасно извлекает ДНК из цели.
+changeling-ability-extraction-sting-desc = Безшумно и безопасно извлекает ДНК из цели. Стоит 25 химикатов.
 
 changeling-ability-tentacle-arm = Рука-щупальце
-changeling-ability-tentacle-arm-desc = Превращает одну из рук в щупальце, способное притягивать людей или забирать вещи из их рук.
+changeling-ability-tentacle-arm-desc = Превращает одну из рук в щупальце, способное притягивать людей или забирать вещи из их рук. Стоит 10 химикатов.
 
 changeling-ability-changeling-armor = Хитиновая броня
-changeling-ability-changeling-armor-desc = Надувает тело, превращая его в крепкую хитиновую броню.
+changeling-ability-changeling-armor-desc = Надувает тело, превращая его в крепкую хитиновую броню. При использовании замедляет регенерацию химикатов на 25%. Стоит 20 химикатов.
 
 changeling-ability-changeling-shield = Органический щит
-changeling-ability-changeling-shield-desc = Превращает одну из рук в крепкий органический щит.
+changeling-ability-changeling-shield-desc = Превращает одну из рук в крепкий органический щит. Стоит 20 химикатов.
 
 changeling-ability-changeling-armblade = Рука-клинок
-changeling-ability-changeling-armblade-desc = Превращает одну из рук в клинок, созданный из костей и плоти.
+changeling-ability-changeling-armblade-desc = Превращает одну из рук в клинок, созданный из костей и плоти. Стоит 20 химикатов.
 
 changeling-ability-changeling-lesser-form = Примитивная форма
-changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников.
+changeling-ability-changeling-lesser-form-desc = Превращает в самую примитивную форму. Полезно для побега из наручников. Стоит 5 химикатов.
 
 ent-ActionChangelingShop = Эволюции
     .desc = Эволюционируйте и развивайтесь.
@@ -56,10 +56,10 @@ ent-ActionChangelingAbsorb = Поглотить
     .desc = Поглотить существо.
 
 ent-ActionChangelingTransform = Превращение
-    .desc = Превратиться в одну из поглощенных личностей.
+    .desc = Превратиться в одну из поглощенных личностей. Стоит 5 химикатов.
 
 ent-ActionChangelingRegenerate = Регенерация
-    .desc = Войти в регенерирующий стазис.
+    .desc = Войти в регенерирующий стазис. Стоит 15 химикатов.
 
 ent-OrganicShield = органический щит
     .desc = Большой щит из плоти.

Resources/Locale/ru-RU/white/join-queue/queue-screen.ftl

@@ -1,5 +1,4 @@
-queue-title = Очередь
 queue-quit = Выйти
-queue-position = Ваша позиция:
-queue-total = Всего в очереди:
+queue-position = Позиция в очереди
+queue-of = из
 queue-priority-join = Приоритетный вход

Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml

@@ -111,3 +111,33 @@
 #  cost: 15500
 #  category: Atmospherics
 #  group: market
+
+- type: cargoProduct
+  id: AtmosphericsNitrousOxide
+  icon:
+    sprite: Structures/Storage/canister.rsi
+    state: redws
+  product: NitrousOxideCanister
+  cost: 1300
+  category: Atmospherics
+  group: market
+
+- type: cargoProduct
+  id: AtmosphericsBZ
+  icon:
+    sprite: Structures/Storage/canister.rsi
+    state: purple
+  product: BZCanister
+  cost: 3500
+  category: Atmospherics
+  group: market
+
+- type: cargoProduct
+  id: AtmosphericsPluoxium
+  icon:
+    sprite: Structures/Storage/canister.rsi
+    state: darkblue
+  product: PluoxiumCanister
+  cost: 3500
+  category: Atmospherics
+  group: market

Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml

@@ -12,5 +12,8 @@
     SyringeBicaridine: 1
     SyringeDermaline: 1
     Eftpos: 2
+    Patch: 20
+    BrutePatch: 10
+    BurnPatch: 10
   emaggedInventory:
     SyringeEphedrine: 1

Resources/Prototypes/Damage/modifier_sets.yml

@@ -16,26 +16,23 @@
     Slash: 0.5
     Piercing: 0.5
     Shock: 1.2
-    Structural: 0.25
-  flatReductions:
-    Blunt: 10
-    Slash: 10
-    Piercing: 10
-    Heat: 10
-    Structural: 10
-
-- type: damageModifierSet
-  id: StructuralMetallic
-  coefficients:
-    Shock: 1.2
-    Heat: 1.2
     Structural: 0.5
   flatReductions:
     Blunt: 10
     Slash: 10
     Piercing: 10
     Heat: 10
-    Structural: 10
+
+- type: damageModifierSet
+  id: StructuralMetallic
+  coefficients:
+    Shock: 1.2
+    Heat: 1.2
+  flatReductions:
+    Blunt: 10
+    Slash: 10
+    Piercing: 10
+    Heat: 10
 
 - type: damageModifierSet
   id: Rock
@@ -113,7 +110,6 @@
     Slash: 5
     Piercing: 5
     Heat: 5
-    Structural: 5
 
 - type: damageModifierSet
   id: RGlass
@@ -123,13 +119,11 @@
     Piercing: 0.6
     Heat: 0.5
     Shock: 0
-    Structural: 0.5
   flatReductions:
     Blunt: 5
     Slash: 5
     Piercing: 5
     Heat: 5
-    Structural: 10
 
 - type: damageModifierSet
   id: Wood

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

@@ -165,12 +165,12 @@
     - type: Armor
       modifiers:
         coefficients:
-          Blunt: 0.5
-          Slash: 0.5
-          Piercing: 0.6
-          Heat: 0.5
+          Blunt: 0.4
+          Slash: 0.4
+          Piercing: 0.5
+          Heat: 0.4
     - type: ExplosionResistance
-      damageCoefficient: 0.9
+      damageCoefficient: 0.5
     - type: GroupExamine
     - type: Unremoveable
       deleteOnDrop: true

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

@@ -17,7 +17,7 @@
   id: ClothingOuterBaseLarge
   components:
   - type: Item
-    size: Huge
+    size: Large
   - type: Clothing
     slots:
     - outerClothing
@@ -155,4 +155,4 @@
   id: ClothingOuterBaseMedium
   components:
   - type: Item
-    size: Huge
+    size: Large

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

@@ -177,6 +177,7 @@
   - type: SleepEmitSound
   - type: SSDIndicator
   - type: StandingState
+    canLieDown: true
   - type: Fingerprint
   - type: Dna
   - type: MindContainer

Resources/Prototypes/Entities/Objects/Decoration/mining.yml

@@ -1,7 +1,7 @@
 - type: entity
   id: WoodenSign
   name: wooden sign
-  description: He's pointing somewhere. 
+  description: He's pointing somewhere.
   components:
   - type: Clickable
   - type: InteractionOutline
@@ -18,7 +18,7 @@
           bounds: "-0.35,-0.4,0.35,0.4"
         density: 100
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: MeleeSound
     soundGroups:
@@ -60,7 +60,7 @@
     sprite: Objects/Decoration/mines.rsi
     state: support
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Physics
     bodyType: Static
@@ -128,7 +128,7 @@
     sprite: Objects/Decoration/mines.rsi
     state: support_wall
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Physics
     bodyType: Static
@@ -176,4 +176,4 @@
         spawn:
           Log:
             min: 1
-            max: 3
+            max: 3

Resources/Prototypes/Entities/Objects/Devices/holoprojectors.yml

@@ -6,16 +6,6 @@
   components:
   - type: HolosignProjector
   - type: UseDelay
-  - type: ContainerContainer
-    containers:
-      cell_slot: !type:ContainerSlot {}
-  - type: PowerCellSlot
-    cellSlotId: cell_slot
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMedium
   - type: Sprite
     sprite: Objects/Devices/Holoprojectors/custodial.rsi
     state: icon
@@ -29,14 +19,6 @@
   suffix: borg
   components:
   - type: HolosignProjector
-    chargeUse: 240
-  - type: ItemSlots
-    slots:
-      cell_slot:
-        name: power-cell-slot-component-slot-name-default
-        startingItem: PowerCellMicroreactor
-        disableEject: true
-        swap: false
 
 - type: entity
   parent: Holoprojector
@@ -46,7 +28,6 @@
   components:
   - type: HolosignProjector
     signProto: HoloFan
-    chargeUse: 120
   - type: Sprite
     sprite: Objects/Devices/Holoprojectors/atmos.rsi
     state: icon

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

@@ -20,7 +20,7 @@
         layer:
         - WallLayer
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Inflatable
   - type: Destructible
     thresholds:
@@ -68,7 +68,7 @@
     closeSound:
       path: /Audio/Misc/zip.ogg
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Inflatable
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Objects/Specific/Medical/patch.yml

@@ -0,0 +1,68 @@
+- type: entity
+  parent: BaseItem
+  id: BasePatch
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Objects/Specific/Medical/patch.rsi
+    layers:
+    - state: patch
+    - state: patch1
+      map: [ "enum.SolutionContainerLayers.Fill" ]
+      visible: false
+  - type: Item
+    sprite: Objects/Specific/Medical/patch.rsi
+  - type: SolutionContainerManager
+    solutions:
+      patch:
+        maxVol: 40
+  - type: RefillableSolution
+    solution: patch
+  - type: ExaminableSolution
+    solution: patch
+  - type: Appearance
+  - type: SolutionContainerVisuals
+  - type: Patch
+    OnlyMobs: false
+  - type: StaticPrice
+    price: 30
+
+- type: entity
+  name: patch
+  parent: BasePatch
+  description: a medicated patch that can deliver drugs directly into the bloodstream through the layers of the skin.
+  id: Patch
+  components:
+  - type: StaticPrice
+    price: 10
+  - type: SolutionContainerVisuals
+    maxFillLevels: 4
+    fillBaseName: patch
+
+- type: entity
+  name: brute patch
+  parent: Patch
+  description: This innovative medical patch utilizes advanced biomimetic technology to significantly accelerate the healing of minor cuts and scrapes.
+  id: BrutePatch
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      patch:
+        maxVol: 40
+        reagents:
+        - ReagentId: Bicaridine
+          Quantity: 10
+
+- type: entity
+  name: burn patch
+  parent: Patch
+  description: This type of patch contains a drug reservoir made of a substance that heals burns.
+  id: BurnPatch
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      patch:
+        maxVol: 40
+        reagents:
+        - ReagentId: Dermaline
+          Quantity: 10

Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml

@@ -125,7 +125,7 @@
       ammo:
         reagents:
         - ReagentId: ChloralHydrate
-          Quantity: 7
+          Quantity: 5
   - type: SolutionTransfer
     maxTransferAmount: 7
   - type: SpentAmmoVisuals

Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml

@@ -194,7 +194,7 @@
     sprite: Objects/Weapons/Guns/Shotguns/inhands_64x.rsi
     heldPrefix: sawn
   - type: Gun
-    fireRate: 4
+    fireRate: 2
   - type: BallisticAmmoProvider
     capacity: 2
     autoCycle: true

Resources/Prototypes/Entities/Structures/Decoration/bonfire.yml

@@ -14,7 +14,7 @@
     energy: 3
     color: "#FFC90C"
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Decoration/cobwebs.yml

@@ -18,7 +18,7 @@
   - type: Transform
     anchored: true
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Decoration/crystals.yml

@@ -38,7 +38,7 @@
       energy: 3
       color: "#52ff39"
     - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
       damageModifierSet: Glass
     - type: Destructible
       thresholds:

Resources/Prototypes/Entities/Structures/Decoration/curtains.yml

@@ -38,7 +38,7 @@
       path: /Audio/Effects/curtain_openclose.ogg
   - type: Appearance
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Construction
     graph: Curtains

Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml

@@ -19,7 +19,7 @@
     autoRot: true
     offset: "0, 0.6"
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml

@@ -35,8 +35,8 @@
     energy: 3
     color: "#FF6F00"
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Decoration/showcase.yml

@@ -7,8 +7,8 @@
   components:
     - type: Anchorable
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
         - trigger:

Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml

@@ -35,8 +35,8 @@
   - type: Anchorable
   - type: Pullable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml

@@ -28,8 +28,8 @@
     anchored: true
     noRot: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -42,4 +42,4 @@
     graph: Airlock
     node: assembly
   placement:
-    mode: SnapgridCenter
+    mode: SnapgridCenter

Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml

@@ -111,7 +111,7 @@
   - type: Occluder
   - type: Damageable
     damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml

@@ -17,8 +17,8 @@
     - type: DeviceNetworkRequiresPower
     - type: InteractionOutline
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
       - trigger:
@@ -108,7 +108,7 @@
     - type: AccessReader
       access: [ [ "Engineering" ] ]
     - type: ReflectAspectMark
-      
+
 - type: entity
   id: Firelock
   parent: BaseFirelock

Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: FirelockFrame
   parent: BaseStructureDynamic
   name: firelock frame
@@ -23,8 +23,8 @@
     node: frame1
   - type: InteractionOutline
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml

@@ -42,8 +42,8 @@
   - type: Airtight
     fixVacuum: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -95,7 +95,7 @@
     closeSound:
       path: /Audio/Effects/door_close.ogg
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
@@ -144,8 +144,8 @@
     - state: closed
       map: ["enum.DoorVisualLayers.Base"]
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml

@@ -40,8 +40,8 @@
   - type: Airtight
     fixVacuum: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -95,8 +95,8 @@
     noRot: false
   - type: Rotatable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Shutter/blast_door.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BlastDoor
   parent: BaseShutter
   name: blast door
@@ -26,7 +26,7 @@
     resistance: 8
   - type: Damageable
     damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
   - type: ContainerFill
     containers:
       board: [ DoorElectronics ]
@@ -65,8 +65,8 @@
     state: assembly
   - type: InteractionOutline
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml

@@ -66,7 +66,7 @@
     resistance: 2
   - type: Damageable
     damageContainer: StructuralInorganic
-    damageModifierSet: StrongMetallic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:
@@ -208,8 +208,8 @@
     - board
   - type: InteractionOutline
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: WindoorAssembly
   name: windoor assembly
   description: It opens, it closes, and you can see through it!
@@ -24,8 +24,8 @@
   - type: Pullable
   - type: Rotatable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: BaseWindoor
   parent: BaseStructure
   abstract: true

Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: Windoor
   parent: BaseWindoor
   name: windoor

Resources/Prototypes/Entities/Structures/Furniture/Tables/base_structuretables.yml

@@ -6,8 +6,8 @@
   abstract: true
   components:
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: PlaceableSurface
   - type: Fixtures
     fixtures:

Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml

@@ -22,8 +22,8 @@
         layer:
         - TableLayer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: IconSmooth
     key: state
     base: state_
@@ -79,7 +79,7 @@
         layer:
         - TableLayer
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: IconSmooth
     key: state
@@ -122,8 +122,8 @@
     sprite: Structures/Furniture/Tables/frame.rsi
     state: full
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: IconSmooth
     key: state
     base: state_
@@ -166,8 +166,8 @@
   - type: Icon
     sprite: Structures/Furniture/Tables/generic.rsi
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -596,7 +596,7 @@
     sprite: Structures/Furniture/Tables/counterwood.rsi
     state: full
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Wood
   - type: Destructible
     thresholds:
@@ -639,8 +639,8 @@
     sprite: Structures/Furniture/Tables/countermetal.rsi
     state: full
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -9,8 +9,8 @@
   - type: Transform
   - type: Prayable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: PlaceableSurface
   - type: Fixtures
     fixtures:

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

@@ -36,8 +36,8 @@
   - type: PlaceableSurface
     placeCentered: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -17,7 +17,7 @@
     fillBaseName: book
   - type: Damageable
     damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -18,7 +18,7 @@
     canCollide: false
   - type: Fixtures
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
       - trigger:
@@ -134,7 +134,7 @@
     canCollide: false
   - type: Fixtures
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
       - trigger:

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

@@ -34,8 +34,8 @@
     buckleOffset: "0,-0.05"
   - type: Pullable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -9,7 +9,7 @@
     state: dresser
   - type: Damageable
     damageModifierSet: Wood
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -32,7 +32,7 @@
       stash: !type:ContainerSlot {}
   - type: Pullable
   - type: Damageable
-    damageContainer: Inorganic # The pot. Not the plant. Or is it plastic?
+    damageContainer: StructuralInorganic # The pot. Not the plant. Or is it plastic?
   - type: Destructible
     thresholds:
     - trigger:

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

@@ -40,8 +40,8 @@
   - type: DumpableSolution
     solution: drainBuffer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Holographic/projections.yml

@@ -13,10 +13,8 @@
   - type: Sprite
     sprite: Structures/Holo/wetfloor.rsi
     state: icon
-  - type: TimedDespawn
-    lifetime: 90
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
   - type: Destructible
     thresholds:
       - trigger:
@@ -41,8 +39,6 @@
         shape:
           !type:PhysShapeAabb
             bounds: "-0.5,-0.5,0.5,0.5"
-  - type: TimedDespawn
-    lifetime: 180
   - type: Airtight
     noAirWhenFullyAirBlocked: false
 

Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml

@@ -35,8 +35,8 @@
     softness: 1
     offset: "0, -0.5"
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -235,7 +235,7 @@
       softness: 1.1
       enabled: true
     - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
     - type: Destructible
       thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml

@@ -17,8 +17,8 @@
         - MidImpassable
         - LowImpassable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml

@@ -556,8 +556,8 @@
       - key: enum.BodyScannerConsoleUIKey.Key
         type: BodyScannerConsoleBoundUserInterface
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
 # WD end
 
 - type: entity
@@ -595,8 +595,8 @@
     energy: 1.6
     color: "#3c5eb5"
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
 
 - type: entity
   parent: ComputerComms
@@ -847,8 +847,8 @@
     speechVerb: Robotic
     speechSounds: Pai
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: GuideHelp
     guides:
     - Cloning

Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml

@@ -25,7 +25,7 @@
   - type: Sprite
     drawdepth: Objects
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Electronic
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Machines/Medical/cryo_pod.yml

@@ -54,8 +54,8 @@
     boardName: wires-board-name-cryopod
     layoutId: CryoPod
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml

@@ -22,8 +22,8 @@
         layer:
         - MachineLayer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/cloning_machine.yml

@@ -31,8 +31,8 @@
     containers:
       - clonepod-bodyContainer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/fatextractor.yml

@@ -80,8 +80,8 @@
     containers:
      - entity_storage
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/frame.yml

@@ -37,8 +37,8 @@
         machine_board: !type:Container
         machine_parts: !type:Container
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
       - trigger:
@@ -92,8 +92,8 @@
         - machine_board
         - machine_parts
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
       - trigger:
@@ -141,8 +141,8 @@
       graph: Machine
       node: destroyedMachineFrame
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -767,6 +767,8 @@
       - ShuttleGunPerforatorCircuitboard
       - ShuttleGunFriendshipCircuitboard
       - ShuttleGunDusterCircuitboard
+      - ClothingHandsGlovesMagnetic
+      - ClothingHandsGlovesMagneticAdvanced
   - type: EmagLatheRecipes
     emagStaticRecipes:
      - MagazineLightRifleBox

Resources/Prototypes/Entities/Structures/Machines/medical_scanner.yml

@@ -51,8 +51,8 @@
       machine_board: !type:Container
       machine_parts: !type:Container
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/smartfridge.yml

@@ -84,8 +84,8 @@
         sound:
           collection: MetalBreak
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: DamageOnHighSpeedImpact
     damage:
       types:

Resources/Prototypes/Entities/Structures/Machines/stasisbed.yml

@@ -21,8 +21,8 @@
     powerLoad: 1000
   - type: ExtensionCableReceiver
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Machines/wireless_surveillance_camera.yml

@@ -10,8 +10,8 @@
     - type: WirelessNetworkConnection
       range: 200
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Rotatable
       rotateWhileAnchored: true
     - type: Fixtures

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/miners.yml

@@ -14,8 +14,8 @@
     - type: Transform
       anchored: true
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
         - trigger:

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml

@@ -12,8 +12,8 @@
   - type: Transform
     anchored: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: SubFloorHide
   - type: CollideOnAnchor
   - type: PipeAppearance

Resources/Prototypes/Entities/Structures/Piping/Atmospherics/portable.yml

@@ -71,8 +71,8 @@
   - type: Machine
     board: PortableScrubberMachineCircuitBoard
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Piping/Disposal/high_pressure_machine_frame.yml

@@ -29,8 +29,8 @@
       graph: DisposalMachine
       node: frame
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
         - trigger:

Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml

@@ -36,8 +36,8 @@
     anchored: true
   - type: Anchorable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml

@@ -53,8 +53,8 @@
         !type:CableDeviceNode
         nodeGroupID: MVPower
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Power/Generation/ame.yml

@@ -29,8 +29,8 @@
         layer:
         - WallLayer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -145,8 +145,8 @@
         layer:
         - WallLayer
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/Generation/generators.yml

@@ -52,8 +52,8 @@
   - type: Anchorable
   - type: Pullable
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: PacifismDangerousAttack
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml

@@ -61,8 +61,8 @@
     supplyRampRate: 500
   - type: SolarPanel
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -90,8 +90,8 @@
   - type: Sprite
     state: broken
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -141,8 +141,8 @@
     anchored: true
     noRot: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:
@@ -186,8 +186,8 @@
     anchored: true
     noRot: true
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/apc.yml

@@ -102,8 +102,8 @@
     layoutId: APC
   - type: WiresVisuals
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: Destructible
     thresholds:
     - trigger:
@@ -171,8 +171,8 @@
     node: apcFrame
   - type: WallMount
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml

@@ -15,8 +15,8 @@
     - type: Transform
       anchored: true
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
         - trigger:

Resources/Prototypes/Entities/Structures/Power/cables.yml

@@ -27,8 +27,8 @@
           "/Audio/Weapons/smash.ogg"
   # WD edit sounds start
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/chargers.yml

@@ -166,6 +166,7 @@
           - ProjectileBatteryAmmoProvider
           - Stunbaton
           - TwoModeEnergyAmmoProvider
+          - MagneticGloves
 
 - type: entity
   parent: BaseItemRecharger
@@ -190,6 +191,7 @@
           - Stunbaton
           - TwoModeEnergyAmmoProvider
           - PowerCell
+          - MagneticGloves
         blacklist:
           tags:
           - PotatoBattery

Resources/Prototypes/Entities/Structures/Power/debug_power.yml

@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   id: DebugGenerator
   parent: BaseGenerator
   suffix: DEBUG
@@ -44,8 +44,8 @@
   - type: PowerConsumer
     drawRate: 50
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Power/smes.yml

@@ -81,8 +81,8 @@
       highVoltageNode: input
       mediumVoltageNode: output
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: StrongMetallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallicStrong
     - type: BatterySensor
     - type: DeviceNetwork
       deviceNetId: AtmosDevices

Resources/Prototypes/Entities/Structures/Power/substation.yml

@@ -52,8 +52,8 @@
     supplyRampTolerance: 5000
     supplyRampRate: 1000
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: StrongMetallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallicStrong
   - type: PacifismDangerousAttack
   - type: Destructible
     thresholds:
@@ -185,8 +185,8 @@
     supplyRampTolerance: 5000
     supplyRampRate: 1000
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: PacifismDangerousAttack
   - type: Destructible
     thresholds:

Resources/Prototypes/Entities/Structures/Shuttles/cannons.yml

@@ -30,7 +30,7 @@
         layer:
         - MachineLayer
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Electronic
   - type: Transform
     anchored: true
@@ -287,8 +287,8 @@
     containers:
       ballistic-ammo: !type:Container
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Shuttles/thrusters.yml

@@ -40,7 +40,7 @@
       powerLoad: 1500
     - type: ExtensionCableReceiver
     - type: Damageable
-      damageContainer: Inorganic
+      damageContainer: StructuralInorganic
       damageModifierSet: Electronic
     - type: Destructible
       thresholds:
@@ -193,7 +193,7 @@
         - !type:ChangeConstructionNodeBehavior
           node: machineFrame
   - type: Damageable
-    damageContainer: Inorganic
+    damageContainer: StructuralInorganic
     damageModifierSet: Electronic
   - type: StaticPrice
     price: 2000

Resources/Prototypes/Entities/Structures/Specific/Atmospherics/sensor.yml

@@ -8,8 +8,8 @@
     - type: Transform
       anchored: true
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Destructible
       thresholds:
       - trigger:

Resources/Prototypes/Entities/Structures/Specific/dragon.yml

@@ -32,8 +32,8 @@
     # only show after making the announcement at 50%
     enabled: false
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Destructible
     thresholds:
     - trigger:

Resources/Prototypes/Entities/Structures/Specific/xeno.yml

@@ -26,8 +26,8 @@
       - state: wardingtower-unshaded
         shader: unshaded
   - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Metallic
+    damageContainer: StructuralInorganic
+    damageModifierSet: StructuralMetallic
   - type: Physics
     bodyType: Static
   - type: Fixtures

Resources/Prototypes/Entities/Structures/Storage/Canisters/gas_canisters.yml

@@ -62,8 +62,8 @@
               acts: [ "Destruction" ]
             - !type:DumpCanisterBehavior
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: Physics
       bodyType: Dynamic
     - type: Fixtures
@@ -1274,8 +1274,8 @@
         - !type:DoActsBehavior
           acts: [ "Destruction" ]
     - type: Damageable
-      damageContainer: Inorganic
-      damageModifierSet: Metallic
+      damageContainer: StructuralInorganic
+      damageModifierSet: StructuralMetallic
     - type: InteractionOutline
     - type: Sprite
       sprite: Structures/Storage/canister.rsi