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

ActionBlocker CanPickup uses EntityUid exclusively

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-11-09 13:43:39 +01:00
parent b82cb38bf9
commit 9921801f15
11 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Access/IdCardConsoleSystem.cs
View File

@@ -53,7 +53,7 @@ namespace Content.Server.Access
if (args.Hands == null ||
!args.CanAccess ||
!args.CanInteract ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
// Can we eject a privileged ID?

2
Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasBeaker ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Chemistry.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasBeaker ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/Power/EntitySystems/BaseChargerSystem.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Server.Power.EntitySystems
!args.CanAccess ||
!args.CanInteract ||
!component.HasCell ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

2
Content.Server/PowerCell/PowerCellSystem.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Server.PowerCell
!args.CanInteract ||
!component.ShowVerb ||
!component.HasCell ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();

4
Content.Server/Weapon/Ranged/Barrels/BarrelSystem.cs
View File

@@ -71,7 +71,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanInteract ||
!component.PowerCellRemovable ||
component.PowerCell == null ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
Verb verb = new();
@@ -104,7 +104,7 @@ namespace Content.Server.Weapon.Ranged.Barrels
!args.CanAccess ||
!args.CanInteract ||
!component.HasMagazine ||
!_actionBlockerSystem.CanPickup(args.User))
!_actionBlockerSystem.CanPickup(args.User.Uid))
return;
if (component.MagNeedsOpenBolt && !component.BoltOpen)