diff --git a/Content.Shared/Item/ItemSystem.cs b/Content.Shared/Item/ItemSystem.cs index 1f05a229b0..54eaa0f2dc 100644 --- a/Content.Shared/Item/ItemSystem.cs +++ b/Content.Shared/Item/ItemSystem.cs @@ -37,6 +37,11 @@ namespace Content.Shared.Item args.State = new ItemComponentState(component.Size, component.EquippedPrefix, component.Color, component.RsiPath); } + // Although netsync is being set to false for items client can still update these + // Realistically: + // Container should already hide these + // Client is the only thing that matters. + private void OnUnequipped(EntityUid uid, SharedSpriteComponent component, GotUnequippedEvent args) { component.Visible = true; diff --git a/Resources/Prototypes/Entities/Markers/marker_base.yml b/Resources/Prototypes/Entities/Markers/marker_base.yml index 7613913edb..4bbb4d9fc5 100644 --- a/Resources/Prototypes/Entities/Markers/marker_base.yml +++ b/Resources/Prototypes/Entities/Markers/marker_base.yml @@ -11,6 +11,7 @@ - type: InteractionOutline - type: Sprite sprite: Markers/cross.rsi + netsync: false # If serialization was cool this would work. # layers: # - state: blue diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml index 0c0ae550b3..eafd579fd3 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/apc.yml @@ -7,3 +7,4 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: charger_APC + netsync: false diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml index cd44d0d755..88e2a2ad77 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/firelock.yml @@ -10,3 +10,4 @@ - type: Sprite sprite: Objects/Misc/module.rsi state: mainboard + netsync: false diff --git a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml index b7df24c45b..ace334c5ba 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/tiles.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/tiles.yml @@ -6,6 +6,7 @@ components: - type: Sprite sprite: Objects/Tiles/tile.rsi + netsync: false - type: Item sprite: Objects/Tiles/tile.rsi - type: DamageOtherOnHit diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 63051f3736..832157fdc2 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -3,6 +3,8 @@ parent: BaseItem abstract: true components: + - type: Sprite + netsync: false - type: EmitSoundOnLand sound: path: /Audio/Items/toolbox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 9822302ed4..1fccf8901d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -122,6 +122,7 @@ - type: Sprite sprite: Objects/Tools/crowbar.rsi state: icon + netsync: false - type: Item sprite: Objects/Tools/crowbar.rsi size: 10 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml index ce8887988d..07f1eebd54 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/carpets.yml @@ -7,6 +7,7 @@ components: - type: Sprite drawdepth: FloorTiles + netsync: false - type: Icon state: full - type: IconSmooth diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index eb3fc7ed4b..3b3c63beb6 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -22,6 +22,7 @@ - type: Sprite sprite: Structures/Furniture/chairs.rsi noRot: true + netsync: false - type: Strap position: Stand buckleOffset: "0,0.15" @@ -210,4 +211,4 @@ sound: path: /Audio/Voice/Human/womanlaugh.ogg graph: RitualSeat - node: chairCursed \ No newline at end of file + node: chairCursed diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 780abda3fb..7d87371d82 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -8,6 +8,8 @@ snap: - Disposal components: + - type: Sprite + netsync: false - type: SubFloorHide - type: Clickable - type: InteractionOutline diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml index 5a861537a0..bf1cd78171 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml @@ -5,6 +5,8 @@ description: "A liquids storage tank." abstract: true components: + - type: Sprite + netsync: false - type: InteractionOutline - type: Physics - type: Fixtures diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index b4f3410b92..5a4511e3f0 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml @@ -29,3 +29,4 @@ - type: Sprite drawdepth: WallTops sprite: Structures/Wallmounts/signs.rsi + netsync: false diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml index a5b05972c3..cb5288537e 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/lighting.yml @@ -22,6 +22,7 @@ - type: Sprite sprite: Structures/Wallmounts/Lighting/light_tube.rsi drawdepth: WallMountedItems + netsync: false layers: - state: on map: ["enum.PoweredLightLayers.Base"] @@ -137,7 +138,6 @@ damage: types: Heat: 20 - - type: entity parent: WallLight id: UnpoweredLightExterior @@ -149,6 +149,7 @@ softness: 0.5 color: "#B4FCF0" + - type: entity id: PoweredlightSodium description: "A light fixture. Draws power and produces light when equipped with a light tube." @@ -257,4 +258,4 @@ hasLampOnSpawn: LightBulb damage: types: - Heat: 20 \ No newline at end of file + Heat: 20 diff --git a/Resources/Prototypes/Entities/Structures/soil.yml b/Resources/Prototypes/Entities/Structures/soil.yml index 7cadbccac8..43c5a005e2 100644 --- a/Resources/Prototypes/Entities/Structures/soil.yml +++ b/Resources/Prototypes/Entities/Structures/soil.yml @@ -39,6 +39,7 @@ - type: Sprite sprite: Structures/Hydroponics/misc.rsi state: soil + netsync: false - type: PlantHolder drawWarnings: false - type: SolutionContainerManager