From f1f762ef4824fb62aea8fdc565d454408047a38d Mon Sep 17 00:00:00 2001
From: Fermi <>
Date: Wed, 4 Sep 2019 21:45:55 +0100
Subject: [PATCH] Darnit bobby

---
 code/modules/hydroponics/grown/cotton.dm      | 83 +------------------
 .../chemistry/reagents/eigentstasium.dm       |  4 +-
 2 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
index 6cdfe58cd3..4787d62230 100644
--- a/code/modules/hydroponics/grown/cotton.dm
+++ b/code/modules/hydroponics/grown/cotton.dm
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /obj/item/seeds/cotton
 	name = "pack of cotton seeds"
 	desc = "A pack of seeds that'll grow into a cotton plant. Assistants make good free labor if neccesary."
@@ -77,84 +76,4 @@
 	throw_range = 3
 	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
 	cotton_type = /obj/item/stack/sheet/cotton/durathread
-=======
-/obj/item/seeds/cotton
-	name = "pack of cotton seeds"
-	desc = "A pack of seeds that'll grow into a cotton plant. Assistants make good free labor if neccesary."
-	icon_state = "seed-cotton"
-	species = "cotton"
-	plantname = "Cotton"
-	icon_harvest = "cotton-harvest"
-	product = /obj/item/grown/cotton
-	lifespan = 35
-	endurance = 25
-	maturation = 15
-	production = 1
-	yield = 2
-	potency = 50
-	growthstages = 3
-	growing_icon = 'icons/obj/hydroponics/growing.dmi'
-	icon_dead = "cotton-dead"
-	mutatelist = list(/obj/item/seeds/cotton/durathread)
-
-/obj/item/grown/cotton
-	seed = /obj/item/seeds/cotton
-	name = "cotton bundle"
-	desc = "A fluffy bundle of cotton."
-	icon_state = "cotton"
-	force = 0
-	throwforce = 0
-	w_class = WEIGHT_CLASS_TINY
-	throw_speed = 2
-	throw_range = 3
-	attack_verb = list("pomfed")
-	var/cotton_type = /obj/item/stack/sheet/cotton
-	var/cotton_name = "raw cotton"
-
-/obj/item/grown/cotton/attack_self(mob/user)
-	user.show_message("<span class='notice'>You pull some [cotton_name] out of the [name]!</span>", 1)
-	var/seed_modifier = 0
-	if(seed)
-		seed_modifier = round(seed.potency / 25)
-	var/obj/item/stack/cotton = new cotton_type(user.loc, 1 + seed_modifier)
-	var/old_cotton_amount = cotton.amount
-	for(var/obj/item/stack/ST in user.loc)
-		if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount)
-			ST.attackby(cotton, user)
-	if(cotton.amount > old_cotton_amount)
-		to_chat(user, "<span class='notice'>You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].</span>")
-	qdel(src)
-
-//reinforced mutated variant
-/obj/item/seeds/cotton/durathread
-	name = "pack of durathread seeds"
-	desc = "A pack of seeds that'll grow into an extremely durable thread that could easily rival plasteel if woven properly."
-	icon_state = "seed-durathread"
-	species = "durathread"
-	plantname = "Durathread"
-	icon_harvest = "durathread-harvest"
-	product = /obj/item/grown/cotton/durathread
-	lifespan = 80
-	endurance = 50
-	maturation = 15
-	production = 1
-	yield = 2
-	potency = 50
-	growthstages = 3
-	growing_icon = 'icons/obj/hydroponics/growing.dmi'
-	icon_dead = "cotton-dead"
-
-/obj/item/grown/cotton/durathread
-	seed = /obj/item/seeds/cotton/durathread
-	name = "durathread bundle"
-	desc = "A tough bundle of durathread, good luck unraveling this."
-	icon_state = "durathread"
-	force = 5
-	throwforce = 5
-	w_class = WEIGHT_CLASS_NORMAL
-	throw_speed = 2
-	throw_range = 3
-	attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
-	cotton_type = /obj/item/stack/sheet/cotton/durathread
->>>>>>> upstream/master
-	cotton_name = "raw durathread"
\ No newline at end of file
+	cotton_name = "raw durathread"
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
index bf915d5b6f..6584568a17 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm
@@ -17,7 +17,7 @@
 	color = "#5020F4" // rgb: 50, 20, 255
 	overdose_threshold = 15
 	addiction_threshold = 15
-	metabolization_rate = 1.2 * REAGENTS_METABOLISM
+	metabolization_rate = 1 * REAGENTS_METABOLISM
 	addiction_stage2_end = 30
 	addiction_stage3_end = 41
 	addiction_stage4_end = 44 //Incase it's too long
@@ -52,7 +52,7 @@
 
 		location_return = get_turf(M)	//sets up return point
 		to_chat(M, "<span class='userdanger'>You feel your wavefunction split!</span>")
-		if(purity > 0.9) //Teleports you home if it's pure enough
+		if(cached_purity > 0.9) //Teleports you home if it's pure enough
 			if(!location_created && data) //Just in case
 				location_created = data.["location_created"]
 			log_game("FERMICHEM: [M] ckey: [M.key] returned to [location_created] using eigenstasium")