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

Merge branch 'master' of https://github.com/space-wizards/space-station-14

Browse Source
This commit is contained in:
ShadowCommander
2019-08-16 15:46:06 -07:00
parent 7f5654bb06 534af65f7c
commit 1c81f6097f
423 changed files with 3133 additions and 936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
View File

@@ -43,6 +43,8 @@ namespace Content.Server.GameObjects
{
base.ExposeData(serializer);
serializer.DataField(ref _clothingEquippedPrefix, "ClothingPrefix", null);
// TODO: Writing.
serializer.DataReadFunction("Slots", new List<string>(0), list =>
{

8
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -8,6 +8,7 @@ using Robust.Server.Interfaces.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Maths;
using Robust.Shared.Serialization;
namespace Content.Server.GameObjects
{
@@ -50,6 +51,13 @@ namespace Content.Server.GameObjects
}
}
public override void ExposeData(ObjectSerializer serializer)
{
base.ExposeData(serializer);
serializer.DataField(ref _equippedPrefix, "HeldPrefix", null);
}
public bool AttackHand(AttackHandEventArgs eventArgs)
{
var hands = eventArgs.User.GetComponent<IHandsComponent>();