diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index 9db368bda7b..1f28e089832 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -54,6 +54,7 @@ myseed.adjust_production(rand(-3,6)) myseed.adjust_endurance(rand(-3,6)) delay = delay - myseed.production * 100 //So the delay goes DOWN with better stats instead of up. :I + endurance = myseed.endurance if(myseed.get_gene(/datum/plant_gene/trait/glow)) var/datum/plant_gene/trait/glow/G = myseed.get_gene(/datum/plant_gene/trait/glow) set_light(G.glow_range(myseed), G.glow_power(myseed), G.glow_color) @@ -114,6 +115,8 @@ shrooms_planted++ CHECK_TICK + else + shrooms_planted++ //if we failed due to generation, don't try to plant one later if(shrooms_planted < myseed.yield) //if we didn't get all possible shrooms planted, try again later myseed.yield -= shrooms_planted addtimer(src, "Spread", delay, FALSE) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 8d38d541e96..935730efd9b 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -235,10 +235,10 @@ /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(istype(user.loc, /turf/space)) - return + return FALSE if(!isturf(user.loc)) to_chat(user, "You need more space to plant [src].") - return + return FALSE var/count = 0 var/maxcount = 1 for(var/tempdir in cardinal) @@ -249,10 +249,11 @@ count++ if(count >= maxcount) to_chat(user, "There are too many shrooms here to plant [src].") - return + return FALSE new effect_path(user.loc, seed) to_chat(user, "You plant [src].") qdel(src) + return TRUE // Glowcap diff --git a/code/modules/hydroponics/plant_genes.dm b/code/modules/hydroponics/plant_genes.dm index 480fd9853cb..cfda1499555 100644 --- a/code/modules/hydroponics/plant_genes.dm +++ b/code/modules/hydroponics/plant_genes.dm @@ -282,12 +282,12 @@ /datum/plant_gene/trait/glow/shadow //makes plant emit slightly purple shadows - //adds -potency*(rate*0.2) light power to products + //adds -potency*(rate*0.05) light power to products name = "Shadow Emission" rate = 0.04 /datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/S) - return -max(S.potency*(rate*0.2), 0.2) + return -max(S.potency*(rate*0.05), 0.075) /datum/plant_gene/trait/glow/red name = "Red Electrical Glow" diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index b08f66a5119..b8d6d214464 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -139,7 +139,7 @@ var/on_gs = 0 var/static_power_used = 0 var/brightness_range = 8 // luminosity when on, also used in power calculation - var/brightness_power = 3 + var/brightness_power = 1 var/brightness_color = null var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = 0 @@ -157,7 +157,6 @@ base_state = "bulb" fitting = "bulb" brightness_range = 4 - brightness_power = 2 brightness_color = "#a0a080" desc = "A small lighting fixture." light_type = /obj/item/weapon/light/bulb @@ -190,12 +189,10 @@ switch(fitting) if("tube") brightness_range = 8 - brightness_power = 3 if(prob(2)) broken(1) if("bulb") brightness_range = 4 - brightness_power = 2 brightness_color = "#a0a080" if(prob(5)) broken(1) @@ -608,13 +605,12 @@ item_state = "c_tube" materials = list(MAT_GLASS=100) brightness_range = 8 - brightness_power = 3 /obj/item/weapon/light/tube/large w_class = 2 name = "large light tube" brightness_range = 15 - brightness_power = 4 + brightness_power = 2 /obj/item/weapon/light/bulb name = "light bulb" @@ -624,7 +620,6 @@ item_state = "contvapour" materials = list(MAT_GLASS=100) brightness_range = 5 - brightness_power = 2 brightness_color = "#a0a080" /obj/item/weapon/light/throw_impact(atom/hit_atom) @@ -639,7 +634,6 @@ item_state = "egg4" materials = list(MAT_GLASS=100) brightness_range = 5 - brightness_power = 2 // update the icon state and description of the light