Renamed the Space Shroom to Reishi.

Fixed some mistakes.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4186 316c924e-a436-60f5-8080-3fe189b3f50e

code/defines/obj/hydro.dm

@@ -419,14 +419,14 @@
 	plant_type = 0
 	growthstages = 3
 
-/obj/item/seeds/spaceshroommycelium
+/obj/item/seeds/reishimycelium
-	name = "pack of space shroom mycelium"
+	name = "pack of reishi mycelium"
 	desc = "This mycelium grows into something relaxing."
-	icon_state = "mycelium-spaceshroom"
+	icon_state = "mycelium-reishi"
-	mypath = "/obj/item/seeds/spaceshroom"
+	mypath = "/obj/item/seeds/reishi"
-	species = "spaceshroom"
+	species = "reishi"
-	plantname = "Space Shroom"
+	plantname = "reishi"
-	productname = "/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/spaceshroom"
+	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
+/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/reishi
-	seed = "/obj/item/seeds/spaceshroommycelium"
+	seed = "/obj/item/seeds/reishimycelium"
-	name = "space shroom"
+	name = "reishi"
-	desc = "<I>Space Shroom</I>: A special fungus found growing on the walls of station."
+	desc = "<I>Reishi</I>: A special fungus believed to help relieve stress."
-	icon_state = "spaceshroom"
+	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 << "<span class='info'>- Sleep Toxin: <i>[reagents.get_reagent_amount("stoxin")]%</i></span>"
@@ -1594,6 +1594,7 @@
 	. = ..()
 	if (istype(O, /obj/item/device/analyzer/plant_analyzer))
 		user << "<span class='info'>- Amatoxins: <i>[reagents.get_reagent_amount("amatoxin")]%</i></span>"
+		user << "<span class='info'>- Psilocybin: <i>[reagents.get_reagent_amount("psilocybin")]%</i></span>"
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/angel
 	seed = "/obj/item/seeds/angelmycelium"

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

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_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"
+	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!"

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)

html/changelog.html

@@ -53,7 +53,7 @@ should be listed in the changelog upon commit tho. Thanks. -->
 	<h2 class="date">26 July 2012</h2>
 	<h3 class="author">Giacom updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">Added a new mushroom for Hydroponics, the Space Shroom! (Original Title Do Not Steal) It is obtained like any other mushroom and it has relaxing properties.</li>
+		<li class="rscadd">Added a new mushroom for Hydroponics, the Reishi Mushroom! It is obtained like any other mushroom and it has relaxing properties.</li>
 	</ul>
 </div>