Glowshrooms now have colored light

This commit is contained in:
Joan Lung
2017-03-06 13:19:40 -05:00
parent 1a2c12d608
commit 10100f1d9f
2 changed files with 14 additions and 2 deletions
+7 -1
View File
@@ -12,6 +12,7 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list(
density = 0
icon = 'icons/obj/lighting.dmi'
icon_state = "glowshroom" //replaced in New
light_color = "#AAD84B"
layer = ABOVE_NORMAL_TURF_LAYER
obj_integrity = 30
max_integrity = 30
@@ -24,7 +25,9 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list(
/obj/structure/glowshroom/glowcap
name = "glowcap"
desc = "Mycena Ruthenia, a species of mushroom that, while it does glow in the dark, is not actually bioluminescent."
icon_state = "glowcap"
light_color = LIGHT_COLOR_RED
/obj/structure/glowshroom/single
yield = 0
@@ -35,7 +38,10 @@ var/list/blacklisted_glowshroom_turfs = typecacheof(list(
/obj/structure/glowshroom/New()
..()
set_light(round(potency/10))
addtimer(CALLBACK(src, .proc/setup), 0) //run this on the next tick so we can set vars first
/obj/structure/glowshroom/proc/setup()
set_light(max(round(potency*0.025), 1.4), max(round(potency*0.05), 0.1))
setDir(CalcDir())
var/base_icon_state = initial(icon_state)
if(!floor)
+7 -1
View File
@@ -228,10 +228,15 @@
name = "glowshroom cluster"
desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark."
icon_state = "glowshroom"
light_color = "#AAD84B"
filling_color = "#00FA9A"
var/effect_path = /obj/structure/glowshroom
origin_tech = "biotech=4;plasmatech=6"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/add_juice()
..()
set_light(max(seed.potency*0.025, 1.4), max(seed.potency*0.05, 0.1))
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(isspaceturf(user.loc))
return
@@ -263,8 +268,9 @@
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap
seed = /obj/item/seeds/glowshroom/glowcap
name = "glowcap cluster"
desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..."
desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
icon_state = "glowcap"
light_color = LIGHT_COLOR_RED
filling_color = "#00FA9A"
effect_path = /obj/structure/glowshroom/glowcap
origin_tech = "biotech=4;powerstorage=6;plasmatech=4"