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

emag disposal units to disable pressure requirement (#14630)

Browse Source
This commit is contained in:
deltanedas
2023-03-23 14:55:49 +00:00
committed by GitHub
parent 21e5aea8ca
commit 52af530d61
3 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
View File

@@ -552,8 +552,11 @@ namespace Content.Server.Disposal.Unit.EntitySystems
component.AutomaticEngageToken?.Cancel(); component.AutomaticEngageToken?.Cancel();
component.AutomaticEngageToken = null; component.AutomaticEngageToken = null;
component.Pressure = 0; if (!component.DisablePressure)
component.State = SharedDisposalUnitComponent.PressureState.Pressurizing; {
component.Pressure = 0;
component.State = SharedDisposalUnitComponent.PressureState.Pressurizing;
}
component.Engaged = false; component.Engaged = false;

6
Content.Shared/Disposal/Components/SharedDisposalUnitComponent.cs
View File

@@ -21,6 +21,12 @@ namespace Content.Shared.Disposal.Components
[DataField("mobsCanEnter")] [DataField("mobsCanEnter")]
public bool MobsCanEnter = true; public bool MobsCanEnter = true;
/// <summary>
/// Removes the pressure requirement for flushing.
/// </summary>
[DataField("disablePressure"), ViewVariables(VVAccess.ReadWrite)]
public bool DisablePressure = false;
[Serializable, NetSerializable] [Serializable, NetSerializable]
public enum Visuals : byte public enum Visuals : byte
{ {

8
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Shared.Body.Components; using Content.Shared.Body.Components;
using Content.Shared.Disposal.Components; using Content.Shared.Disposal.Components;
using Content.Shared.DragDrop; using Content.Shared.DragDrop;
using Content.Shared.Emag.Systems;
using Content.Shared.Item; using Content.Shared.Item;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.Mobs.Systems; using Content.Shared.Mobs.Systems;
@@ -28,6 +29,7 @@ namespace Content.Shared.Disposal
base.Initialize(); base.Initialize();
SubscribeLocalEvent<SharedDisposalUnitComponent, PreventCollideEvent>(OnPreventCollide); SubscribeLocalEvent<SharedDisposalUnitComponent, PreventCollideEvent>(OnPreventCollide);
SubscribeLocalEvent<SharedDisposalUnitComponent, CanDropTargetEvent>(OnCanDragDropOn); SubscribeLocalEvent<SharedDisposalUnitComponent, CanDropTargetEvent>(OnCanDragDropOn);
SubscribeLocalEvent<SharedDisposalUnitComponent, GotEmaggedEvent>(OnEmagged);
} }
private void OnPreventCollide(EntityUid uid, SharedDisposalUnitComponent component, ref PreventCollideEvent args) private void OnPreventCollide(EntityUid uid, SharedDisposalUnitComponent component, ref PreventCollideEvent args)
@@ -57,6 +59,12 @@ namespace Content.Shared.Disposal
args.Handled = true; args.Handled = true;
} }
private void OnEmagged(EntityUid uid, SharedDisposalUnitComponent component, ref GotEmaggedEvent args)
{
component.DisablePressure = true;
args.Handled = true;
}
public virtual bool CanInsert(SharedDisposalUnitComponent component, EntityUid entity) public virtual bool CanInsert(SharedDisposalUnitComponent component, EntityUid entity)
{ {
if (!EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored) if (!EntityManager.GetComponent<TransformComponent>(component.Owner).Anchored)