diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 7d5de58b7cb..e3897ced194 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -419,14 +419,14 @@ plant_type = 0 growthstages = 3 -/obj/item/seeds/spaceshroommycelium - name = "pack of space shroom mycelium" +/obj/item/seeds/reishimycelium + name = "pack of reishi mycelium" desc = "This mycelium grows into something relaxing." - icon_state = "mycelium-spaceshroom" - mypath = "/obj/item/seeds/spaceshroom" - species = "spaceshroom" - plantname = "Space Shroom" - productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/spaceshroom" + icon_state = "mycelium-reishi" + mypath = "/obj/item/seeds/reishi" + species = "reishi" + plantname = "reishi" + productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi" lifespan = 35 endurance = 35 maturation = 10 @@ -1558,11 +1558,11 @@ reagents.add_reagent("imidazoline", 3+round(potency / 5, 1)) bitesize = 1+round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/spaceshroom - seed = "/obj/item/seeds/spaceshroommycelium" - name = "space shroom" - desc = "Space Shroom: A special fungus found growing on the walls of station." - icon_state = "spaceshroom" +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi + seed = "/obj/item/seeds/reishimycelium" + name = "reishi" + desc = "Reishi: A special fungus believed to help relieve stress." + icon_state = "reishi" potency = 10 New() ..() @@ -1571,7 +1571,7 @@ reagents.add_reagent("space_drugs", 1+round(potency / 25, 1)) bitesize = 1+round(reagents.total_volume / 2, 1) -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/spaceshroom/attackby(var/obj/item/O as obj, var/mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi/attackby(var/obj/item/O as obj, var/mob/user as mob) . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Sleep Toxin: [reagents.get_reagent_amount("stoxin")]%" @@ -1594,6 +1594,7 @@ . = ..() if (istype(O, /obj/item/device/analyzer/plant_analyzer)) user << "- Amatoxins: [reagents.get_reagent_amount("amatoxin")]%" + user << "- Psilocybin: [reagents.get_reagent_amount("psilocybin")]%" /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel seed = "/obj/item/seeds/angelmycelium" diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm index 75a2bf00cd7..6aa1df960cd 100644 --- a/code/defines/obj/supplypacks.dm +++ b/code/defines/obj/supplypacks.dm @@ -227,7 +227,7 @@ "/obj/item/seeds/plumpmycelium", "/obj/item/seeds/libertymycelium", "/obj/item/seeds/amanitamycelium", - "/obj/item/seeds/spaceshroommycelium", + "/obj/item/seeds/reishimycelium", "/obj/item/seeds/bananaseed", "/obj/item/seeds/eggyseed") cost = 15 diff --git a/code/defines/obj/vending.dm b/code/defines/obj/vending.dm index 6d5e9d6234c..b8f00f6fd10 100644 --- a/code/defines/obj/vending.dm +++ b/code/defines/obj/vending.dm @@ -203,8 +203,8 @@ product_paths = "/obj/item/seeds/bananaseed;/obj/item/seeds/berryseed;/obj/item/seeds/carrotseed;/obj/item/seeds/chantermycelium;/obj/item/seeds/chiliseed;/obj/item/seeds/cornseed;/obj/item/seeds/eggplantseed;/obj/item/seeds/potatoseed;/obj/item/seeds/replicapod;/obj/item/seeds/soyaseed;/obj/item/seeds/sunflowerseed;/obj/item/seeds/tomatoseed;/obj/item/seeds/towermycelium;/obj/item/seeds/wheatseed;/obj/item/seeds/appleseed;/obj/item/seeds/poppyseed;/obj/item/seeds/ambrosiavulgarisseed;/obj/item/seeds/whitebeetseed;/obj/item/seeds/watermelonseed;/obj/item/seeds/limeseed;/obj/item/seeds/lemonseed;/obj/item/seeds/orangeseed;/obj/item/seeds/grassseed;/obj/item/seeds/cocoapodseed;/obj/item/seeds/cabbageseed;/obj/item/seeds/grapeseed;/obj/item/seeds/pumpkinseed" product_amounts = "3;2;2;2;2;2;2;2;3;2;2;2;2;2;3;5;4;3;3;3;3;3;3;3;3;3;3" product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!" - product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/spaceshroommycelium" - product_hideamt = "2;2;2;2;2" + product_hidden = "/obj/item/seeds/amanitamycelium;/obj/item/seeds/glowshroom;/obj/item/seeds/libertymycelium;/obj/item/seeds/nettleseed;/obj/item/seeds/plumpmycelium;/obj/item/seeds/reishimycelium" + product_hideamt = "2;2;2;2;2;2" product_coin = "/obj/item/toy/waterflower" product_coin_amt = "1" product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!" diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 7260b37f94c..ab4c2038cab 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -196,7 +196,7 @@ obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient, del(src.myseed) switch(rand(1,18)) // randomly pick predominative weed if(16 to 18) - src.myseed = new /obj/item/seeds/spaceshroommycelium + src.myseed = new /obj/item/seeds/reishimycelium if(14 to 15) src.myseed = new /obj/item/seeds/nettleseed if(12 to 13) diff --git a/html/changelog.html b/html/changelog.html index 9e2497b3d06..b4857f643b5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,7 +53,7 @@ should be listed in the changelog upon commit tho. Thanks. -->

26 July 2012

Giacom updated:

diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi index 654d21a6872..9d17be966db 100644 Binary files a/icons/obj/harvest.dmi and b/icons/obj/harvest.dmi differ diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 9aceac79009..aacc7f484b0 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ diff --git a/icons/obj/seeds.dmi b/icons/obj/seeds.dmi index 6fd9da8f768..cf12979809c 100644 Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ