Add no damage phrase and logic

diff --git a/Content.Shared/Damage/Systems/DamageExamineSystem.cs b/Content.Shared/Damage/Systems/DamageExamineSystem.cs
index 53436a920aa56648e7649c80c55a5e19dd2c6544..72c1af29b22d9b6a2c4a84c2a4d4b82996b00072 100644 (file)
--- a/Content.Shared/Damage/Systems/DamageExamineSystem.cs
+++ b/Content.Shared/Damage/Systems/DamageExamineSystem.cs
@@ -61,6 +61,15 @@ public sealed class DamageExamineSystem : EntitySystem
         }
         else
         {
+            if (damageSpecifier.DamageDict.Count == 1)
+            {
+                // May be simplified to using a foreach(Var x) despite being only one item
+                if(damageSpecifier.DamageDict.Values.GetEnumerator().Current == FixedPoint2.Zero)
+                {
+                    msg.AddMarkupOrThrow(Loc.GetString("damage-none"));
+                    return msg;
+                }
+            }
             msg.AddMarkupOrThrow(Loc.GetString("damage-examine-type", ("type", type)));
         }
 

diff --git a/Resources/Locale/en-US/damage/damage-examine.ftl b/Resources/Locale/en-US/damage/damage-examine.ftl
index 974b8fa96506465a9843cd0124d3130292ad382c..848adeb31a0de0dee45692ba8d437be3dad4dc6b 100644 (file)
--- a/Resources/Locale/en-US/damage/damage-examine.ftl
+++ b/Resources/Locale/en-US/damage/damage-examine.ftl
@@ -10,3 +10,4 @@ damage-throw = throw
 damage-examine = It does the following damage:
 damage-examine-type = It does the following [color=cyan]{$type}[/color] damage:
 damage-value = - [color=red]{$amount}[/color] units of [color=yellow]{$type}[/color].
+damage-none = It does no damage.