Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Using crowbar on powered airlock returns true on attackby.

Browse Source 
Fixes #388
This commit is contained in:
Pieter-Jan Briers
2019-10-13 16:56:43 +02:00
parent b556fd0019
commit 370f4e140d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.GameObjects.Components.Interactable.Tools;
using Content.Server.GameObjects.Components.Power; using Content.Server.GameObjects.Components.Power;
using Content.Server.GameObjects.Components.VendingMachines; using Content.Server.GameObjects.Components.VendingMachines;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Shared.GameObjects.Components.Doors; using Content.Shared.GameObjects.Components.Doors;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.Interfaces.GameObjects; using Robust.Server.Interfaces.GameObjects;
@@ -194,8 +195,15 @@ namespace Content.Server.GameObjects.Components.Doors
public bool AttackBy(AttackByEventArgs eventArgs) public bool AttackBy(AttackByEventArgs eventArgs)
{ {
if (eventArgs.AttackWith.HasComponent<CrowbarComponent>() && !IsPowered()) if (eventArgs.AttackWith.HasComponent<CrowbarComponent>())
{ {
if (IsPowered())
{
var notify = IoCManager.Resolve<IServerNotifyManager>();
notify.PopupMessage(Owner, eventArgs.User, "The powered motors block your efforts!");
return true;
}
if (State == DoorState.Closed) if (State == DoorState.Closed)
{ {
Open(); Open();