Makes more fields VV (#2026)

* Some more VV

* Fixed build & some more gun vvs

* Added VendingMachine Inventory & Items

Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs

@@ -15,6 +15,7 @@ using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Interfaces.Timing;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Client.GameObjects.Components.Mobs
 {
@@ -29,7 +30,9 @@ namespace Content.Client.GameObjects.Components.Mobs
         [Dependency] private readonly IGameTiming _gameTiming = default!;
 
         private StatusEffectsUI _ui;
+        [ViewVariables]
         private Dictionary<StatusEffect, StatusEffectStatus> _status = new Dictionary<StatusEffect, StatusEffectStatus>();
+        [ViewVariables]
         private Dictionary<StatusEffect, CooldownGraphic> _cooldown = new Dictionary<StatusEffect, CooldownGraphic>();
 
         /// <summary>

Content.Server/GameObjects/Components/AnchorableComponent.cs

@@ -7,6 +7,7 @@ using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components;
 using Robust.Shared.Interfaces.GameObjects;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components
 {
@@ -15,6 +16,7 @@ namespace Content.Server.GameObjects.Components
     {
         public override string Name => "Anchorable";
 
+        [ViewVariables]
         int IInteractUsing.Priority => 1;
 
         /// <summary>

Content.Server/GameObjects/Components/Atmos/MovedByPressureComponent.cs

@@ -1,5 +1,6 @@
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Atmos
 {
@@ -8,8 +9,11 @@ namespace Content.Server.GameObjects.Components.Atmos
     {
         public override string Name => "MovedByPressure";
 
+        [ViewVariables(VVAccess.ReadWrite)]
         public float PressureResistance { get; set; } = 1f;
+        [ViewVariables(VVAccess.ReadWrite)]
         public float MoveResist { get; set; } = 100f;
+        [ViewVariables]
         public int LastHighPressureMovementAirCycle { get; set; } = 0;
 
         public override void ExposeData(ObjectSerializer serializer)

Content.Server/GameObjects/Components/Body/Digestive/StomachComponent.cs

@@ -50,6 +50,7 @@ namespace Content.Server.GameObjects.Components.Body.Digestive
         /// <summary>
         ///     Used to track how long each reagent has been in the stomach
         /// </summary>
+        [ViewVariables]
         private readonly List<ReagentDelta> _reagentDeltas = new List<ReagentDelta>();
 
         public override void ExposeData(ObjectSerializer serializer)

Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs

@@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
 
         private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
 
-        private readonly SolutionComponent BufferSolution = new SolutionComponent();
+        [ViewVariables] private readonly SolutionComponent BufferSolution = new SolutionComponent();
 
         [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ChemMasterUiKey.Key);
 

Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs

@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         /// <summary>
         ///     The amount of solution to be transferred from this solution when clicking on other solutions with it.
         /// </summary>
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public ReagentUnit TransferAmount
         {
             get => _transferAmount;

Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs

@@ -49,7 +49,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
         [ViewVariables] private ReagentUnit _dispenseAmount = ReagentUnit.New(10);
 
         [ViewVariables]
-        private SolutionComponent Solution => _beakerContainer.ContainedEntity.GetComponent<SolutionComponent>();
+        private SolutionComponent? Solution => _beakerContainer.ContainedEntity?.GetComponent<SolutionComponent>();
 
         private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
 

Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs

@@ -61,14 +61,15 @@ namespace Content.Server.GameObjects.Components.Disposal
         ///     The current pressure of this disposal unit.
         ///     Prevents it from flushing if it is not equal to or bigger than 1.
         /// </summary>
+        [ViewVariables]
         private float _pressure;
 
         private bool _engaged;
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         private TimeSpan _automaticEngageTime;
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         private TimeSpan _flushDelay;
 
         [ViewVariables]
@@ -101,7 +102,7 @@ namespace Content.Server.GameObjects.Components.Disposal
         [ViewVariables]
         private PressureState State => _pressure >= 1 ? PressureState.Ready : PressureState.Pressurizing;
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         private bool Engaged
         {
             get => _engaged;

Content.Server/GameObjects/Components/Doors/AirlockComponent.cs

@@ -18,6 +18,7 @@ using Robust.Shared.GameObjects.Systems;
 using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Maths;
+using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.SharedWiresComponent;
 using static Content.Shared.GameObjects.Components.SharedWiresComponent.WiresAction;
 using Timer = Robust.Shared.Timers.Timer;
@@ -43,6 +44,7 @@ namespace Content.Server.GameObjects.Components.Doors
         /// <summary>
         /// True if either power wire was pulsed in the last <see cref="PowerWiresTimeout"/>.
         /// </summary>
+        [ViewVariables(VVAccess.ReadWrite)]
         private bool PowerWiresPulsed
         {
             get => _powerWiresPulsed;
@@ -56,6 +58,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         private bool _boltsDown;
 
+        [ViewVariables(VVAccess.ReadWrite)]
         private bool BoltsDown
         {
             get => _boltsDown;
@@ -68,6 +71,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         private bool _boltLightsWirePulsed = true;
 
+        [ViewVariables(VVAccess.ReadWrite)]
         private bool BoltLightsVisible
         {
             get => _boltLightsWirePulsed && BoltsDown && IsPowered() && State == DoorState.Closed;
@@ -80,6 +84,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         private const float AutoCloseDelayFast = 1;
         // True => AutoCloseDelay; False => AutoCloseDelayFast
+        [ViewVariables(VVAccess.ReadWrite)]
         private bool NormalCloseSpeed
         {
             get => CloseSpeed == AutoCloseDelay;

Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs

@@ -36,6 +36,7 @@ namespace Content.Server.GameObjects.Components.Doors
     {
         public override string Name => "Door";
 
+        [ViewVariables]
         private DoorState _state = DoorState.Closed;
 
         public virtual DoorState State
@@ -45,8 +46,10 @@ namespace Content.Server.GameObjects.Components.Doors
         }
 
         protected float OpenTimeCounter;
+        [ViewVariables(VVAccess.ReadWrite)]
         protected bool AutoClose = true;
         protected const float AutoCloseDelay = 5;
+        [ViewVariables(VVAccess.ReadWrite)]
         protected float CloseSpeed = AutoCloseDelay;
         
         private CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
@@ -59,11 +62,12 @@ namespace Content.Server.GameObjects.Components.Doors
 
         private const int DoorCrushDamage = 15;
         private const float DoorStunTime = 5f;
+        [ViewVariables(VVAccess.ReadWrite)]
         protected bool Safety = true;
 
-        [ViewVariables] private bool _occludes;
+        [ViewVariables(VVAccess.ReadWrite)] private bool _occludes;
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool IsWeldedShut
         {
             get => _isWeldedShut;

Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs

@@ -9,6 +9,7 @@ using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
 
 namespace Content.Server.GameObjects.Components.Items.Clothing
@@ -22,13 +23,16 @@ namespace Content.Server.GameObjects.Components.Items.Clothing
         public override string Name => "Clothing";
         public override uint? NetID => ContentNetIDs.CLOTHING;
 
+        [ViewVariables]
         public SlotFlags SlotFlags = SlotFlags.PREVENTEQUIP; //Different from None, NONE allows equips if no slot flags are required
 
         private bool _quickEquipEnabled = true;
         private int _heatResistance;
+        [ViewVariables(VVAccess.ReadWrite)]
         public int HeatResistance => _heatResistance;
 
         private string _clothingEquippedPrefix;
+        [ViewVariables(VVAccess.ReadWrite)]
         public string ClothingEquippedPrefix
         {
             get

Content.Server/GameObjects/Components/Items/Storage/Fill/StorageFillComponent.cs

@@ -4,6 +4,7 @@ using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 {
@@ -14,6 +15,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
 
         public override string Name => "StorageFill";
 
+        [ViewVariables]
         private List<string> _contents = new List<string>();
 
         public override void ExposeData(ObjectSerializer serializer)

Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs

@@ -26,6 +26,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Players;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Items.Storage
 {
@@ -51,6 +52,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
         private int _storageCapacityMax;
         public readonly HashSet<IPlayerSession> SubscribedSessions = new HashSet<IPlayerSession>();
 
+        [ViewVariables]
         public IReadOnlyCollection<IEntity>? StoredEntities => _storage?.ContainedEntities;
 
         public bool OccludesLight

Content.Server/GameObjects/Components/Mobs/ServerStatusEffectsComponent.cs

@@ -8,6 +8,7 @@ using Content.Shared.Interfaces;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Interfaces.Network;
 using Robust.Shared.Players;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Mobs
 {
@@ -15,6 +16,7 @@ namespace Content.Server.GameObjects.Components.Mobs
     [ComponentReference(typeof(SharedStatusEffectsComponent))]
     public sealed class ServerStatusEffectsComponent : SharedStatusEffectsComponent
     {
+        [ViewVariables]
         private readonly Dictionary<StatusEffect, StatusEffectStatus> _statusEffects = new Dictionary<StatusEffect, StatusEffectStatus>();
 
         public override ComponentState GetComponentState()

Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs

@@ -40,9 +40,9 @@ namespace Content.Server.GameObjects.Components.Nutrition
         private string _useSound;
         [ViewVariables]
         private bool _defaultToOpened;
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public ReagentUnit TransferAmount { get; private set; } = ReagentUnit.New(2);
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool Opened { get; protected set; }
         [ViewVariables]
         public bool Empty => _contents.CurrentVolume.Float() <= 0;

Content.Server/GameObjects/Components/PlaceableSurfaceComponent.cs

@@ -1,9 +1,10 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Content.Server.GameObjects.Components.GUI;
 using Content.Shared.GameObjects.Components;
 using Content.Shared.Interfaces.GameObjects.Components;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components
 {
@@ -11,8 +12,10 @@ namespace Content.Server.GameObjects.Components
     public class PlaceableSurfaceComponent : SharedPlaceableSurfaceComponent, IInteractUsing
     {
         private bool _isPlaceable;
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool IsPlaceable { get => _isPlaceable; set => _isPlaceable = value; }
 
+        [ViewVariables]
         int IInteractUsing.Priority => 1;
 
         public override void ExposeData(ObjectSerializer serializer)

Content.Server/GameObjects/Components/Research/LatheComponent.cs

@@ -41,6 +41,7 @@ namespace Content.Server.GameObjects.Components.Research
             set => _state = value;
         }
 
+        [ViewVariables]
         private LatheRecipePrototype? _producingRecipe;
         private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
 

Content.Server/GameObjects/Components/Research/LatheDatabaseComponent.cs

@@ -1,7 +1,8 @@
-using Content.Shared.GameObjects.Components.Research;
+using Content.Shared.GameObjects.Components.Research;
 using Content.Shared.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Research
 {
@@ -12,6 +13,7 @@ namespace Content.Server.GameObjects.Components.Research
         /// <summary>
         ///     Whether new recipes can be added to this database or not.
         /// </summary>
+        [ViewVariables]
         public bool Static => _static;
         private bool _static = false;
 

Content.Server/GameObjects/Components/Research/MaterialStorageComponent.cs

@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using Content.Shared.GameObjects.Components.Research;
 using Robust.Shared.GameObjects;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Research
 {
@@ -9,11 +10,13 @@ namespace Content.Server.GameObjects.Components.Research
     [ComponentReference(typeof(SharedMaterialStorageComponent))]
     public class MaterialStorageComponent : SharedMaterialStorageComponent
     {
+        [ViewVariables]
         protected override Dictionary<string, int> Storage { get; set; } = new Dictionary<string, int>();
 
         /// <summary>
         ///     How much material the storage can store in total.
         /// </summary>
+        [ViewVariables]
         public int StorageLimit => _storageLimit;
         private int _storageLimit;
 

Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs

@@ -29,7 +29,7 @@ namespace Content.Server.GameObjects.Components.Research
 
         private const string SoundCollectionName = "keyboard";
 
-        private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
+        [ViewVariables] private bool Powered => !Owner.TryGetComponent(out PowerReceiverComponent? receiver) || receiver.Powered;
 
         [ViewVariables] private BoundUserInterface? UserInterface => Owner.GetUIOrNull(ResearchConsoleUiKey.Key);
 

Content.Server/GameObjects/Components/Research/ResearchPointSourceComponent.cs

@@ -16,14 +16,14 @@ namespace Content.Server.GameObjects.Components.Research
         private bool _active;
         private PowerReceiverComponent _powerReceiver;
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public int PointsPerSecond
         {
             get => _pointsPerSecond;
             set => _pointsPerSecond = value;
         }
 
-        [ViewVariables]
+        [ViewVariables(VVAccess.ReadWrite)]
         public bool Active
         {
             get => _active;
@@ -34,6 +34,7 @@ namespace Content.Server.GameObjects.Components.Research
         /// Whether this can be used to produce research points.
         /// </summary>
         /// <remarks>If no <see cref="PowerReceiverComponent"/> is found, it's assumed power is not required.</remarks>
+        [ViewVariables]
         public bool CanProduce => Active && (_powerReceiver is null || _powerReceiver.Powered);
 
         public override void Initialize()

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/BoltActionBarrelComponent.cs

@@ -20,6 +20,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
 {
@@ -50,8 +51,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         private Stack<IEntity> _spawnedAmmo;
         private Container _ammoContainer;
 
+        [ViewVariables]
         private BallisticCaliber _caliber;
 
+        [ViewVariables]
         private string _fillPrototype;
         private int _unspawnedCount;
 

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/PumpBarrelComponent.cs

@@ -18,6 +18,7 @@ using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
 using Robust.Shared.Utility;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
 {
@@ -47,8 +48,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         private Stack<IEntity> _spawnedAmmo;
         private Container _ammoContainer;
 
+        [ViewVariables]
         private BallisticCaliber _caliber;
 
+        [ViewVariables]
         private string _fillPrototype;
         private int _unspawnedCount;
 

Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/RevolverBarrelComponent.cs

@@ -19,6 +19,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Localization;
 using Robust.Shared.Map;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
 {
@@ -30,8 +31,10 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         public override string Name => "RevolverBarrel";
         public override uint? NetID => ContentNetIDs.REVOLVER_BARREL;
 
+        [ViewVariables]
         private BallisticCaliber _caliber;
         private Container _ammoContainer;
+        [ViewVariables]
         private int _currentSlot = 0;
         public override int Capacity => _ammoSlots.Length;
         private IEntity[] _ammoSlots;
@@ -39,6 +42,7 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
         public override int ShotsLeft => _ammoContainer.ContainedEntities.Count;
 
         private AppearanceComponent _appearanceComponent;
+        [ViewVariables]
         private string _fillPrototype;
         private int _unspawnedCount;
 

Content.Server/GameObjects/Components/WiresComponent.cs

@@ -114,11 +114,13 @@ namespace Content.Server.GameObjects.Components
         /// <summary>
         /// Contains all registered wires.
         /// </summary>
+        [ViewVariables]
         public readonly List<Wire> WiresList = new List<Wire>();
 
         /// <summary>
         /// Status messages are displayed at the bottom of the UI.
         /// </summary>
+        [ViewVariables]
         private readonly Dictionary<object, object> _statuses = new Dictionary<object, object>();
 
         /// <summary>

Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs

@@ -78,7 +78,9 @@ namespace Content.Shared.GameObjects.Components.Movement
             }
         }
 
+        [ViewVariables(VVAccess.ReadWrite)]
         public float CurrentPushSpeed => 5;
+        [ViewVariables(VVAccess.ReadWrite)]
         public float GrabRange => 0.2f;
         public bool Sprinting => !HasFlag(_heldMoveButtons, MoveButtons.Walk);
 

Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using Robust.Shared.GameObjects;
 using Robust.Shared.GameObjects.Components.UserInterface;
 using Robust.Shared.Serialization;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.GameObjects.Components.VendingMachines
 {
@@ -11,6 +12,7 @@ namespace Content.Shared.GameObjects.Components.VendingMachines
         public override string Name => "VendingMachine";
         public override uint? NetID => ContentNetIDs.VENDING_MACHINE;
 
+        [ViewVariables]
         public List<VendingMachineInventoryEntry> Inventory = new List<VendingMachineInventoryEntry>();
 
         [Serializable, NetSerializable]
@@ -63,7 +65,9 @@ namespace Content.Shared.GameObjects.Components.VendingMachines
         [Serializable, NetSerializable]
         public class VendingMachineInventoryEntry
         {
+            [ViewVariables(VVAccess.ReadWrite)]
             public string ID;
+            [ViewVariables(VVAccess.ReadWrite)]
             public uint Amount;
             public VendingMachineInventoryEntry(string id, uint amount)
             {

Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs

@@ -1,14 +1,20 @@
-using System;
+using System;
 using Robust.Shared.GameObjects;
+using Robust.Shared.ViewVariables;
 
 namespace Content.Shared.GameObjects.Components.Weapons.Ranged
 {
     public abstract class SharedRangedBarrelComponent : Component
     {
+        [ViewVariables]
         public abstract FireRateSelector FireRateSelector { get; }
+        [ViewVariables]
         public abstract FireRateSelector AllRateSelectors { get; }
+        [ViewVariables]
         public abstract float FireRate { get; }
+        [ViewVariables]
         public abstract int ShotsLeft { get; }
+        [ViewVariables]
         public abstract int Capacity { get; }
     }
 
@@ -19,4 +25,4 @@ namespace Content.Shared.GameObjects.Components.Weapons.Ranged
         Single = 1 << 0,
         Automatic = 1 << 1,
     }
-}
+}