Fix clientside storage Whitelists

Content.Client/Botany/Components/ProduceComponent.cs

@@ -0,0 +1,8 @@
+using Content.Shared.Botany.Components;
+
+namespace Content.Client.Botany.Components;
+
+[RegisterComponent]
+public sealed partial class ProduceComponent : SharedProduceComponent
+{
+}

Content.Client/Botany/Components/SeedComponent.cs

@@ -0,0 +1,8 @@
+using Content.Shared.Botany.Components;
+
+namespace Content.Client.Botany.Components;
+
+[RegisterComponent]
+public sealed partial class SeedComponent : SharedSeedComponent
+{
+}

Content.Server/Botany/Components/ProduceComponent.cs

@@ -1,11 +1,12 @@
 using Content.Server.Botany.Systems;
+using Content.Shared.Botany.Components;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Botany.Components;
 
 [RegisterComponent]
 [Access(typeof(BotanySystem))]
-public sealed partial class ProduceComponent : Component
+public sealed partial class ProduceComponent : SharedProduceComponent
 {
     [DataField("targetSolution")] public string SolutionName { get; set; } = "food";
 

Content.Server/Botany/Components/SeedComponent.cs

@@ -1,10 +1,11 @@
 using Content.Server.Botany.Systems;
+using Content.Shared.Botany.Components;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
 namespace Content.Server.Botany.Components
 {
     [RegisterComponent, Access(typeof(BotanySystem))]
-    public sealed partial class SeedComponent : Component
+    public sealed partial class SeedComponent : SharedSeedComponent
     {
         /// <summary>
         ///     Seed data containing information about the plant type & properties that this seed can grow seed. If

Content.Server/Explosion/EntitySystems/ClusterGrenadeSystem.cs

@@ -1,5 +1,5 @@
 using Content.Server.Explosion.Components;
-using Content.Server.Flash.Components;
+using Content.Shared.Flash.Components;
 using Content.Shared.Explosion;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;

Content.Server/Explosion/EntitySystems/SmokeOnTriggerSystem.cs

@@ -1,4 +1,5 @@
 using Content.Shared.Explosion.Components;
+using Content.Shared.Explosion.EntitySystems;
 using Content.Server.Fluids.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Coordinates.Helpers;

Content.Server/Flash/FlashSystem.cs

@@ -1,5 +1,6 @@
 using System.Linq;
 using Content.Server.Flash.Components;
+using Content.Shared.Flash.Components;
 using Content.Server.Light.EntitySystems;
 using Content.Server.Popups;
 using Content.Server.Stunnable;

Content.Server/Light/EntitySystems/LightReplacerSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.Light.Components;
 using Content.Shared.Examine;
 using Content.Shared.Interaction;
+using Content.Shared.Light.EntitySystems;
 using Content.Shared.Light.Components;
 using Content.Shared.Popups;
 using Content.Shared.Storage;
@@ -13,7 +14,7 @@
 namespace Content.Server.Light.EntitySystems;
 
 [UsedImplicitly]
-public sealed class LightReplacerSystem : EntitySystem
+public sealed class LightReplacerSystem : SharedLightReplacerSystem
 {
     [Dependency] private readonly PoweredLightSystem _poweredLight = default!;
     [Dependency] private readonly SharedAudioSystem _audio = default!;

Content.Server/Nutrition/Components/FoodComponent.cs

@@ -1,4 +1,5 @@
 using Content.Server.Body.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Shared.FixedPoint;
 using Robust.Shared.Audio;

Content.Server/Nutrition/EntitySystems/FoodSystem.cs

@@ -3,6 +3,7 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Inventory;
 using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Server.Popups;
 using Content.Server.Stack;
 using Content.Shared.Administration.Logs;

Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs

@@ -1,5 +1,6 @@
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Examine;
 using Content.Shared.FixedPoint;

Content.Server/Nutrition/EntitySystems/UtensilSystem.cs

@@ -1,4 +1,6 @@
 using Content.Server.Nutrition.Components;
+using Content.Shared.Nutrition.Components;
+using Content.Shared.Nutrition.EntitySystems;
 using Content.Server.Popups;
 using Content.Shared.Interaction;
 using Robust.Shared.Audio;
@@ -11,7 +13,7 @@ namespace Content.Server.Nutrition.EntitySystems
     /// <summary>
     /// Handles usage of the utensils on the food items
     /// </summary>
-    internal sealed class UtensilSystem : EntitySystem
+    internal sealed class UtensilSystem : SharedUtensilSystem
     {
         [Dependency] private readonly IRobustRandom _robustRandom = default!;
         [Dependency] private readonly FoodSystem _foodSystem = default!;

Content.Server/SprayPainter/SprayPainterSystem.cs

@@ -6,8 +6,9 @@
 using Content.Shared.Database;
 using Content.Shared.DoAfter;
 using Content.Shared.Doors.Components;
-using Content.Shared.SprayPainter.Prototypes;
 using Content.Shared.SprayPainter;
+using Content.Shared.SprayPainter.Components;
+using Content.Shared.SprayPainter.Prototypes;
 using Content.Shared.Interaction;
 using JetBrains.Annotations;
 using Robust.Server.GameObjects;

Content.Shared/Botany/Components/SharedProduceComponent.cs

@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Botany.Components;
+
+[NetworkedComponent]
+public abstract partial class SharedProduceComponent : Component
+{
+}

Content.Shared/Botany/Components/SharedSeedComponent.cs

@@ -0,0 +1,8 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Botany.Components;
+
+[NetworkedComponent]
+public abstract partial class SharedSeedComponent : Component
+{
+}

Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs

@@ -1,9 +1,11 @@
+using Content.Shared.Explosion.EntitySystems;
 using Content.Shared.Chemistry.Components;
 using Content.Shared.Explosion.EntitySystems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
+using Robust.Shared.GameStates;
 
-namespace Content.Shared.Explosion.Components.OnTrigger;
+namespace Content.Shared.Explosion.Components;
 
 /// <summary>
 /// Creates a smoke cloud when triggered, with an optional solution to include in it.

Content.Shared/Explosion/EntitySystems/SharedSmokeOnTriggerSystem.cs

@@ -1,6 +1,5 @@
-namespace Content.Shared.Explosion.EntitySystems;
+namespace Content.Shared.Explosion.EntitySystems;
 
 public abstract class SharedSmokeOnTriggerSystem : EntitySystem
 {
-
-}
+}

Content.Shared/Flash/Components/FlashOnTriggerComponent.cs

@@ -1,5 +1,4 @@
 using Robust.Shared.GameStates;
-
 namespace Content.Shared.Flash.Components;
 
 /// <summary>

Content.Server/Light/Components/LightReplacerComponent.cs → Content.Shared/Light/Components/LightReplacerComponent.cs

@@ -1,15 +1,16 @@
-using Content.Server.Light.EntitySystems;
+using Content.Shared.Light.EntitySystems;
 using Content.Shared.Storage;
 using Robust.Shared.Audio;
 using Robust.Shared.Containers;
+using Robust.Shared.GameStates;
 
 namespace Content.Server.Light.Components;
 
 /// <summary>
 ///     Device that allows user to quikly change bulbs in <see cref="PoweredLightComponent"/>
 ///     Can be reloaded by new light tubes or light bulbs
 /// </summary>
-[RegisterComponent, Access(typeof(LightReplacerSystem))]
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedLightReplacerSystem))]
 public sealed partial class LightReplacerComponent : Component
 {
     [DataField("sound")]

Content.Shared/Light/EntitySystems/SharedLightReplacerSystem.cs

@@ -0,0 +1,5 @@
+namespace Content.Shared.Light.EntitySystems;
+
+public abstract class SharedLightReplacerSystem : EntitySystem
+{
+}

Content.Server/Mousetrap/MousetrapComponent.cs → Content.Shared/Mousetrap/MousetrapComponent.cs

@@ -1,10 +1,12 @@
-namespace Content.Server.Mousetrap;
+using Robust.Shared.GameStates;
 
-[RegisterComponent]
+namespace Content.Shared.Mousetrap;
+
+[RegisterComponent, NetworkedComponent]
 public sealed partial class MousetrapComponent : Component
 {
     [ViewVariables]
-	[DataField("isActive")]
+    [DataField("isActive")]
     public bool IsActive = false;
 
     /// <summary>

Content.Server/Nutrition/Components/UtensilComponent.cs → Content.Shared/Nutrition/Components/UtensilComponent.cs

@@ -1,9 +1,10 @@
-using Content.Server.Nutrition.EntitySystems;
+using Content.Shared.Nutrition.EntitySystems;
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.Nutrition.Components
+namespace Content.Shared.Nutrition.Components
 {
-    [RegisterComponent, Access(typeof(UtensilSystem))]
+    [RegisterComponent, NetworkedComponent, Access(typeof(SharedUtensilSystem))]
     public sealed partial class UtensilComponent : Component
     {
         [DataField("types")]

Content.Shared/Nutrition/EntitySystems/SharedUtensilSystem.cs

@@ -0,0 +1,5 @@
+namespace Content.Shared.Nutrition.EntitySystems;
+
+public abstract class SharedUtensilSystem : EntitySystem
+{
+}

Content.Server/SprayPainter/SprayPainterComponent.cs → Content.Shared/SprayPainter/Components/SprayPainterComponent.cs

@@ -1,8 +1,9 @@
 using Robust.Shared.Audio;
+using Robust.Shared.GameStates;
 
-namespace Content.Server.SprayPainter;
+namespace Content.Shared.SprayPainter.Components;
 
-[RegisterComponent]
+[RegisterComponent, NetworkedComponent]
 public sealed partial class SprayPainterComponent : Component
 {
     [DataField("spraySound")]

Resources/Prototypes/Entities/Clothing/Belt/belts.yml

@@ -179,7 +179,7 @@
         - SmokeOnTrigger
         - Flash
         - Handcuff
-        - RangedMagazine
+        - BallisticAmmoProvider
         - Ammo
   - type: ItemMapper
     mapLayers:
@@ -221,7 +221,7 @@
         - WetFloorSign
         - HolosignProjector
         - Plunger
-        - LightReplacer
+        - JanicartKeys
       components:
         - LightReplacer
   - type: ItemMapper

Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

@@ -329,7 +329,7 @@
         lightreplacer_slot:
           name: janitorial-trolley-slot-component-slot-name-lightreplacer
           whitelist:
-            tags:
+            components:
               - LightReplacer
           priority: 6
         spraybottle_slot:

Resources/Prototypes/Entities/Objects/Tools/light_replacer.yml

@@ -17,7 +17,6 @@
       amount: 5
   - type: Tag
     tags:
-      - LightReplacer
       - DroneUsable
   - type: StaticPrice
     price: 100

Resources/Prototypes/Entities/Objects/Tools/spray_painter.yml

@@ -14,9 +14,6 @@
         - key: enum.SprayPainterUiKey.Key
           type: SprayPainterBoundUserInterface
     - type: SprayPainter
-      whitelist:
-        tags:
-          - PaintableAirlock
       colorPalette:
         red: '#FF1212FF'
         yellow: '#B3A234FF'

Resources/Prototypes/Entities/Objects/Weapons/security.yml

@@ -186,6 +186,7 @@
       shape:
         !type:PhysShapeCircle
           radius: 2
+      repeating: true
     - type: Anchorable
     - type: Sprite
       sprite: Objects/Weapons/pflash.rsi

Resources/Prototypes/tags.yml

@@ -713,9 +713,6 @@
 - type: Tag
   id: Lemon
 
-- type: Tag
-  id: LightReplacer
-
 - type: Tag
   id: Lime
 
@@ -856,9 +853,6 @@
 - type: Tag
   id: Payload # for grenade/bomb crafting
 
-- type: Tag
-  id: PaintableAirlock
-
 - type: Tag
   id: Pancake