AdventureTimeSS14 · PyotrIgn · Sep 3, 2024 · Aug 24, 2024 · Aug 24, 2024 · Aug 24, 2024
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -153,7 +153,7 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
             _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
                 InGameICChatType.Speak, true);
         }
-        if (HasComp<EmbalmedComponent>(target))
+        if (HasComp<EmbalmedComponent>(target)) //Can't revive embalmed people.
         {
             _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-embalmed"),
                 InGameICChatType.Speak, true);

diff --git a/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs b/Content.Shared/Damage/Components/IgnoreSlowOnDamageComponent.cs
@@ -4,6 +4,8 @@ namespace Content.Shared.Damage.Components;
 
 /// <summary>
 /// This is used for an effect that nullifies <see cref="SlowOnDamageComponent"/> and adds an alert.
+/// Thanks EmoGarbage404 for contributing this mechanic.
+/// https://github.com/space-wizards/space-station-14/pull/31322
 /// </summary>
 [RegisterComponent, NetworkedComponent, Access(typeof(SlowOnDamageSystem))]
 public sealed partial class IgnoreSlowOnDamageComponent : Component;
diff --git a/Resources/Locale/en-US/ADT/Reagents/Effects/medicine_effects.ftl b/Resources/Locale/en-US/ADT/Reagents/Effects/medicine_effects.ftl
diff --git a/Resources/Locale/en-US/ADT/Reagents/Meta/medicine.ftl b/Resources/Locale/en-US/ADT/Reagents/Meta/medicine.ftl
diff --git a/Resources/Locale/en-US/disease/miasma.ftl b/Resources/Locale/en-US/disease/miasma.ftl
@@ -18,6 +18,4 @@ rotting-extremely-bloated = [color=red]{ CAPITALIZE(POSS-ADJ($target)) } corpse
 
 rotting-rotting-nonmob = [color=orange]{ CAPITALIZE(SUBJECT($target)) } is rotting![/color]
 rotting-bloated-nonmob = [color=orangered]{ CAPITALIZE(SUBJECT($target)) } is bloated![/color]
-rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } is extremely bloated![/color]
-
-adt-rotting-embalmed = [color=#edad45]Looks like body is embalmed.[/color]
+rotting-extremely-bloated-nonmob = [color=red]{ CAPITALIZE(SUBJECT($target)) } is extremely bloated![/color]
diff --git a/Resources/Locale/en-US/medical/components/defibrillator.ftl b/Resources/Locale/en-US/medical/components/defibrillator.ftl
@@ -2,4 +2,3 @@
 defibrillator-no-mind = No intelligence pattern can be detected in patient's brain. Further attempts futile.
 defibrillator-rotten = Body decomposition detected: resuscitation failed.
 defibrillator-unrevivable = This patient is unable to be revived due to a unique body composition.
-defibrillator-embalmed = Body embalmment detected: resuscitation failed.
diff --git a/Resources/Locale/en-US/reagents/meta/physical-desc.ftl b/Resources/Locale/en-US/reagents/meta/physical-desc.ftl
@@ -1,4 +1,3 @@
-reagent-physical-desc-skunky = skunky
 reagent-physical-desc-soapy = soapy
 reagent-physical-desc-ferrous = ferrous
 reagent-physical-desc-nothing = nothing

diff --git a/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl b/Resources/Locale/ru-RU/ADT/alerts/alerts.ftl
@@ -1,2 +1,4 @@
 alerts-crawling-name = Ползание
-alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать.
+alerts-crawling-desc = Вы ползёте, нажмите С чтобы встать.
+alerts-adrenaline-name = [color=red]Адреналин[/color]
+alerts-adrenaline-desc = Вы полны адреналина: боль вас не замедлит.
diff --git a/Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl b/Resources/Locale/ru-RU/ADT/guidebook/chemistry/effects.ftl
@@ -0,0 +1,5 @@
+reagent-effect-guidebook-embalm = 
+    { $chance ->
+        [1] Предотвращает
+        *[other] предотвращают
+    } гниение трупов
diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/physical-desc.ftl
@@ -0,0 +1 @@
+reagent-physical-desc-skunky = вонючее
diff --git a/Resources/Locale/ru-RU/alerts/alerts.ftl b/Resources/Locale/ru-RU/alerts/alerts.ftl
@@ -64,8 +64,6 @@ alerts-bleed-name = [color=red]Кровотечение[/color]
 alerts-bleed-desc = У вас [color=red]кровотечение[/color].
 alerts-pacified-name = [color=green]Пацифизм[/color]
 alerts-pacified-desc = Вы чувствуете себя умиротворённо и не можете вредить живым существам.
-alerts-adrenaline-name = [color=red]Адреналин[/color]
-alerts-adrenaline-desc = Вы полны адреналина: боль вас не замедлит.
 alerts-suit-power-name = Заряд костюма
 alerts-suit-power-desc = Запас энергии вашего костюма космического ниндзя.
 alerts-magboots-name = Магнитные ботинки

diff --git a/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/reagents/meta/physical-desc.ftl
@@ -1,4 +1,3 @@
-reagent-physical-desc-skunky = вонючее
 reagent-physical-desc-soapy = мыльное
 reagent-physical-desc-ferrous = чёрнометаллическое
 reagent-physical-desc-nothing = никакое