Remove plural BaseTurfs as a thing in favour of BaseTurf (#16560)
This commit is contained in:
@@ -33,7 +33,8 @@ namespace Content.Shared.Maps
|
||||
|
||||
[DataField("isSubfloor")] public bool IsSubFloor { get; private set; }
|
||||
|
||||
[DataField("baseTurfs")] public List<string> BaseTurfs { get; } = new();
|
||||
[DataField("baseTurf")]
|
||||
public string BaseTurf { get; } = string.Empty;
|
||||
|
||||
[DataField("canCrowbar")] public bool CanCrowbar { get; private set; }
|
||||
|
||||
|
||||
@@ -136,13 +136,7 @@ public sealed class FloorTileSystem : EntitySystem
|
||||
|
||||
public bool HasBaseTurf(ContentTileDefinition tileDef, string baseTurf)
|
||||
{
|
||||
foreach (var tileBaseTurf in tileDef.BaseTurfs)
|
||||
{
|
||||
if (baseTurf == tileBaseTurf)
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return tileDef.BaseTurf == baseTurf;
|
||||
}
|
||||
|
||||
private void PlaceAt(EntityUid user, MapGridComponent mapGrid, EntityCoordinates location, ushort tileId, SoundSpecifier placeSound, float offset = 0)
|
||||
|
||||
Reference in New Issue
Block a user