diff --git a/Content.Client/SS220/MapEditor/TileSpawningUIController220.cs b/Content.Client/SS220/MapEditor/TileSpawningUIController220.cs index 6a6db57a5843..aaf4732e4ed6 100644 --- a/Content.Client/SS220/MapEditor/TileSpawningUIController220.cs +++ b/Content.Client/SS220/MapEditor/TileSpawningUIController220.cs @@ -188,10 +188,10 @@ private void BuildTileList(string? searchStr = null) .Select(def => { string displayTitle = Loc.GetString(def.Name); - if (_prototypeManager.TryGetMapping(typeof(ContentTileDefinition), def.ID, out var node) - && node.TryGet("tags", out ValueDataNode? valueNode)) + if (def is ContentTileDefinition contentTile + && contentTile.Tags is { Length: > 0 }) { - displayTitle = $"[{valueNode.Value}] {displayTitle}"; + displayTitle = $"[{string.Join(", ", contentTile.Tags.Select(x => Loc.GetString(x)))}] {displayTitle}"; } return new TileUIData(def, displayTitle, new ItemList.Item(_window.TileList), new List()); }); diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 839d920df94a..aa41f95513e8 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -113,6 +113,10 @@ public sealed partial class ContentTileDefinition : IPrototype, IInheritingProto /// [DataField("indestructible")] public bool Indestructible = false; + // SS220 Tile tags begin + [DataField("tags")] public string[]? Tags; + // SS220 Tile tags end + public void AssignTileId(ushort id) { TileId = id;