Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Improves the smoking experience (#8089)

Browse Source 
Co-authored-by: ike709 <ike709@github.com>
This commit is contained in:
ike709
2022-05-11 15:48:07 -05:00
committed by GitHub
parent 4bec937c1f
commit 8b829926dd
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/Tools/Components/WelderComponent.cs
View File

@@ -59,11 +59,13 @@ namespace Content.Client.Tools.Components
var fuelCap = _parent.FuelCapacity; var fuelCap = _parent.FuelCapacity;
var fuel = _parent.Fuel; var fuel = _parent.Fuel;
var lit = _parent.Lit;
_label.SetMarkup(Loc.GetString("welder-component-on-examine-detailed-message", _label.SetMarkup(Loc.GetString("welder-component-on-examine-detailed-message",
("colorName", fuel < fuelCap / 4f ? "darkorange" : "orange"), ("colorName", fuel < fuelCap / 4f ? "darkorange" : "orange"),
("fuelLeft", Math.Round(fuel)), ("fuelLeft", Math.Round(fuel, 1)),
("fuelCapacity", fuelCap))); ("fuelCapacity", fuelCap),
("status", Loc.GetString(lit ? "welder-component-on-examine-welder-lit-message" : "welder-component-on-examine-welder-not-lit-message"))));
} }
} }
} }

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

@@ -182,7 +182,8 @@ namespace Content.Server.Tools
args.PushMarkup(Loc.GetString("welder-component-on-examine-detailed-message", args.PushMarkup(Loc.GetString("welder-component-on-examine-detailed-message",
("colorName", fuel < capacity / FixedPoint2.New(4f) ? "darkorange" : "orange"), ("colorName", fuel < capacity / FixedPoint2.New(4f) ? "darkorange" : "orange"),
("fuelLeft", fuel), ("fuelLeft", fuel),
("fuelCapacity", capacity))); ("fuelCapacity", capacity),
("status", string.Empty))); // Lit status is handled above
} }
} }

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

@@ -4,7 +4,7 @@ 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 = {$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]. welder-component-on-examine-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color]. {$status}
welder-component-suicide-lit-others-message = {$victim} welds their every orifice closed! It looks like they are trying to commit suicide! welder-component-suicide-lit-others-message = {$victim} welds their every orifice closed! It looks like they are trying to commit suicide!
welder-component-suicide-lit-message = You weld your every orifice closed! 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!

5
Resources/Prototypes/Entities/Objects/Tools/lighters.yml
View File

@@ -21,7 +21,9 @@
sprite: Objects/Tools/lighters.rsi sprite: Objects/Tools/lighters.rsi
layers: layers:
- state: icon_map - state: icon_map
map: ["enum.WelderLayers.Base"]
- state: lighter_flame - state: lighter_flame
map: ["enum.WelderLayers.Flame"]
shader: unshaded shader: unshaded
visible: false visible: false
- state: basic_icon_top - state: basic_icon_top
@@ -58,6 +60,7 @@
enabled: false enabled: false
radius: 1.1 #smallest possible radius: 1.1 #smallest possible
color: orange color: orange
- type: Appearance
- type: entity - type: entity
@@ -80,7 +83,9 @@
sprite: Objects/Tools/lighters.rsi sprite: Objects/Tools/lighters.rsi
layers: layers:
- state: icon_map - state: icon_map
map: ["enum.WelderLayers.Base"]
- state: lighter_flame - state: lighter_flame
map: ["enum.WelderLayers.Flame"]
shader: unshaded shader: unshaded
visible: false visible: false
- state: cheap_icon_top - state: cheap_icon_top