Reapply "fix #744"

This reverts commit 03ba5a2c3b.

Content.Shared/_CP14/MagicEnergy/SharedCP14MagicEnergySystem.cs

@@ -135,7 +135,9 @@ public partial class SharedCP14MagicEnergySystem : EntitySystem
         if (ent.Comp.MagicAlert == null)
             return;
 
-        var level = ContentHelpers.RoundToLevels(MathF.Max(0f, (float) ent.Comp.Energy), (float) ent.Comp.MaxEnergy, 11);
+        var level = ContentHelpers.RoundToLevels(MathF.Max(0f, (float)ent.Comp.Energy),
+            (float)ent.Comp.MaxEnergy,
+            _alerts.GetMaxSeverity(ent.Comp.MagicAlert.Value));
         _alerts.ShowAlert(ent, ent.Comp.MagicAlert.Value, (short)level);
     }
 }

Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs

@@ -26,7 +26,7 @@ public abstract partial class CP14SharedMagicSystem
 
         var fromItem = action.Comp.SpellStorage is not null;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 1f), doAfter, action, used: action.Comp.SpellStorage)
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, MathF.Max(delayedEffect.CastDelay, 1f), doAfter, action, used: action.Comp.SpellStorage, target: doAfter.Target)
         {
             BreakOnMove = delayedEffect.BreakOnMove,
             BreakOnDamage = delayedEffect.BreakOnDamage,

Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs

@@ -72,7 +72,7 @@ public abstract partial class CP14SharedMagicSystem
 
         var fromItem = action.Comp.SpellStorage is not null;
 
-        var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage)
+        var doAfterEventArgs = new DoAfterArgs(EntityManager, performer, toggleable.CastTime, doAfter, action, used: action.Comp.SpellStorage, target: entityTarget)
         {
             BreakOnMove = toggleable.BreakOnMove,
             BreakOnDamage = toggleable.BreakOnDamage,

Resources/Locale/en-US/_CP14/objectives/end-text.ftl

@@ -1,6 +1,6 @@
 cp14-objective-endtext-progress = Task completed by [bold]{$value}%[/bold]
 
-cp14-objective-endtext-status-success = [color=#26f09c]DONe[/color]
+cp14-objective-endtext-status-success = [color=#26f09c]DONE[/color]
 cp14-objective-endtext-status-success-a = [color=#f0a926]ALMOST DONE[/color]
 cp14-objective-endtext-status-failure = [color=#cc2727]FAILED[/color]
 

Resources/Locale/en-US/_CP14/sharpening/sharp.ftl

@@ -3,9 +3,9 @@ sharpening-examined-75 = Looks sharply sharpened
 sharpening-examined-50 = Looks blunted
 sharpening-examined-25 = Looks extremely dull.
 
-damage-weapon-1 = Looks completely intact
+cp14-damageable-weapon-1 = Looks completely intact
-damage-weapon-2 = Covered in a couple of scratches.
+cp14-damageable-weapon-2 = Covered in a couple of scratches
-damageable-weapon-3 = Looks worn.
+cp14-damageable-weapon-3 = Looks worn
-damageable-weapon-4 = It's about to break.
+cp14-damageable-weapon-4 = It's about to break
 
 sharpening-ready = Perfectly sharpened

Resources/Locale/ru-RU/_CP14/sharpening/sharp.ftl

@@ -3,9 +3,9 @@ sharpening-examined-75 = Выглядит остро заточенным
 sharpening-examined-50 = Выглядит затупившимся
 sharpening-examined-25 = Выглядит крайне сильно затупившимся
 
-damageable-weapon-1 = Выглядит полностью целым
+cp14-damageable-weapon-1 = Выглядит полностью целым
-damageable-weapon-2 = Покрыт парой царапин
+cp14-damageable-weapon-2 = Покрыт парой царапин
-damageable-weapon-3 = Выглядит изношенным
+cp14-damageable-weapon-3 = Выглядит изношенным
-damageable-weapon-4 = Он вот-вот сломается
+cp14-damageable-weapon-4 = Он вот-вот сломается
 
 sharpening-ready = Идеально заточен

Resources/Prototypes/_CP14/Damage/examine_messages.yml

@@ -1,7 +1,7 @@
 - type: examinableDamage
   id: CP14WeaponMessages
   messages:
-    - damageable-weapon-1
+    - cp14-damageable-weapon-1
-    - damageable-weapon-2
+    - cp14-damageable-weapon-2
-    - damageable-weapon-3
+    - cp14-damageable-weapon-3
-    - damageable-weapon-4
+    - cp14-damageable-weapon-4

Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml

@@ -24,19 +24,6 @@
     interfaces:
       enum.CP14WorkbenchUiKey.Key:
         type: CP14WorkbenchBoundUserInterface
-
-- type: entity
-  parent:
-  - CP14BaseWorkbench
-  - CP14BaseFlammable
-  id: CP14Workbench
-  name: workbench
-  description: Table for the production of various basic tools.
-  components:
-  - type: Sprite
-    state: workbench
-  - type: Icon
-    state: workbench
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -66,6 +53,19 @@
           CP14WoodenPlanks1:
             min: 1
             max: 2
+
+- type: entity
+  parent:
+  - CP14BaseWorkbench
+  - CP14BaseFlammable
+  id: CP14Workbench
+  name: workbench
+  description: Table for the production of various basic tools.
+  components:
+  - type: Sprite
+    state: workbench
+  - type: Icon
+    state: workbench
   - type: FootstepModifier
     footstepSoundCollection:
       collection: FootstepWood

Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/furnace.yml

@@ -3,7 +3,7 @@
   parent:
   - CP14BaseWorkbench
   name: melting furnace
-  description: A red-hot stone cosntruction that allows ores to be smelted into pure metal
+  description: A red-hot stone construction that allows ores to be smelted into pure metal
   components:
   - type: Sprite
     snapCardinals: false

Resources/Prototypes/_CP14/weather.yml

@@ -34,11 +34,6 @@
   sprite:
     sprite: /Textures/_CP14/Effects/weather.rsi
     state: snowfall_light
-  sound:
-    path: /Audio/Effects/Weather/snowstorm_weak.ogg
-    params:
-      loop: true
-      volume: -6
 
 - type: weather
   id: CP14SnowMedium
@@ -46,10 +41,10 @@
     sprite: /Textures/_CP14/Effects/weather.rsi
     state: snowfall_med
   sound:
-    path: /Audio/Effects/Weather/snowstorm_weak.ogg
+    path: /Audio/Effects/Weather/snowstorm.ogg
     params:
       loop: true
-      volume: -6
+      volume: -18
 
 - type: weather
   id: CP14SnowHeavy