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

[Revert] Reverts Ninja (#15516)

Browse Source 
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
This commit is contained in:
keronshb
2023-04-19 03:43:09 -04:00
committed by GitHub
parent 6161f7d5f3
commit ac87effca0
81 changed files with 20 additions and 2742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs
View File

@@ -141,7 +141,7 @@ public sealed partial class TriggerSystem
private void OnTimerUse(EntityUid uid, OnUseTimerTriggerComponent component, UseInHandEvent args)
{
if (args.Handled || HasComp<AutomatedTimerComponent>(uid))
if (args.Handled)
return;
HandleTimerTrigger(