cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds emergency glowsticks

Browse Source
This commit is contained in:
Spartan6
2018-12-27 23:03:10 +00:00
parent 3caea31b55
commit 73a75eb589
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flashlight.dm
+10 -1
View File
@@ -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"
code/game/objects/items/weapons/storage/boxes.dm
+5
View File
@@ -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"