cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds safety flares (#7431)

Browse Source 
* emergency flares

* adds safety flares

* remove unneeded icon states
This commit is contained in:
Katie
2019-12-31 00:32:30 +00:00
committed by Nichlas Pihl
parent 6b09cf0c86
commit e72aa3c79f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/objects/items/devices/flashlight.dm
View File

@@ -258,13 +258,15 @@
var/fuel = 0 var/fuel = 0
var/on_damage = 7 var/on_damage = 7
var/produce_heat = 1500 var/produce_heat = 1500
var/frng_min = 800
var/frng_max = 1000
heat = 1000 heat = 1000
light_color = LIGHT_COLOR_FLARE light_color = LIGHT_COLOR_FLARE
grind_results = list(/datum/reagent/sulfur = 15) grind_results = list(/datum/reagent/sulfur = 15)
/obj/item/flashlight/flare/Initialize() /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() /obj/item/flashlight/flare/process()
open_flame(heat) open_flame(heat)
@@ -320,6 +322,13 @@
/obj/item/flashlight/flare/is_hot() /obj/item/flashlight/flare/is_hot()
return on * heat 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 /obj/item/flashlight/flare/torch
name = "torch" name = "torch"
desc = "A torch fashioned from some leaves and a log." desc = "A torch fashioned from some leaves and a log."

5
code/game/objects/items/storage/boxes.dm
View File

@@ -126,6 +126,7 @@
new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/reagent_containers/hypospray/medipen(src) new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/flashlight/flare/emergency(src)
new /obj/item/map/station(src) new /obj/item/map/station(src)
/obj/item/storage/box/survival/radio/PopulateContents() /obj/item/storage/box/survival/radio/PopulateContents()
@@ -137,14 +138,15 @@
new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/crowbar/red(src) new /obj/item/crowbar/red(src)
new /obj/item/reagent_containers/hypospray/medipen(src) new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/flashlight/flare/emergency(src)
new /obj/item/map/station(src) new /obj/item/map/station(src)
// Engineer survival box // Engineer survival box
/obj/item/storage/box/engineer/PopulateContents() /obj/item/storage/box/engineer/PopulateContents()
new /obj/item/clothing/mask/breath(src) new /obj/item/clothing/mask/breath(src)
new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/tank/internals/emergency_oxygen/engi(src)
new /obj/item/reagent_containers/hypospray/medipen(src) new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/flashlight/flare/emergency(src)
new /obj/item/map/station(src) new /obj/item/map/station(src)
/obj/item/storage/box/engineer/radio/PopulateContents() /obj/item/storage/box/engineer/radio/PopulateContents()
@@ -161,6 +163,7 @@
new /obj/item/clothing/mask/gas/sechailer(src) new /obj/item/clothing/mask/gas/sechailer(src)
new /obj/item/tank/internals/emergency_oxygen(src) new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/reagent_containers/hypospray/medipen(src) new /obj/item/reagent_containers/hypospray/medipen(src)
new /obj/item/flashlight/flare/emergency(src)
new /obj/item/map/station(src) new /obj/item/map/station(src)
/obj/item/storage/box/security/radio/PopulateContents() /obj/item/storage/box/security/radio/PopulateContents()