mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
Night And Thermal Vision (#1462)
<!-- This is a semi-strict format, you can add/remove sections as needed but the order/format should be kept the same Remove these comments before submitting --> # Description <!-- Explain this PR in as much detail as applicable Some example prompts to consider: How might this affect the game? The codebase? What might be some alternatives to this? How/Who does this benefit/hurt [the game/codebase]? --> Port from WWDP. Refactor from [Goob](https://github.com/Goob-Station/Goob-Station/pull/1251) --- <!-- This is default collapsed, readers click to expand it and see all your media The PR media section can get very large at times, so this is a good way to keep it clean The title is written using HTML tags The title must be within the <summary> tags or you won't see it --> <details><summary><h1>Media</h1></summary> <p>  Night vision goggles:  Zealot's blindfold:  Animal vision:  Thermal vision goggles:  Deathsquad helmet:  Xeno vision:  </p> </details> --- # Changelog <!-- You can add an author after the `🆑` to change the name that appears in the changelog (ex: `🆑 Death`) Leaving it blank will default to your GitHub display name This includes all available types for the changelog --> 🆑 @Aviu00, Spatison, @PuroSlavKing - add: Added night vision goggle - add: Added thermal vision goggle - add: Deathsquad helmet now grants night and thermal vision. - add: Ninja visor now grants night vision. - tweak: Some animals have gained night vision. - tweak: Xenos have gained night vision. --------- Signed-off-by: Spatison <137375981+Spatison@users.noreply.github.com> Co-authored-by: PuroSlavKing <103608145+puroslavking@users.noreply.github.com> (cherry picked from commit 0f481422a54a197923f4bf03db1b5733e481965f)
This commit is contained in:
@@ -14,6 +14,7 @@ using Robust.Shared.Audio.Systems;
|
||||
using Robust.Shared.Containers;
|
||||
using Robust.Shared.GameStates;
|
||||
using Robust.Shared.Map;
|
||||
using Robust.Shared.Network;
|
||||
using Robust.Shared.Timing;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
@@ -23,6 +24,8 @@ public abstract class SharedActionsSystem : EntitySystem
|
||||
{
|
||||
[Dependency] protected readonly IGameTiming GameTiming = default!;
|
||||
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
|
||||
[Dependency] private readonly INetManager _net = default!;
|
||||
|
||||
[Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
|
||||
[Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!;
|
||||
[Dependency] private readonly RotateToFaceSystem _rotateToFaceSystem = default!;
|
||||
@@ -774,7 +777,7 @@ public abstract class SharedActionsSystem : EntitySystem
|
||||
if (!ResolveActionData(actionId, ref action))
|
||||
return false;
|
||||
|
||||
DebugTools.Assert(action.Container == null ||
|
||||
DebugTools.Assert(_net.IsClient || action.Container == null ||
|
||||
(TryComp(action.Container, out ActionsContainerComponent? containerComp)
|
||||
&& containerComp.Container.Contains(actionId)));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user