diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 6c1fa89a4c6..042e4f0bd97 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -312,9 +312,11 @@ obj/item/flashlight/lamp/bananalamp icon_state = "glowstick" item_state = "glowstick" var/fuel = 0 + var/fuel_lower = 1600 + var/fuel_upp = 2000 /obj/item/flashlight/glowstick/Initialize() - fuel = rand(1600, 2000) + fuel = rand(fuel_lower, fuel_upp) light_color = color . = ..() @@ -389,6 +391,13 @@ obj/item/flashlight/lamp/bananalamp name = "pink glowstick" color = LIGHT_COLOR_PINK +/obj/item/flashlight/glowstick/emergency + name = "emergency glowstick" + desc = "A cheap looking, mass produced glowstick. You can practically feel it was made on a tight budget." + color = LIGHT_COLOR_BLUE + fuel_lower = 30 + fuel_upp = 90 + /obj/item/flashlight/glowstick/random name = "random colored glowstick" icon_state = "random_glowstick" diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index b566dc81e37..c845bb02a16 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -72,6 +72,7 @@ new /obj/item/clothing/mask/breath( src ) new /obj/item/tank/emergency_oxygen( src ) new /obj/item/reagent_containers/hypospray/autoinjector( src ) + new /obj/item/flashlight/glowstick/emergency( src ) return /obj/item/storage/box/survival_vox @@ -83,6 +84,7 @@ new /obj/item/clothing/mask/breath/vox(src) new /obj/item/tank/emergency_oxygen/nitrogen(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/flashlight/glowstick/emergency(src) /obj/item/storage/box/survival_plasmaman icon_state = "box_plasma" @@ -93,6 +95,7 @@ new /obj/item/clothing/mask/breath(src) new /obj/item/tank/emergency_oxygen/plasma(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/flashlight/glowstick/emergency(src) /obj/item/storage/box/engineer icon_state = "box_eng" @@ -102,6 +105,7 @@ new /obj/item/clothing/mask/breath( src ) new /obj/item/tank/emergency_oxygen/engi( src ) new /obj/item/reagent_containers/hypospray/autoinjector( src ) + new /obj/item/flashlight/glowstick/emergency( src ) return /obj/item/storage/box/survival_mining @@ -113,6 +117,7 @@ new /obj/item/tank/emergency_oxygen/engi(src) new /obj/item/crowbar/red(src) new /obj/item/reagent_containers/hypospray/autoinjector(src) + new /obj/item/flashlight/glowstick/emergency(src) /obj/item/storage/box/gloves name = "box of latex gloves"