Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2020-08-19-firelocks

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-08 15:21:58 +02:00
committed by GitHub
parent 511147f299 5120627ca2
commit cca740eb2a
28 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/GameObjects/Components/Movement/SharedPlayerInputMoverComponent.cs
View File

@@ -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);

4
Content.Shared/GameObjects/Components/VendingMachines/SharedVendingMachineComponent.cs
View File

@@ -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)
{

10
Content.Shared/GameObjects/Components/Weapons/Ranged/SharedRangedBarrelComponent.cs
View File

@@ -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,
}
}
}