From d332c829e88ba0472e3715d246e0e9e760951119 Mon Sep 17 00:00:00 2001
From: Flipp Syder <76629141+vulppine@users.noreply.github.com>
Date: Thu, 5 May 2022 20:38:51 -0700
Subject: [PATCH] Quick fixes for markings (#7963)

---
 Content.Client/Markings/MarkingsSystem.cs           | 13 ++++++++++++-
 .../Locale/en-US/preferences/ui/markings-picker.ftl |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Content.Client/Markings/MarkingsSystem.cs b/Content.Client/Markings/MarkingsSystem.cs
index 56bf347845..e54292edb4 100644
--- a/Content.Client/Markings/MarkingsSystem.cs
+++ b/Content.Client/Markings/MarkingsSystem.cs
@@ -47,7 +47,10 @@ namespace Content.Client.Markings
 
             foreach (var marking in markingList)
             {
-                markings.ActiveMarkings[_markingManager.Markings()[marking.MarkingId].BodyPart].Add(marking);
+                if (_markingManager.Markings().TryGetValue(marking.MarkingId, out var markingProto))
+                {
+                    markings.ActiveMarkings[markingProto.BodyPart].Add(marking);
+                }
             }
         }
 
@@ -69,6 +72,14 @@ namespace Content.Client.Markings
                     continue;
                 }
 
+                // if the given marking isn't correctly formed, we need to
+                // instead just allocate a new marking based on the old one
+                // with the correct sprite count
+                if (marking.MarkingColors.Count != markingPrototype.Sprites.Count)
+                {
+                    marking = new Marking(marking.MarkingId, markingPrototype.Sprites.Count);
+                }
+
                 if (usedPoints.TryGetValue(markingPrototype.MarkingCategory, out MarkingPoints? points))
                 {
                     if (points.Points == 0)
diff --git a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
index 6388915699..d2347eacfa 100644
--- a/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
+++ b/Resources/Locale/en-US/preferences/ui/markings-picker.ftl
@@ -4,7 +4,7 @@ markings-add = Add Marking
 markings-remove = Remove Marking
 markings-rank-up = Up
 markings-rank-down = Down
-marking-points-remaining = Points remaining: {$points}
+marking-points-remaining = Markings left: {$points}
 marking-used = {$marking-name} ({$marking-category})
 
 # Categories