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

Syringe QoL improvements (#25480)

Browse Source 
Co-authored-by: Plykiya <plykiya@protonmail.com>
This commit is contained in:
Plykiya
2024-03-03 21:07:11 -08:00
committed by GitHub
parent ee051217ae
commit 4f7ff56e87
3 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Body.Components;
using Content.Server.Body.Components;
using Content.Server.Body.Systems;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Components;
@@ -115,7 +115,14 @@ public sealed class InjectorSystem : SharedInjectorSystem
private void InjectDoAfter(Entity<InjectorComponent> injector, EntityUid target, EntityUid user)
{
// Create a pop-up for the user
if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
{
Popup.PopupEntity(Loc.GetString("injector-component-drawing-user"), target, user);
}
else
{
Popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, user);
}
if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out _, out var solution))
return;
@@ -131,8 +138,17 @@ public sealed class InjectorSystem : SharedInjectorSystem
{
// Create a pop-up for the target
var userName = Identity.Entity(user, EntityManager);
if (injector.Comp.ToggleState == InjectorToggleMode.Draw)
{
Popup.PopupEntity(Loc.GetString("injector-component-drawing-target",
("user", userName)), user, target);
}
else
{
Popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
("user", userName)), user, target);
}
// Check if the target is incapacitated or in combat mode and modify time accordingly.
if (MobState.IsIncapacitated(target))

20
Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Administration.Logs;
using Content.Shared.Administration.Logs;
using Content.Shared.Chemistry.Components;
using Content.Shared.CombatMode;
using Content.Shared.DoAfter;
@@ -94,16 +94,34 @@ public abstract class SharedInjectorSystem : EntitySystem
if (injector.Comp.InjectOnly)
return;
if (!SolutionContainers.TryGetSolution(injector.Owner, InjectorComponent.SolutionName, out var solEnt, out var solution))
return;
string msg;
switch (injector.Comp.ToggleState)
{
case InjectorToggleMode.Inject:
if (solution.AvailableVolume > 0) // If solution has empty space to fill up, allow toggling to draw
{
SetMode(injector, InjectorToggleMode.Draw);
msg = "injector-component-drawing-text";
}
else
{
msg = "injector-component-cannot-toggle-draw-message";
}
break;
case InjectorToggleMode.Draw:
if (solution.Volume > 0) // If solution has anything in it, allow toggling to inject
{
SetMode(injector, InjectorToggleMode.Inject);
msg = "injector-component-injecting-text";
}
else
{
msg = "injector-component-cannot-toggle-inject-message";
}
break;
default:
throw new ArgumentOutOfRangeException();

8
Resources/Locale/en-US/chemistry/components/injector-component.ftl
View File

@@ -18,8 +18,12 @@ injector-component-transfer-success-message = You transfer {$amount}u into {$tar
injector-component-draw-success-message = You draw {$amount}u from {$target}.
injector-component-target-already-full-message = {$target} is already full!
injector-component-target-is-empty-message = {$target} is empty!
injector-component-cannot-toggle-draw-message = Too full to draw!
injector-component-cannot-toggle-inject-message = Nothing to inject!
## mob-inject doafter messages
injector-component-injecting-user = You start inserting the needle.
injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to stick a needle into you!
injector-component-drawing-user = You start drawing the needle.
injector-component-injecting-user = You start injecting the needle.
injector-component-drawing-target = {CAPITALIZE(THE($user))} is trying to use a needle to draw from you!
injector-component-injecting-target = {CAPITALIZE(THE($user))} is trying to inject a needle into you!