tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes magboots grant gravity. (#6054)

Browse Source
This commit is contained in:
Moony
2022-01-13 06:13:25 -08:00
committed by GitHub
parent e306131841
commit bd359dd54c
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Clothing/MagbootsComponent.cs
View File

@@ -4,6 +4,7 @@ using Robust.Shared.GameObjects;
namespace Content.Client.Clothing namespace Content.Client.Clothing
{ {
[RegisterComponent] [RegisterComponent]
[ComponentReference(typeof(SharedMagbootsComponent))]
public sealed class MagbootsComponent : SharedMagbootsComponent public sealed class MagbootsComponent : SharedMagbootsComponent
{ {
public override bool On { get; set; } public override bool On { get; set; }

1
Content.Server/Clothing/Components/MagbootsComponent.cs
View File

@@ -17,6 +17,7 @@ namespace Content.Server.Clothing.Components
{ {
[RegisterComponent] [RegisterComponent]
[ComponentReference(typeof(IActivate))] [ComponentReference(typeof(IActivate))]
[ComponentReference(typeof(SharedMagbootsComponent))]
public sealed class MagbootsComponent : SharedMagbootsComponent, IActivate public sealed class MagbootsComponent : SharedMagbootsComponent, IActivate
{ {
[ComponentDependency] private SharedItemComponent? _item = null; [ComponentDependency] private SharedItemComponent? _item = null;

9
Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs
View File

@@ -1,4 +1,6 @@
using Content.Shared.Clothing;
using Content.Shared.Gravity; using Content.Shared.Gravity;
using Content.Shared.Inventory;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -36,6 +38,13 @@ namespace Content.Shared.Movement.Components
mapManager ??= IoCManager.Resolve<IMapManager>(); mapManager ??= IoCManager.Resolve<IMapManager>();
var grid = mapManager.GetGrid(gridId); var grid = mapManager.GetGrid(gridId);
var invSys = EntitySystem.Get<InventorySystem>();
if (invSys.TryGetSlotEntity(entity, "shoes", out var ent))
{
if (entityManager.TryGetComponent<SharedMagbootsComponent>(ent, out var boots) && boots.On)
return false;
}
if (!entityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled) if (!entityManager.GetComponent<GravityComponent>(grid.GridEntityId).Enabled)
{ {