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

Fixes. Can no longer open while cooking. Can no longer cook while open. (#2521)

Browse Source
This commit is contained in:
Remie Richards
2020-11-08 00:10:55 +00:00
committed by GitHub
parent 50f03a5b17
commit c580423f41
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Morgue/CrematoriumEntityStorageComponent.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.GameObjects.Components.Items.Storage;
using Content.Shared.GameObjects.Components.Morgue; using Content.Shared.GameObjects.Components.Morgue;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.GameObjects.Verbs; using Content.Shared.GameObjects.Verbs;
using Content.Shared.Interfaces;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -52,6 +53,16 @@ namespace Content.Server.GameObjects.Components.Morgue
} }
} }
public override bool CanOpen(IEntity user, bool silent = false)
{
if (Cooking)
{
if (!silent) Owner.PopupMessage(user, Loc.GetString("Safety first, not while it's active!"));
return false;
}
return base.CanOpen(user, silent);
}
public void Cremate() public void Cremate()
{ {
if (Cooking) return; if (Cooking) return;
@@ -89,7 +100,7 @@ namespace Content.Server.GameObjects.Components.Morgue
{ {
protected override void GetData(IEntity user, CrematoriumEntityStorageComponent component, VerbData data) protected override void GetData(IEntity user, CrematoriumEntityStorageComponent component, VerbData data)
{ {
if (!ActionBlockerSystem.CanInteract(user) || component.Cooking) if (!ActionBlockerSystem.CanInteract(user) || component.Cooking || component.Open)
{ {
data.Visibility = VerbVisibility.Invisible; data.Visibility = VerbVisibility.Invisible;
return; return;