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

Removed old Loc.GetString() use instances (#4155)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Galactic Chimp
2021-06-21 02:13:54 +02:00
committed by GitHub
parent 4a46fbe6dd
commit 392b820796
523 changed files with 3082 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Hands/Components/HandsComponent.cs
View File

@@ -766,13 +766,13 @@ namespace Content.Server.Hands.Components
{
if (ActiveHand != null && Drop(ActiveHand, false))
{
source.PopupMessageOtherClients(Loc.GetString("{0} disarms {1}!", source.Name, target.Name));
source.PopupMessageCursor(Loc.GetString("You disarm {0}!", target.Name));
source.PopupMessageOtherClients(Loc.GetString("hands-component-disarm-success-others-message!",("source", source.Name),("target", target.Name)));
source.PopupMessageCursor(Loc.GetString("hands-component-disarm-success-message",("target", target.Name)));
}
else
{
source.PopupMessageOtherClients(Loc.GetString("{0} shoves {1}!", source.Name, target.Name));
source.PopupMessageCursor(Loc.GetString("You shove {0}!", target.Name));
source.PopupMessageOtherClients(Loc.GetString("hands-component-shove-success-others-message",("source", source.Name),("target", target.Name)));
source.PopupMessageCursor(Loc.GetString("hands-component-shove-success-message",("target", target.Name)));
}
}
}

8
Content.Server/Hands/HandsSystem.cs
View File

@@ -240,8 +240,8 @@ namespace Content.Server.Hands
if (!inventoryComp.TryGetSlotItem(equipmentSlot, out ItemComponent? equipmentItem)
|| !equipmentItem.Owner.TryGetComponent<ServerStorageComponent>(out var storageComponent))
{
plyEnt.PopupMessage(Loc.GetString("You have no {0} to take something out of!",
SlotNames[equipmentSlot].ToLower()));
plyEnt.PopupMessage(Loc.GetString("hands-system-missing-equipment-slot",
("slotName", SlotNames[equipmentSlot].ToLower())));
return;
}
@@ -255,8 +255,8 @@ namespace Content.Server.Hands
{
if (storageComponent.StoredEntities.Count == 0)
{
plyEnt.PopupMessage(Loc.GetString("There's nothing in your {0} to take out!",
SlotNames[equipmentSlot].ToLower()));
plyEnt.PopupMessage(Loc.GetString("hands-system-empty-equipment-slot",
("slotName", SlotNames[equipmentSlot].ToLower())));
}
else
{