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

Misc changes from replay branch (#12581)

Browse Source
This commit is contained in:
Leon Friedrich
2022-11-15 19:34:47 +13:00
committed by GitHub
parent a2183fc223
commit 94011ca2b1
12 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Interaction/SharedInteractionSystem.cs
View File

@@ -227,7 +227,7 @@ namespace Content.Shared.Interaction
if (target != null && Deleted(target.Value))
return;
if (TryComp(user, out SharedCombatModeComponent? combatMode) && combatMode.IsInCombatMode)
if (!altInteract && TryComp(user, out SharedCombatModeComponent? combatMode) && combatMode.IsInCombatMode)
{
// Eat the input
return;