Add recipient to air gush message and change pop-up type (#13262)

This commit is contained in:
Theomund
2023-01-01 14:42:21 -05:00
committed by GitHub
parent 1edd00e50c
commit d638ad421a
3 changed files with 10 additions and 3 deletions

View File

@@ -190,7 +190,7 @@ public sealed class DoorSystem : SharedDoorSystem
return true; return true;
} }
var modEv = new DoorGetPryTimeModifierEvent(); var modEv = new DoorGetPryTimeModifierEvent(user);
RaiseLocalEvent(target, modEv, false); RaiseLocalEvent(target, modEv, false);
door.BeingPried = true; door.BeingPried = true;

View File

@@ -11,6 +11,7 @@ using Content.Shared.Atmos.Monitor;
using Content.Shared.Doors; using Content.Shared.Doors;
using Content.Shared.Doors.Components; using Content.Shared.Doors.Components;
using Content.Shared.Doors.Systems; using Content.Shared.Doors.Systems;
using Content.Shared.Popups;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
@@ -144,12 +145,12 @@ namespace Content.Server.Doors.Systems
if (state.Fire) if (state.Fire)
{ {
_popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-fire-message"), _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-fire-message"),
uid); uid, args.User, PopupType.MediumCaution);
} }
else if (state.Pressure) else if (state.Pressure)
{ {
_popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-pressure-message"), _popupSystem.PopupEntity(Loc.GetString("firelock-component-is-holding-pressure-message"),
uid); uid, args.User, PopupType.MediumCaution);
} }
if (state.Fire || state.Pressure) if (state.Fire || state.Pressure)

View File

@@ -68,7 +68,13 @@ namespace Content.Shared.Doors
/// </summary> /// </summary>
public sealed class DoorGetPryTimeModifierEvent : EntityEventArgs public sealed class DoorGetPryTimeModifierEvent : EntityEventArgs
{ {
public readonly EntityUid User;
public float PryTimeModifier = 1.0f; public float PryTimeModifier = 1.0f;
public DoorGetPryTimeModifierEvent(EntityUid user)
{
User = user;
}
} }
/// <summary> /// <summary>