From a3bb36bf39b3990f9bd9ab2aa25f8c859c6e7f0c Mon Sep 17 00:00:00 2001
From: Peak <45887317+Dashsora@users.noreply.github.com>
Date: Wed, 14 Oct 2020 20:54:45 -0400
Subject: [PATCH] Omega Weed Balance Changes (#14584)

* Update cannabis.dm

* Update cannabis.dm
---
 code/modules/hydroponics/grown/cannabis.dm | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm
index 06ba1fc7a66..96475111ce3 100644
--- a/code/modules/hydroponics/grown/cannabis.dm
+++ b/code/modules/hydroponics/grown/cannabis.dm
@@ -1,3 +1,5 @@
+
+      
 // Cannabis
 /obj/item/seeds/cannabis
 	name = "pack of cannabis seeds"
@@ -14,9 +16,7 @@
 	icon_dead = "cannabis-dead" // Same for the dead icon
 	genes = list(/datum/plant_gene/trait/repeated_harvest)
 	mutatelist = list(/obj/item/seeds/cannabis/rainbow,
-						/obj/item/seeds/cannabis/death,
-						/obj/item/seeds/cannabis/white,
-						/obj/item/seeds/cannabis/ultimate)
+						/obj/item/seeds/cannabis/white)
 	reagents_add = list("thc" = 0.15, "cbd" = 0.15)
 
 
@@ -27,7 +27,8 @@
 	species = "megacannabis"
 	plantname = "Rainbow Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/cannabis/death,
+						/obj/item/seeds/cannabis/ultimate)
 	reagents_add = list("lsd" = 0.15, "thc" = 0.15, "cbd" = 0.15)
 	rarity = 40
 
@@ -49,7 +50,8 @@
 	species = "whitecannabis"
 	plantname = "Lifeweed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/white
-	mutatelist = list()
+	mutatelist = list(/obj/item/seeds/cannabis/death,
+						/obj/item/seeds/cannabis/ultimate)
 	reagents_add = list("omnizine" = 0.35, "thc" = 0.15, "cbd" = 0.15)
 	rarity = 40
 
@@ -62,25 +64,24 @@
 	plantname = "Omega Weed"
 	product = /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate
 	mutatelist = list()
-	reagents_add = list("lsd" = 0.15,
-						"suicider" = 0.15,
-						"space_drugs" = 0.15,
-						"mercury" = 0.15,
-						"lithium" = 0.15,
-						"atropine" = 0.15,
-						"ephedrine" = 0.15,
-						"haloperidol" = 0.15,
-						"methamphetamine" = 0.15,
-						"thc" = 0.15,
-						"cbd" = 0.15,
-						"psilocybin" = 0.15,
-						"hairgrownium" = 0.15,
-						"ectoplasm" = 0.15,
-						"bath_salts" = 0.15,
-						"itching_powder" = 0.15,
-						"crank" = 0.15,
-						"krokodil" = 0.15,
-						"histamine" = 0.15)
+	reagents_add = list("lsd" = 0.05,
+						"suicider" = 0.05,
+						"space_drugs" = 0.05,
+						"mercury" = 0.05,
+						"lithium" = 0.05,
+						"ephedrine" = 0.05,
+						"haloperidol" = 0.05,
+						"methamphetamine" = 0.05,
+						"thc" = 0.05,
+						"cbd" = 0.05,
+						"psilocybin" = 0.05,
+						"hairgrownium" = 0.05,
+						"ectoplasm" = 0.05,
+						"bath_salts" = 0.05,
+						"itching_powder" = 0.05,
+						"crank" = 0.05,
+						"krokodil" = 0.05,
+						"histamine" = 0.05)
 	rarity = 69
 
 
@@ -124,5 +125,4 @@
 	name = "omega cannibas leaf"
 	desc = "You feel dizzy looking at it. What the fuck?"
 	icon_state = "ocannabis"
-	volume = 420
 	wine_power = 0.9