cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 11:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13601 from Incoming5643/glopatch

Browse Source 
Fixes glowcaps being planted as glowshrooms
This commit is contained in:
Cheridan
2015-12-14 00:46:53 -06:00
parent ff2bc4d022 61e5dafb42
commit e7ba51a0a2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown.dm
+3 -1
View File
@@ -1172,6 +1172,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
desc = "<I>Mycena Bregprox</I>: This species of mushroom glows in the dark."
icon_state = "glowshroom"
filling_color = "#00FA9A"
var/effect_path = /obj/effect/glowshroom
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/New(var/loc, var/new_potency = 10)
..()
@@ -1197,7 +1198,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc,/turf/space))
return
var/obj/effect/glowshroom/planted = new /obj/effect/glowshroom(user.loc)
var/obj/effect/glowshroom/planted = new effect_path(user.loc)
planted.delay = planted.delay - production * 100 //So the delay goes DOWN with better stats instead of up. :I
planted.endurance = endurance
planted.yield = yield
@@ -1224,6 +1225,7 @@ obj/item/weapon/reagent_containers/food/snacks/grown/shell/eggy/add_juice()
desc = "<I>Mycena Ruthenia</I>: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..."
icon_state = "glowcap"
filling_color = "#00FA9A"
effect_path = /obj/effect/glowshroom/glowcap
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap/On_Consume()
if(!reagents.total_volume)