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

Make component states dependant on the player getting them (#3280)

Browse Source 
* Make component states dependant on the player getting them

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>

* Updated submodule to v0.3.7.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Acruid <shatter66@gmail.com>
This commit is contained in:
DrSmugleaf
2021-02-18 09:09:07 +01:00
committed by GitHub
parent 77c8fc5b42
commit 1477cd4d0a
61 changed files with 145 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/ActionBlocking/CuffableComponent.cs
View File

@@ -16,6 +16,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.ViewVariables;
namespace Content.Server.GameObjects.Components.ActionBlocking
@@ -55,7 +56,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
Owner.EnsureComponentWarn<HandsComponent>();
}
public override ComponentState GetComponentState()
public override ComponentState GetComponentState(ICommonSession player)
{
// there are 2 approaches i can think of to handle the handcuff overlay on players
// 1 - make the current RSI the handcuff type that's currently active. all handcuffs on the player will appear the same.

3
Content.Server/GameObjects/Components/ActionBlocking/HandcuffComponent.cs
View File

@@ -13,6 +13,7 @@ using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -136,7 +137,7 @@ namespace Content.Server.GameObjects.Components.ActionBlocking
serializer.DataField(this, x => x.BrokenDesc, "brokenDesc", string.Empty);
}
public override ComponentState GetComponentState()
public override ComponentState GetComponentState(ICommonSession player)
{
return new HandcuffedComponentState(Broken ? BrokenState : string.Empty);
}