Lint more stuff (#19307)

Content.Server/GameTicking/Rules/Components/ZombieRuleComponent.cs

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

Content.Shared/Roles/StartingGearPrototype.cs

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

Content.Shared/Spider/SpiderComponent.cs

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

Content.Shared/Store/CurrencyPrototype.cs

@@ -1,6 +1,7 @@
 using Content.Shared.FixedPoint;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary;
 
 namespace Content.Shared.Store;
 
@@ -28,7 +29,7 @@ public sealed class CurrencyPrototype : IPrototype
     /// <summary>
     /// The physical entity of the currency
     /// </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; }
 
     /// <summary>

Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml

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