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

Mouse disposal nullable patch (#10185)

Browse Source
This commit is contained in:
wrexbe
2022-07-30 21:23:46 -07:00
committed by GitHub
parent 8000d31a62
commit b5de805083
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,7 +189,7 @@ namespace Content.Server.Disposal.Unit.EntitySystems
return;
else
unit.Container.Insert(toInsert);
AfterInsert(unit, toInsert);
}
@@ -475,9 +475,9 @@ namespace Content.Server.Disposal.Unit.EntitySystems
if (!Resolve(unitId, ref unit))
return false;
if (!HasComp<SharedHandsComponent>(userId) && toInsertId != userId) // Mobs like mouse can Jump inside even with no hands
if (userId.HasValue && !HasComp<SharedHandsComponent>(userId) && toInsertId != userId) // Mobs like mouse can Jump inside even with no hands
{
_popupSystem.PopupEntity(Loc.GetString("disposal-unit-no-hands"), userId, Filter.Entities(userId), PopupType.SmallCaution);
_popupSystem.PopupEntity(Loc.GetString("disposal-unit-no-hands"), userId.Value, Filter.Entities(userId.Value), PopupType.SmallCaution);
return false;
}