From 1317f0214ab2d7231956f7032205dc94e5701fa7 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 10 Apr 2022 03:36:24 +1200
Subject: [PATCH] Fix decal crash (#7484)

---
 Content.Client/Decals/DecalOverlay.cs          | 13 ++++++++++++-
 Resources/Maps/Salvage/medium-pet-hospital.yml |  8 --------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Content.Client/Decals/DecalOverlay.cs b/Content.Client/Decals/DecalOverlay.cs
index 5834232516..6cb43432dc 100644
--- a/Content.Client/Decals/DecalOverlay.cs
+++ b/Content.Client/Decals/DecalOverlay.cs
@@ -56,7 +56,7 @@ namespace Content.Client.Decals
                     {
                         if (!cachedTextures.TryGetValue(decal.Id, out var texture))
                         {
-                            var sprite = _prototypeManager.Index<DecalPrototype>(decal.Id).Sprite;
+                            var sprite = GetDecalSprite(decal.Id);
                             texture = _sprites.Frame0(sprite);
                             cachedTextures[decal.Id] = texture;
                         }
@@ -69,5 +69,16 @@ namespace Content.Client.Decals
                 }
             }
         }
+
+        public SpriteSpecifier GetDecalSprite(string id)
+        {
+            if (_prototypeManager.TryIndex<DecalPrototype>(id, out var proto))
+                return proto.Sprite;
+            else
+            {
+                Logger.Error($"Unknown decal prototype: {id}");
+                return new SpriteSpecifier.Texture(new ResourcePath("/Textures/noSprite.png"));
+            }
+        }
     }
 }
diff --git a/Resources/Maps/Salvage/medium-pet-hospital.yml b/Resources/Maps/Salvage/medium-pet-hospital.yml
index 837b061bde..9ceb5ea082 100644
--- a/Resources/Maps/Salvage/medium-pet-hospital.yml
+++ b/Resources/Maps/Salvage/medium-pet-hospital.yml
@@ -129,14 +129,6 @@ entities:
           color: '#FFFFFFFF'
           id: Grasse1
           coordinates: 13.889501,-4.865914
-        10:
-          color: '#FFFFFFFF'
-          id: Rock08
-          coordinates: 3.2020006,-13.537788
-        11:
-          color: '#FFFFFFFF'
-          id: Rock10
-          coordinates: 5.9051256,-13.131538
         12:
           color: '#FFFFFFFF'
           id: Flowersbr2