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

6
Content.Server/MachineLinking/Components/SignalButtonComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.MachineLinking.Signals;
using Content.Server.MachineLinking.Signals;
using Content.Shared.Interaction;
using Content.Shared.Notification;
using Content.Shared.Notification.Managers;
@@ -33,11 +33,11 @@ namespace Content.Server.MachineLinking.Components
if (transmitter.TransmitSignal(new ToggleSignal()))
{
// Since the button doesn't have an animation, I'm going to use a popup message
Owner.PopupMessage(user, Loc.GetString("Click."));
Owner.PopupMessage(user, Loc.GetString("signal-button-component-transmit-signal-success-message"));
}
else
{
Owner.PopupMessage(user, Loc.GetString("No receivers connected."));
Owner.PopupMessage(user, Loc.GetString("signal-button-component-transmit-signal-no-receivers-message"));
}
}

12
Content.Server/MachineLinking/Components/SignalReceiverComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.Tools.Components;
using Content.Shared.Interaction;
@@ -73,29 +73,29 @@ namespace Content.Server.MachineLinking.Components
{
if (transmitter == null)
{
user.PopupMessage(Loc.GetString("Signal not set."));
user.PopupMessage(Loc.GetString("signal-receiver-component-interact-no-transmitter-message"));
return false;
}
if (_transmitters.Contains(transmitter))
{
Unsubscribe(transmitter);
Owner.PopupMessage(user, Loc.GetString("Unlinked."));
Owner.PopupMessage(user, Loc.GetString("signal-receiver-component-interact-unlinked"));
return true;
}
if (transmitter.Range > 0 && !Owner.Transform.Coordinates.InRange(Owner.EntityManager, transmitter.Owner.Transform.Coordinates, transmitter.Range))
{
Owner.PopupMessage(user, Loc.GetString("Out of range."));
Owner.PopupMessage(user, Loc.GetString("signal-receiver-component-interact-out-of-range"));
return false;
}
if (!Subscribe(transmitter))
{
Owner.PopupMessage(user, Loc.GetString("Max Transmitters reached!"));
Owner.PopupMessage(user, Loc.GetString("signal-receiver-component-interact-max-transmitters-limit"));
return false;
}
Owner.PopupMessage(user, Loc.GetString("Linked!"));
Owner.PopupMessage(user, Loc.GetString("signal-receiver-component-interact-success"));
return true;
}

6
Content.Server/MachineLinking/Components/SignalSwitchComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.ActionBlocker;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.MachineLinking;
@@ -50,7 +50,7 @@ namespace Content.Server.MachineLinking.Components
if (!transmitter.TransmitSignal(_on))
{
Owner.PopupMessage(user, Loc.GetString("No receivers connected."));
Owner.PopupMessage(user, Loc.GetString("signal-switch-component-transmit-no-receivers-connected"));
}
}
@@ -78,7 +78,7 @@ namespace Content.Server.MachineLinking.Components
return;
}
data.Text = Loc.GetString("Toggle Switch");
data.Text = Loc.GetString("toggle-switch-verb-get-data-text");
data.Visibility = VerbVisibility.Visible;
}
}

4
Content.Server/MachineLinking/Components/SignalTransmitterComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.Tools.Components;
using Content.Shared.Interaction;
@@ -118,7 +118,7 @@ namespace Content.Server.MachineLinking.Components
{
if (user != null)
{
Owner.PopupMessage(user, Loc.GetString("Signal fetched."));
Owner.PopupMessage(user, Loc.GetString("signal-transmitter-component-get-signal-success"));
}
return this;

4
Content.Server/MachineLinking/Components/SignalTwoWayLeverComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using Content.Shared.Interaction;
using Content.Shared.MachineLinking;
using Content.Shared.Notification;
@@ -47,7 +47,7 @@ namespace Content.Server.MachineLinking.Components
if (!TransmitSignal(State))
{
Owner.PopupMessage(user, Loc.GetString("No receivers connected."));
Owner.PopupMessage(user, Loc.GetString("signal-two-way-lever-component-next-state-no-receivers-connected"));
}
}