Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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/RCD/Components/RCDAmmoComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using Content.Server.Hands.Components;
using Content.Shared.Examine;
@@ -23,7 +23,7 @@ namespace Content.Server.RCD.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString("It holds {0} charges.", refillAmmo));
message.AddMarkup(Loc.GetString("rcd-ammo-component-on-examine-text",("ammo", refillAmmo)));
}
async Task<bool> IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
@@ -37,12 +37,12 @@ namespace Content.Server.RCD.Components
if (rcdComponent.MaxAmmo - rcdComponent._ammo < refillAmmo)
{
rcdComponent.Owner.PopupMessage(eventArgs.User, Loc.GetString("The RCD is full!"));
rcdComponent.Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-ammo-component-after-interact-full-text"));
return true;
}
rcdComponent._ammo = Math.Min(rcdComponent.MaxAmmo, rcdComponent._ammo + refillAmmo);
rcdComponent.Owner.PopupMessage(eventArgs.User, Loc.GetString("You refill the RCD."));
rcdComponent.Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-ammo-component-after-interact-refilled-text"));
//Deleting a held item causes a lot of errors
hands.Drop(Owner, false);

16
Content.Server/RCD/Components/RCDComponent.cs
View File

@@ -165,7 +165,7 @@ namespace Content.Server.RCD.Components
//Less expensive checks first. Failing those ones, we need to check that the tile isn't obstructed.
if (_ammo <= 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("The RCD is out of ammo!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-no-ammo-message"));
return false;
}
@@ -186,7 +186,7 @@ namespace Content.Server.RCD.Components
case RcdMode.Floors:
if (!tile.Tile.IsEmpty)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("You can only build a floor on space!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-cannot-build-floor-tile-not-empty-message"));
return false;
}
@@ -201,13 +201,13 @@ namespace Content.Server.RCD.Components
//They tried to decon a turf but the turf is blocked
if (eventArgs.Target == null && tile.IsBlockedTurf(true))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("That tile is obstructed!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-tile-obstructed-message"));
return false;
}
//They tried to decon a non-turf but it's not in the whitelist
if (eventArgs.Target != null && !eventArgs.Target.TryGetComponent(out RCDDeconstructWhitelist? deCon))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("You can't deconstruct that!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-deconstruct-target-not-on-whitelist-message"));
return false;
}
@@ -216,25 +216,25 @@ namespace Content.Server.RCD.Components
case RcdMode.Walls:
if (tile.Tile.IsEmpty)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("You cannot build a wall on space!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-cannot-build-wall-tile-not-empty-message"));
return false;
}
if (tile.IsBlockedTurf(true))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("That tile is obstructed!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-tile-obstructed-message"));
return false;
}
return true;
case RcdMode.Airlock:
if (tile.Tile.IsEmpty)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Cannot build an airlock on space!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-cannot-build-airlock-tile-not-empty-message"));
return false;
}
if (tile.IsBlockedTurf(true))
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("That tile is obstructed!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("rcd-component-tile-obstructed-message"));
return false;
}
return true;