diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm
index fb7868da7f2..7d5de58b7cb 100644
--- a/code/defines/obj/hydro.dm
+++ b/code/defines/obj/hydro.dm
@@ -419,6 +419,24 @@
 	plant_type = 0
 	growthstages = 3
 
+/obj/item/seeds/spaceshroommycelium
+	name = "pack of space shroom 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"
+	lifespan = 35
+	endurance = 35
+	maturation = 10
+	production = 5
+	yield = 4
+	potency = 10 // Sleeping based on potency?
+	oneharvest = 1
+	growthstages = 3
+	plant_type = 2
+
 /obj/item/seeds/amanitamycelium
 	name = "pack of fly amanita mycelium"
 	desc = "This mycelium grows into something horrible."
@@ -1540,6 +1558,25 @@
 		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 = "<I>Space Shroom</I>: A special fungus found growing on the walls of station."
+	icon_state = "spaceshroom"
+	potency = 10
+	New()
+		..()
+		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("stoxin", 3+round(potency / 3, 1))
+		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)
+	. = ..()
+	if (istype(O, /obj/item/device/analyzer/plant_analyzer))
+		user << "<span class='info'>- Sleep Toxin: <i>[reagents.get_reagent_amount("stoxin")]%</i></span>"
+		user << "<span class='info'>- Space Drugs: <i>[reagents.get_reagent_amount("space_drugs")]%</i></span>"
+
 /obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/amanita
 	seed = "/obj/item/seeds/amanitamycelium"
 	name = "fly amanita"
@@ -1557,7 +1594,6 @@
 	. = ..()
 	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"
diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index 64bb26fc084..75a2bf00cd7 100644
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -227,6 +227,7 @@
 					"/obj/item/seeds/plumpmycelium",
 					"/obj/item/seeds/libertymycelium",
 					"/obj/item/seeds/amanitamycelium",
+					"/obj/item/seeds/spaceshroommycelium",
 					"/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 01d5a892df9..6d5e9d6234c 100644
--- a/code/defines/obj/vending.dm
+++ b/code/defines/obj/vending.dm
@@ -203,7 +203,7 @@
 	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"
+	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_coin = "/obj/item/toy/waterflower"
 	product_coin_amt = "1"
diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm
index ff49c409b46..7260b37f94c 100644
--- a/code/game/machinery/hydroponics.dm
+++ b/code/game/machinery/hydroponics.dm
@@ -194,7 +194,9 @@ obj/machinery/hydroponics/proc/weedinvasion() // If a weed growth is sufficient,
 	src.dead = 0
 	if(src.myseed) // In case there's nothing in the tray beforehand
 		del(src.myseed)
-	switch(rand(1,15))		// randomly pick predominative weed
+	switch(rand(1,18))		// randomly pick predominative weed
+		if(16 to 18)
+			src.myseed = new /obj/item/seeds/spaceshroommycelium
 		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 42725f5a625..9e2497b3d06 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -49,6 +49,14 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <div class="commit sansserif">
 
+<div class="commit sansserif">
+	<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>
+	</ul>
+</div>
+
 
 	<h2 class="date">July 25, 2012: The day of updates!</h2>
 	<h3 class="author">Nodrak updated:</h3>
diff --git a/icons/obj/harvest.dmi b/icons/obj/harvest.dmi
index 951506db05f..654d21a6872 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 4a6c86c07b0..9aceac79009 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 fe83cd63fe2..6fd9da8f768 100644
Binary files a/icons/obj/seeds.dmi and b/icons/obj/seeds.dmi differ