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

Deprecate a bunch of IActionBlocker (#4852)

Browse Source 
* Deprecate IActionBlocker ChangeDirectionAttempt

* Woops

* Throw and interact

* Deperacte speech

* ActionBlocker in fucking shambles

* CanEmote go byebye

* CanAttack is GONE

* IActionBlocker finally ded

* DRY
This commit is contained in:
metalgearsloth
2021-10-21 13:03:14 +11:00
committed by GitHub
parent 339982d05b
commit 7beb363285
20 changed files with 196 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Content.Shared/ActionBlocker/ActionBlockerSystem.cs
View File

@@ -42,15 +42,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanInteract())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -65,15 +56,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanUse())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -88,15 +70,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanThrow())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -111,15 +84,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanSpeak())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -134,15 +98,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanDrop())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -157,15 +112,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanPickup())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -180,15 +126,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanEmote())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -203,15 +140,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanAttack())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -226,15 +154,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanEquip())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}
@@ -249,15 +168,6 @@ namespace Content.Shared.ActionBlocker
RaiseLocalEvent(entity.Uid, ev);
foreach (var blocker in ev.Entity.GetAllComponents<IActionBlocker>())
{
if (!blocker.CanUnequip())
{
ev.Cancel();
break;
}
}
return !ev.Cancelled;
}