diff --git a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs index 975d814a21..6fc113b1f4 100644 --- a/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/FloorTileItemComponent.cs @@ -14,6 +14,7 @@ using Robust.Shared.Maths; using Robust.Shared.Audio; using Robust.Shared.Player; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; namespace Content.Server.GameObjects.Components.Items { @@ -23,7 +24,7 @@ namespace Content.Server.GameObjects.Components.Items [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; public override string Name => "FloorTile"; - [DataField("outputs")] + [DataField("outputs", customTypeSerializer:typeof(PrototypeIdListSerializer))] private List? _outputTiles; public override void Initialize() diff --git a/Content.Shared/Maps/ContentTileDefinition.cs b/Content.Shared/Maps/ContentTileDefinition.cs index 641f92b03f..7e9849502e 100644 --- a/Content.Shared/Maps/ContentTileDefinition.cs +++ b/Content.Shared/Maps/ContentTileDefinition.cs @@ -4,6 +4,7 @@ using JetBrains.Annotations; using Robust.Shared.Map; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager.Attributes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.ViewVariables; namespace Content.Shared.Maps @@ -35,7 +36,8 @@ namespace Content.Shared.Maps [DataField("thermalConductivity")] public float ThermalConductivity { get; set; } = 0.05f; - [DataField("item_drop")] public string ItemDropPrototypeName { get; } = "FloorTileItemSteel"; + [DataField("item_drop", customTypeSerializer:typeof(PrototypeIdSerializer))] + public string ItemDropPrototypeName { get; } = "FloorTileItemSteel"; [DataField("is_space")] public bool IsSpace { get; private set; } diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 1930e398d7..38e6d2c26e 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -102,7 +102,6 @@ can_crowbar: true footstep_sounds: footstep_floor friction: 0.30 - item_drop: FloorTileItemRock - type: tile name: floor_showroom @@ -185,7 +184,6 @@ can_crowbar: true footstep_sounds: footstep_asteroid friction: 0.30 - item_drop: FloorTileItemAsteroid - type: tile name: floor_asteroid_coarse_sand0