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

Fixes the ability to unweld inside containers (#1360)

Browse Source
This commit is contained in:
Alex S
2020-07-19 16:32:04 -04:00
committed by GitHub
parent cbad5edca4
commit 2c0abe3f70
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -357,12 +357,19 @@ namespace Content.Server.GameObjects.Components
if (!CanWeldShut) if (!CanWeldShut)
return false; return false;
if (_contents.Contains(eventArgs.User))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("It's too Cramped!"));
return false;
}
if (!eventArgs.Using.TryGetComponent(out WelderComponent tool)) if (!eventArgs.Using.TryGetComponent(out WelderComponent tool))
return false; return false;
if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Welding, 1f)) if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Welding, 1f))
return false; return false;
IsWeldedShut ^= true; IsWeldedShut ^= true;
return true; return true;
} }