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(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(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