From 31c12cab4cbe2242b5904c4665b9861f2d87129d Mon Sep 17 00:00:00 2001
From: Fishfish458 <47410468+Fishfish458@users.noreply.github.com>
Date: Sun, 27 Mar 2022 01:28:59 -0500
Subject: [PATCH] Buff flashlight duration, minor buff for flare. (#7293)

Co-authored-by: fishfish458 <fishfish458>
---
 .../Components/HandheldLightComponent.cs      | 21 +------------------
 .../Entities/Objects/Tools/flare.yml          |  2 +-
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/Content.Server/Light/Components/HandheldLightComponent.cs b/Content.Server/Light/Components/HandheldLightComponent.cs
index 5e7477f854..b7ab7ad194 100644
--- a/Content.Server/Light/Components/HandheldLightComponent.cs
+++ b/Content.Server/Light/Components/HandheldLightComponent.cs
@@ -1,25 +1,6 @@
-using System.Threading.Tasks;
-using Content.Server.Clothing.Components;
 using Content.Server.Light.EntitySystems;
-using Content.Shared.ActionBlocker;
-using Content.Shared.Examine;
-using Content.Shared.Interaction;
 using Content.Shared.Light.Component;
-using Content.Shared.Popups;
-using Content.Shared.Rounding;
 using Content.Shared.Sound;
-using JetBrains.Annotations;
-using Robust.Server.GameObjects;
-using Robust.Shared.Analyzers;
-using Robust.Shared.Audio;
-using Robust.Shared.GameObjects;
-using Robust.Shared.IoC;
-using Robust.Shared.Localization;
-using Robust.Shared.Maths;
-using Robust.Shared.Player;
-using Robust.Shared.Serialization.Manager.Attributes;
-using Robust.Shared.Utility;
-using Robust.Shared.ViewVariables;
 
 namespace Content.Server.Light.Components
 {
@@ -30,7 +11,7 @@ namespace Content.Server.Light.Components
     [Friend(typeof(HandheldLightSystem))]
     public sealed class HandheldLightComponent : SharedHandheldLightComponent
     {
-        [ViewVariables(VVAccess.ReadWrite)] [DataField("wattage")] public float Wattage { get; set; } = 3f;
+        [ViewVariables(VVAccess.ReadWrite)] [DataField("wattage")] public float Wattage { get; set; } = .8f;
 
         /// <summary>
         ///     Status of light, whether or not it is emitting light.
diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
index 31538a2b9f..1e820d1200 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml
@@ -13,7 +13,7 @@
   - type: ExpendableLight
     spentName: spent flare
     spentDesc: It looks like this flare has burnt out. What a bummer.
-    glowDuration: 45
+    glowDuration: 165
     fadeOutDuration: 15
     iconStateOn: flare_unlit
     iconStateSpent: flare_spent