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

HAMTR mech (hamster mech) (needs review) (#16393)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
brainfood1183
2023-06-08 07:33:35 +01:00
committed by GitHub
parent 9dbb74b0bb
commit cd7d4be188
56 changed files with 628 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/Mech/Components/MechComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Actions.ActionTypes;
using Content.Shared.Actions.ActionTypes;
using Content.Shared.FixedPoint;
using Content.Shared.Whitelist;
using Robust.Shared.Containers;
@@ -93,6 +93,9 @@ public sealed class MechComponent : Component
[DataField("equipmentWhitelist")]
public EntityWhitelist? EquipmentWhitelist;
[DataField("pilotWhitelist")]
public EntityWhitelist? PilotWhitelist;
/// <summary>
/// A container for storing the equipment entities.
/// </summary>

6
Content.Shared/Mech/EntitySystems/SharedMechSystem.cs
View File

@@ -1,4 +1,4 @@
using System.Linq;
using System.Linq;
using Content.Shared.Access.Components;
using Content.Shared.Access.Systems;
using Content.Shared.ActionBlocker;
@@ -270,7 +270,7 @@ public abstract class SharedMechSystem : EntitySystem
if (component.EquipmentContainer.ContainedEntities.Count >= component.MaxEquipmentAmount)
return;
if (component.EquipmentWhitelist != null && !component.EquipmentWhitelist.IsValid(uid))
if (component.EquipmentWhitelist != null && !component.EquipmentWhitelist.IsValid(toInsert))
return;
equipmentComponent.EquipmentOwner = uid;
@@ -386,7 +386,7 @@ public abstract class SharedMechSystem : EntitySystem
if (!Resolve(uid, ref component))
return false;
return IsEmpty(component) && _actionBlocker.CanMove(toInsert) && HasComp<HandsComponent>(toInsert);
return IsEmpty(component) && _actionBlocker.CanMove(toInsert);
}
/// <summary>