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

Improve equip fail messages.

Browse Source 
Message when trying to equip regular items to slots.
Mention ID slot specifically.
This commit is contained in:
Pieter-Jan Briers
2020-05-23 22:57:25 +02:00
parent 54b3783b03
commit bd92bdfbf8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/GUI/HumanInventoryControllerComponent.cs
View File

@@ -34,7 +34,9 @@ namespace Content.Server.GameObjects
// Can't wear stuff in ID card or pockets unless you have a uniform. // Can't wear stuff in ID card or pockets unless you have a uniform.
if (_inventory.GetSlotItem(Slots.INNERCLOTHING) == null) if (_inventory.GetSlotItem(Slots.INNERCLOTHING) == null)
{ {
reason = Loc.GetString("You need a uniform to store something in your pockets!"); reason = Loc.GetString(slotMask == SlotFlags.IDCARD
? "You need a uniform to store something in your ID slot!"
: "You need a uniform to store something in your pockets!");
return false; return false;
} }

7
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks.Dataflow; using System.Threading.Tasks.Dataflow;
@@ -158,6 +158,11 @@ namespace Content.Server.GameObjects
reason = controllerReason ?? reason; reason = controllerReason ?? reason;
} }
if (!pass && reason == null)
{
reason = Loc.GetString("You can't equip this!");
}
return pass && SlotContainers[slot].CanInsert(item.Owner); return pass && SlotContainers[slot].CanInsert(item.Owner);
} }