Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps

code/modules/hydroponics/grown/misc.dm

@@ -58,7 +58,7 @@
 		return
 
 	var/datum/gas_mixture/stank = new
-	stank.adjust_moles(/datum/gas/miasma,(yield + 6)*7*0.02) // this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
+	stank.adjust_moles(GAS_MIASMA,(yield + 6)*0.14) // 0.14 = 7*0.02, this process is only being called about 2/7 as much as corpses so this is 12-32 times a corpses
 	stank.set_temperature(T20C) // without this the room would eventually freeze and miasma mining would be easier
 	T.assume_air(stank)
 	T.air_update_turf()

code/modules/hydroponics/grown/mushrooms.dm

@@ -149,6 +149,7 @@
 	endurance = 30
 	maturation = 5
 	yield = 1
+	genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/eyes)
 	growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
 	mutatelist = list()
 	reagents_add = list(/datum/reagent/consumable/nutriment/vitamin = 0.05, /datum/reagent/consumable/nutriment = 0.15)

code/modules/hydroponics/grown/towercap.dm

@@ -226,7 +226,7 @@
 		var/turf/open/O = loc
 		if(O.air)
 			var/datum/gas_mixture/loc_air = O.air
-			if(loc_air.get_moles(/datum/gas/oxygen) > 13)
+			if(loc_air.get_moles(GAS_O2) > 13)
 				return TRUE
 	return FALSE
 

code/modules/hydroponics/plant_genes.dm

@@ -419,6 +419,15 @@
 		else
 			to_chat(user, "<span class='warning'>You need five lengths of cable to make a [G] battery!</span>")
 
+/datum/plant_gene/trait/eyes
+	name = "Oculary Mimicry"
+	/// Our googly eyes appearance.
+	var/mutable_appearance/googly
+
+/datum/plant_gene/trait/eyes/on_new(obj/item/reagent_containers/food/snacks/grown/G, newloc)
+	googly = mutable_appearance('icons/obj/hydroponics/harvest.dmi', "eyes")
+	googly.appearance_flags = RESET_COLOR
+	G.add_overlay(googly)
 
 /datum/plant_gene/trait/stinging
 	name = "Hypodermic Prickles"