From e72aa3c79fb86f09c3bcff8302b5fdc1a57cd5d5 Mon Sep 17 00:00:00 2001
From: Katie <34506490+Ktlwjec@users.noreply.github.com>
Date: Tue, 31 Dec 2019 00:32:30 +0000
Subject: [PATCH] Adds safety flares (#7431)

* emergency flares

* adds safety flares

* remove unneeded icon states
---
 code/game/objects/items/devices/flashlight.dm | 11 ++++++++++-
 code/game/objects/items/storage/boxes.dm      |  5 ++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 2d7665b5f466..15a9efe79edc 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -258,13 +258,15 @@
 	var/fuel = 0
 	var/on_damage = 7
 	var/produce_heat = 1500
+	var/frng_min = 800
+	var/frng_max = 1000
 	heat = 1000
 	light_color = LIGHT_COLOR_FLARE
 	grind_results = list(/datum/reagent/sulfur = 15)
 
 /obj/item/flashlight/flare/Initialize()
 	. = ..()
-	fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
+	fuel = rand(frng_min, frng_max)
 
 /obj/item/flashlight/flare/process()
 	open_flame(heat)
@@ -320,6 +322,13 @@
 /obj/item/flashlight/flare/is_hot()
 	return on * heat
 
+/obj/item/flashlight/flare/emergency
+	name = "safety flare"
+	desc = "A flare issued to nanotrasen employees for emergencies. There are instructions on the side, it reads 'pull cord, make light, obey nanotrasen'."
+	brightness_on = 3
+	frng_min = 40
+	frng_max = 70
+
 /obj/item/flashlight/flare/torch
 	name = "torch"
 	desc = "A torch fashioned from some leaves and a log."
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index f84438c8951d..d19d394b3a5d 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -126,6 +126,7 @@
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)
+	new /obj/item/flashlight/flare/emergency(src)
 	new /obj/item/map/station(src)
 
 /obj/item/storage/box/survival/radio/PopulateContents()
@@ -137,14 +138,15 @@
 	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/crowbar/red(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)
+	new /obj/item/flashlight/flare/emergency(src)
 	new /obj/item/map/station(src)
 
-
 // Engineer survival box
 /obj/item/storage/box/engineer/PopulateContents()
 	new /obj/item/clothing/mask/breath(src)
 	new /obj/item/tank/internals/emergency_oxygen/engi(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)
+	new /obj/item/flashlight/flare/emergency(src)
 	new /obj/item/map/station(src)
 
 /obj/item/storage/box/engineer/radio/PopulateContents()
@@ -161,6 +163,7 @@
 	new /obj/item/clothing/mask/gas/sechailer(src)
 	new /obj/item/tank/internals/emergency_oxygen(src)
 	new /obj/item/reagent_containers/hypospray/medipen(src)
+	new /obj/item/flashlight/flare/emergency(src)
 	new /obj/item/map/station(src)
 
 /obj/item/storage/box/security/radio/PopulateContents()