From 0a28df0cd7c655b39ca7a8001f6e9a3fb9342db1 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sun, 13 Feb 2022 09:18:00 +1100
Subject: [PATCH] Sprite netsync purge wave 2 (#6560)

---
 Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs | 3 ++-
 Resources/Prototypes/Entities/Effects/weapon_arc.yml          | 1 +
 Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml         | 1 +
 .../Prototypes/Entities/Objects/Consumable/Food/food_base.yml | 2 ++
 Resources/Prototypes/Entities/Objects/Consumable/drinks.yml   | 3 ++-
 Resources/Prototypes/Entities/Objects/Fun/instruments.yml     | 2 ++
 Resources/Prototypes/Entities/Objects/Fun/toys.yml            | 3 +++
 Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml      | 1 +
 Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml   | 1 +
 .../Prototypes/Entities/Objects/Misc/inflatable_wall.yml      | 1 +
 .../Prototypes/Entities/Objects/Power/antimatter_jar.yml      | 1 +
 .../Entities/Objects/Specific/Hydroponics/tools.yml           | 4 +++-
 Resources/Prototypes/Entities/Objects/Specific/atmos.yml      | 1 +
 Resources/Prototypes/Entities/Objects/Tools/flashlights.yml   | 1 +
 Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml     | 1 +
 Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml  | 1 +
 Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml  | 1 +
 Resources/Prototypes/Entities/Objects/Tools/t-ray.yml         | 1 +
 Resources/Prototypes/Entities/Objects/Tools/tools.yml         | 1 +
 Resources/Prototypes/Entities/Objects/Tools/welders.yml       | 1 +
 Resources/Prototypes/Entities/Structures/Dispensers/booze.yml | 1 +
 Resources/Prototypes/Entities/Structures/Dispensers/soda.yml  | 1 +
 Resources/Prototypes/Entities/Structures/Furniture/beds.yml   | 1 +
 .../Structures/Machines/Computers/base_structurecomputers.yml | 1 +
 .../Prototypes/Entities/Structures/Machines/chem_master.yml   | 1 +
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml   | 2 ++
 .../Structures/Power/Generation/Singularity/collector.yml     | 1 +
 .../Structures/Power/Generation/Singularity/containment.yml   | 2 ++
 .../Structures/Power/Generation/Singularity/emitter.yml       | 1 +
 .../Structures/Power/Generation/Singularity/generator.yml     | 1 +
 .../Prototypes/Entities/Structures/Power/Generation/solar.yml | 2 ++
 Resources/Prototypes/Entities/Structures/Power/substation.yml | 1 +
 Resources/Prototypes/Entities/Structures/Storage/storage.yml  | 1 +
 33 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
index 7cc7a7da45..939e39e14d 100644
--- a/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
+++ b/Content.Shared/Weapons/Melee/MeleeWeaponAnimationPrototype.cs
@@ -2,6 +2,7 @@ using System;
 using Robust.Shared.Maths;
 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.Weapons.Melee
@@ -18,7 +19,7 @@ namespace Content.Shared.Weapons.Melee
         public string State { get; } = string.Empty;
 
         [ViewVariables]
-        [DataField("prototype")]
+        [DataField("prototype", customTypeSerializer:typeof(PrototypeIdSerializer<EntityPrototype>))]
         public string Prototype { get; } = "WeaponArc";
 
         [ViewVariables]
diff --git a/Resources/Prototypes/Entities/Effects/weapon_arc.yml b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
index 58ed1b675b..b9a16331ed 100644
--- a/Resources/Prototypes/Entities/Effects/weapon_arc.yml
+++ b/Resources/Prototypes/Entities/Effects/weapon_arc.yml
@@ -5,6 +5,7 @@
   components:
   - type: Sprite
     sprite: Effects/arcs.rsi
+    netsync: false
     noRot: false
     offset: 0, -0.85
     drawdepth: Effects
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
index cfa0171208..b906cfb533 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml
@@ -32,6 +32,7 @@
   - type: Sprite
     noRot: true
     drawdepth: Mobs
+    netsync: false
   - type: Clickable
   - type: InteractionOutline
   - type: Physics
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
index 3044b2cb92..cab454e938 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/food_base.yml
@@ -7,6 +7,8 @@
   abstract: true
   components:
   - type: Food
+  - type: Sprite
+    netsync: false
 
 # This base type is used to cover all of the "obvious" things that should be doable to open-package food.
 # Practically this means injection.
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
index 7110231609..fd8adc3a58 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/drinks.yml
@@ -14,6 +14,7 @@
   - type: Drink
   - type: Sprite
     state: icon
+    netsync: false
   - type: Spillable
     solution: drink
   - type: UserInterface
@@ -2120,4 +2121,4 @@
           Quantity: 30
         - ReagentId: CapsaicinOil
           Quantity: 5
-          
+
diff --git a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
index ca6311f55a..b65e89e9bf 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/instruments.yml
@@ -4,6 +4,8 @@
   id: BaseHandheldInstrument
   description: That's an instrument.
   components:
+  - type: Sprite
+    netsync: false
   - type: Instrument
   - type: ActivatableUI
     inHandsOnly: true
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 2d9fdebfc2..c50c4d6e4e 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -5,6 +5,8 @@
   id: BasePlushie
   abstract: true
   components:
+  - type: Sprite
+    netsync: false
   - type: EmitSoundOnUse
     sound:
       collection: ToySqueak
@@ -163,6 +165,7 @@
   - type: Sprite
     sprite: Objects/Fun/toys.rsi
     state: plushie_vox
+    netsync: false
   - type: ItemCooldown
   - type: EmitSoundOnUse
     sound:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
index e98a508316..9bf72d5057 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml
@@ -11,6 +11,7 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/bedsheets.rsi
+    netsync: false
   - type: Clothing
     size: 10
     QuickEquip: true
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
index a59a462428..2c8cf1c26e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml
@@ -11,6 +11,7 @@
         - actionType: ToggleLight
   - type: Sprite
     sprite: Objects/Misc/Lights/lights.rsi
+    netsync: false
   - type: Item
     sprite: Objects/Misc/Lights/lights.rsi
 
diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
index bb37472be8..08e0601a7e 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml
@@ -8,6 +8,7 @@
   - type: Sprite
     sprite: Objects/Misc/inflatable_wall.rsi
     state: inflatable_wall
+    netsync: false
   - type: Physics
     bodyType: Static
   - type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
index 0a6d544246..d856cc506e 100644
--- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml
@@ -10,4 +10,5 @@
   - type: Sprite
     sprite: Objects/Power/AME/ame_jar.rsi
     state: jar
+    netsync: false
   - type: AMEFuelContainer
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
index 6dcb33afa4..a58901e170 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/tools.yml
@@ -51,6 +51,7 @@
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/scythe.rsi
     state: icon
+    netsync: false
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
@@ -61,7 +62,7 @@
     size: 20
     Slots:
     - back
-    
+
 - type: entity
   name: hatchet
   parent: BaseItem
@@ -75,6 +76,7 @@
   - type: Sprite
     sprite: Objects/Tools/Hydroponics/hatchet.rsi
     state: icon
+    netsync: false
   - type: ItemCooldown
   - type: MeleeWeapon
     damage:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
index 7fc3129c50..172d25e145 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml
@@ -7,6 +7,7 @@
   - type: Sprite
     sprite: Objects/Specific/Atmos/gasanalyzer.rsi
     state: icon
+    netsync: false
   - type: GasAnalyzer
   - type: UserInterface
     interfaces:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
index 77902ca7bc..eef703450a 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml
@@ -16,6 +16,7 @@
       startingItem: PowerCellSmallHigh
   - type: Sprite
     sprite: Objects/Tools/flashlight.rsi
+    netsync: false
     layers:
       - state: flashlight
       - state: flashlight-overlay
diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 087fbadf33..67d4ee317f 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -91,6 +91,7 @@
   components:
   - type: Sprite
     sprite: Objects/Tanks/emergency_yellow.rsi
+    netsync: false
   - type: GasTank
     outputPressure: 21.27825
     air:
diff --git a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
index 3b16f6938a..037a44295e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/hand_labeler.yml
@@ -7,6 +7,7 @@
     - type: Sprite
       sprite: Objects/Tools/hand_labeler.rsi
       state: hand_labeler
+      netsync: false
     - type: Item
       sprite: Objects/Tools/hand_labeler.rsi
     - type: UseDelay
diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
index 9d61b5de1a..927c0fdbcd 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
@@ -10,6 +10,7 @@
   - type: Sprite
     sprite: Objects/Tools/jaws_of_life.rsi
     state: jaws_pry
+    netsync: false
   - type: Clothing
     sprite: Objects/Tools/jaws_of_life.rsi
     size: 50
diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
index be3e90b46e..d68bc8905d 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml
@@ -5,6 +5,7 @@
   components:
   - type: Sprite
     sprite: Objects/Tools/t-ray.rsi
+    netsync: false
     layers:
     - state: tray-off
   - type: TrayScanner
diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
index 1fccf8901d..e3984c7c5b 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml
@@ -94,6 +94,7 @@
   - type: Sprite
     sprite: Objects/Tools/wrench.rsi
     state: icon
+    netsync: false
   - type: Item
     sprite: Objects/Tools/wrench.rsi
   - type: ItemCooldown
diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
index 31fac717b7..6dc395f63e 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml
@@ -9,6 +9,7 @@
       path: /Audio/Items/welder_drop.ogg
   - type: Sprite
     sprite: Objects/Tools/welder.rsi
+    netsync: false
     layers:
     - state: icon
     - state: welder_flame
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
index a27eb7f4aa..274980d726 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/booze.yml
@@ -9,6 +9,7 @@
     sprite: Structures/dispensers.rsi
     drawdepth: SmallObjects
     state: booze
+    netsync: false
   - type: Fixtures
     fixtures:
     - shape:
diff --git a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
index ce79205615..09dcdc407d 100644
--- a/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
+++ b/Resources/Prototypes/Entities/Structures/Dispensers/soda.yml
@@ -9,6 +9,7 @@
     sprite: Structures/dispensers.rsi
     drawdepth: SmallObjects
     state: soda
+    netsync: false
   - type: Fixtures
     fixtures:
     - shape:
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
index cd79f90461..828a571294 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/beds.yml
@@ -17,6 +17,7 @@
   - type: Sprite
     sprite: Structures/Furniture/furniture.rsi
     state: bed
+    netsync: false
   - type: Strap
     position: Down
     rotation: -90
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
index 61fec8d279..9b6d930c35 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/base_structurecomputers.yml
@@ -14,6 +14,7 @@
   - type: ExtensionCableReceiver
   - type: Sprite
     sprite: Structures/Machines/computers.rsi
+    netsync: false
     layers:
     - state: computer
       map: ["enum.ComputerVisualizer+Layers.Body"]
diff --git a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
index d3129a2140..55c1f7a03b 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
@@ -8,6 +8,7 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/mixer.rsi
+    netsync: false
     layers:
     - state: mixer_empty
     - state: mixer_screens
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 8641dd800c..7dba24ecbf 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -6,6 +6,7 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/autolathe.rsi
+    netsync: false
     layers:
     - state: icon
       map: ["enum.AutolatheVisualLayers.Base"]
@@ -84,6 +85,7 @@
   components:
   - type: Sprite
     sprite: Structures/Machines/protolathe.rsi
+    netsync: false
     layers:
     - state: icon
       map: ["enum.ProtolatheVisualLayers.Base"]
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
index 3d23d55286..2c5f87643f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/collector.yml
@@ -28,6 +28,7 @@
     anchored: true
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/collector.rsi
+    netsync: false
     layers:
       - state: ca_on
         map: ["enum.RadiationCollectorVisualLayers.Main"]
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
index f167b1c467..551ba599e6 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/containment.yml
@@ -33,6 +33,7 @@
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
+    netsync: false
   - type: Icon
     sprite: Structures/Power/Generation/Singularity/containment.rsi
     state: icon
@@ -76,6 +77,7 @@
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/containment_field.rsi
     state: field
+    netsync: false
   - type: Icon
     sprite: Structures/Power/Generation/Singularity/containment_field.rsi
     state: field
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
index 4fd9485365..5c7ce5e056 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
@@ -28,6 +28,7 @@
     anchored: true
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/emitter.rsi
+    netsync: false
     layers:
     - state: emitter2
     - state: beam
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
index 0fc986d226..fbc971fcbd 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/generator.yml
@@ -8,6 +8,7 @@
   - type: Sprite
     sprite: Structures/Power/Generation/Singularity/generator.rsi
     state: icon
+    netsync: false
   - type: SingularityGenerator
   - type: InteractionOutline
   - type: Clickable
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
index 5daa6316da..1ce001d943 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/solar.yml
@@ -30,6 +30,7 @@
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: normal
+    netsync: false
   - type: NodeContainer
     examinable: true
     nodes:
@@ -170,6 +171,7 @@
   - type: Sprite
     sprite: Structures/Power/Generation/solar_panel.rsi
     state: solar_tracker
+    netsync: false
   - type: Transform
     anchored: true
   - type: Damageable
diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml
index 81d625c1f4..970aa1be1f 100644
--- a/Resources/Prototypes/Entities/Structures/Power/substation.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml
@@ -9,6 +9,7 @@
   components:
   - type: Sprite # TODO: add sprite for maintenance panel open
     sprite: Structures/Power/substation.rsi
+    netsync: false
     layers:
     - state: substation
     - state: screen
diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index f92ba54d12..3c57a23a4f 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -13,6 +13,7 @@
   - type: Sprite
     sprite: Structures/Furniture/furniture.rsi
     state: rack
+    netsync: false
   - type: Fixtures
     fixtures:
     - shape: