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

Add "already full" message when refilling welder (#10491)

Browse Source
This commit is contained in:
Kevin Zheng
2022-08-17 19:30:12 -07:00
committed by GitHub
parent c4261a7c01
commit 36e42aa29b
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Tools/ToolSystem.Welder.cs
View File

@@ -9,7 +9,6 @@ using Content.Shared.Examine;
using Content.Shared.FixedPoint; using Content.Shared.FixedPoint;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Item; using Content.Shared.Item;
using Content.Shared.Popups;
using Content.Shared.Temperature; using Content.Shared.Temperature;
using Content.Shared.Tools.Components; using Content.Shared.Tools.Components;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
@@ -228,11 +227,15 @@ namespace Content.Server.Tools
var drained = _solutionContainerSystem.Drain(target, targetSolution, trans); var drained = _solutionContainerSystem.Drain(target, targetSolution, trans);
_solutionContainerSystem.TryAddSolution(uid, welderSolution, drained); _solutionContainerSystem.TryAddSolution(uid, welderSolution, drained);
SoundSystem.Play(welder.WelderRefill.GetSound(), Filter.Pvs(uid), uid); SoundSystem.Play(welder.WelderRefill.GetSound(), Filter.Pvs(uid), uid);
target.PopupMessage(args.User, Loc.GetString("welder-component-after-interact-refueled-message")); _popupSystem.PopupEntity(Loc.GetString("welder-component-after-interact-refueled-message"), uid, Filter.Entities(args.User));
}
else if (welderSolution.AvailableVolume <= 0)
{
_popupSystem.PopupEntity(Loc.GetString("welder-component-already-full"), uid, Filter.Entities(args.User));
} }
else else
{ {
target.PopupMessage(args.User, Loc.GetString("welder-component-no-fuel-in-tank", ("owner", args.Target))); _popupSystem.PopupEntity(Loc.GetString("welder-component-no-fuel-in-tank", ("owner", args.Target)), uid, Filter.Entities(args.User));
} }
} }

6
Resources/Locale/en-US/prototypes/entities/structures/storage/tanks/tanks.ftl
View File

@@ -1,16 +1,16 @@
ent-WeldingFuelTank = Fuel tank ent-WeldingFuelTank = fuel tank
.desc = A fuel tank. It's used to store high amounts of fuel. .desc = A fuel tank. It's used to store high amounts of fuel.
ent-WeldingFuelTankFull = { ent-WeldingFuelTank } ent-WeldingFuelTankFull = { ent-WeldingFuelTank }
.desc = { ent-WeldingFuelTank.desc } .desc = { ent-WeldingFuelTank.desc }
ent-WaterTank = Water tank ent-WaterTank = water tank
.desc = A water tank. It's used to store high amounts of water. .desc = A water tank. It's used to store high amounts of water.
ent-WaterTankFull = { ent-WaterTank } ent-WaterTankFull = { ent-WaterTank }
.desc = { ent-WaterTank.desc } .desc = { ent-WaterTank.desc }
ent-WaterCooler = Water cooler ent-WaterCooler = water cooler
.desc = Seems like a good place to stand and waste time. .desc = Seems like a good place to stand and waste time.
ent-WaterTankHighCapacity = High-capacity water tank ent-WaterTankHighCapacity = High-capacity water tank

3
Resources/Locale/en-US/tools/components/welder-component.ftl
View File

@@ -1,7 +1,7 @@
welder-component-welder-not-lit-message = The welder is turned off! welder-component-welder-not-lit-message = The welder is turned off!
welder-component-cannot-weld-message = The welder does not have enough fuel for that! welder-component-cannot-weld-message = The welder does not have enough fuel for that!
welder-component-no-fuel-message = The welder has no fuel left! welder-component-no-fuel-message = The welder has no fuel left!
welder-component-no-fuel-in-tank = {$owner} is empty welder-component-no-fuel-in-tank = The {$owner} is empty.
welder-component-on-examine-welder-lit-message = [color=orange]Lit[/color] welder-component-on-examine-welder-lit-message = [color=orange]Lit[/color]
welder-component-on-examine-welder-not-lit-message = Not lit welder-component-on-examine-welder-not-lit-message = Not lit
welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color]. {$status} welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color]. {$status}
@@ -10,3 +10,4 @@ welder-component-suicide-lit-message = You weld your every orifice closed!
welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch! welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch!
welder-component-suicide-unlit-message = You bash yourself with the unlit welding torch! welder-component-suicide-unlit-message = You bash yourself with the unlit welding torch!
welder-component-after-interact-refueled-message = Refueled! welder-component-after-interact-refueled-message = Refueled!
welder-component-already-full = The welder is already full.