Lint more stuff (#19307)

This commit is contained in:
Vordenburg
2023-08-19 14:00:41 -04:00
committed by GitHub
parent 9a2e1cb9a7
commit 71d4303393
5 changed files with 12 additions and 8 deletions

View File

@@ -1,4 +1,5 @@
using Content.Shared.Roles; using Content.Shared.Actions.ActionTypes;
using Content.Shared.Roles;
using Robust.Shared.Audio; using Robust.Shared.Audio;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
@@ -93,5 +94,6 @@ public sealed class ZombieRuleComponent : Component
[DataField("shuttleCalled")] [DataField("shuttleCalled")]
public bool ShuttleCalled; public bool ShuttleCalled;
[ValidatePrototypeId<InstantActionPrototype>]
public const string ZombifySelfActionPrototype = "TurnUndead"; public const string ZombifySelfActionPrototype = "TurnUndead";
} }

View File

@@ -1,14 +1,15 @@
using Content.Shared.Preferences; using Content.Shared.Preferences;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
namespace Content.Shared.Roles namespace Content.Shared.Roles
{ {
[Prototype("startingGear")] [Prototype("startingGear")]
public sealed class StartingGearPrototype : IPrototype public sealed class StartingGearPrototype : IPrototype
{ {
// TODO: Custom TypeSerializer for dictionary value prototype IDs [DataField("equipment", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<string, EntityPrototype>))]
[DataField("equipment")] private Dictionary<string, string> _equipment = new(); private Dictionary<string, string> _equipment = new();
/// <summary> /// <summary>
/// if empty, there is no skirt override - instead the uniform provided in equipment is added. /// if empty, there is no skirt override - instead the uniform provided in equipment is added.

View File

@@ -1,7 +1,7 @@
using Content.Shared.Actions; using Content.Shared.Actions;
using Content.Shared.Actions.ActionTypes;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
namespace Content.Shared.Spider; namespace Content.Shared.Spider;
@@ -15,7 +15,7 @@ public sealed class SpiderComponent : Component
public string WebPrototype = "SpiderWeb"; public string WebPrototype = "SpiderWeb";
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
[DataField("webActionName")] [DataField("webActionName", customTypeSerializer: typeof(PrototypeIdSerializer<InstantActionPrototype>))]
public string WebActionName = "SpiderWebAction"; public string WebActionName = "SpiderWebAction";
} }

View File

@@ -1,6 +1,7 @@
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
namespace Content.Shared.Store; namespace Content.Shared.Store;
@@ -28,7 +29,7 @@ public sealed class CurrencyPrototype : IPrototype
/// <summary> /// <summary>
/// The physical entity of the currency /// The physical entity of the currency
/// </summary> /// </summary>
[DataField("cash")] //TODO: you get your customTypeSerializer when FixedPoint2 works in them! -emo [DataField("cash", customTypeSerializer: typeof(PrototypeIdValueDictionarySerializer<FixedPoint2, EntityPrototype>))]
public Dictionary<FixedPoint2, string>? Cash { get; } public Dictionary<FixedPoint2, string>? Cash { get; }
/// <summary> /// <summary>

View File

@@ -53,7 +53,7 @@
innerclothingskirt: ClothingUniformJumpskirtColorBlack innerclothingskirt: ClothingUniformJumpskirtColorBlack
satchel: ClothingBackpackDuffelSyndicateAmmo satchel: ClothingBackpackDuffelSyndicateAmmo
duffelbag: ClothingBackpackDuffelSyndicateAmmo duffelbag: ClothingBackpackDuffelSyndicateAmmo
# Syndicate Operative Outfit - Monkey # Syndicate Operative Outfit - Monkey
- type: startingGear - type: startingGear
id: SyndicateOperativeGearMonkey id: SyndicateOperativeGearMonkey
@@ -281,7 +281,7 @@
equipment: equipment:
jumpsuit: ClothingUniformJumpsuitBrigmedic jumpsuit: ClothingUniformJumpsuitBrigmedic
outerClothing: ClothingOuterCoatAMG outerClothing: ClothingOuterCoatAMG
back: ClothingBackpackBrigmedicFilled back: ClothingBackpackBrigmedic
shoes: ClothingShoesColorRed shoes: ClothingShoesColorRed
gloves: ClothingHandsGlovesNitrile gloves: ClothingHandsGlovesNitrile
eyes: ClothingEyesHudMedical eyes: ClothingEyesHudMedical