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

24
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
Popup.PopupEntity(Loc.GetString("injector-component-injecting-user"), target, 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);
Popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
("user", userName)), user, target);
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))