Improves the smoking experience (#8089)

Co-authored-by: ike709 <ike709@github.com>

Content.Client/Tools/Components/WelderComponent.cs

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

Content.Server/Tools/ToolSystem.Welder.cs

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

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

@@ -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-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].
+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-message = You weld your every orifice closed!
 welder-component-suicide-unlit-others-message = {$victim} bashes themselves with the unlit welding torch!

Resources/Prototypes/Entities/Objects/Tools/lighters.yml

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