Fix Welder component interaction (#4634)

This commit is contained in:
Ygg01
2021-09-19 07:15:34 +02:00
committed by GitHub
parent 0776c0e2b9
commit fa905f477d
3 changed files with 9 additions and 2 deletions

View File

@@ -308,7 +308,7 @@ namespace Content.Server.Tools.Components
.TryGetDrainableSolution(eventArgs.Target.Uid, out var targetSolution)
&& WelderSolution != null)
{
if (WelderLit)
if (WelderLit && targetSolution.DrainAvailable > 0)
{
// Oh no no
eventArgs.Target.SpawnExplosion();
@@ -324,6 +324,11 @@ namespace Content.Server.Tools.Components
eventArgs.Target.PopupMessage(eventArgs.User,
Loc.GetString("welder-component-after-interact-refueled-message"));
}
else
{
eventArgs.Target.PopupMessage(eventArgs.User,
Loc.GetString("welder-component-no-fuel-in-tank", ("owner", eventArgs.Target)));
}
}
return true;

View File

@@ -1,6 +1,7 @@
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-no-fuel-message = The welder has no fuel left!
welder-component-no-fuel-in-tank = {$owner} is empty
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-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color].

View File

@@ -17,6 +17,7 @@
id: WeldingFuelTankFull
parent: WeldingFuelTank
name: fuel tank
suffix: Full
description: A storage tank containing welding fuel.
components:
- type: Explosive