From 021b0a2bee408ef185034ef2244ce2a0ca0f8ace Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 1 Oct 2017 22:38:55 -0500
Subject: [PATCH] Update growninedible.dm

---
 code/modules/hydroponics/growninedible.dm | 67 -----------------------
 1 file changed, 67 deletions(-)

diff --git a/code/modules/hydroponics/growninedible.dm b/code/modules/hydroponics/growninedible.dm
index 01be327caa..a77808f006 100644
--- a/code/modules/hydroponics/growninedible.dm
+++ b/code/modules/hydroponics/growninedible.dm
@@ -1,69 +1,3 @@
-<<<<<<< HEAD
-// **********************
-// Other harvested materials from plants (that are not food)
-// **********************
-
-/obj/item/grown // Grown weapons
-	name = "grown_weapon"
-	icon = 'icons/obj/hydroponics/harvest.dmi'
-	resistance_flags = FLAMMABLE
-	var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item.
-
-/obj/item/grown/New(newloc, var/obj/item/seeds/new_seed = null)
-	..()
-	create_reagents(50)
-
-	if(new_seed)
-		seed = new_seed.Copy()
-	else if(ispath(seed))
-		// This is for adminspawn or map-placed growns. They get the default stats of their seed type.
-		seed = new seed()
-		seed.adjust_potency(50-seed.potency)
-
-	pixel_x = rand(-5, 5)
-	pixel_y = rand(-5, 5)
-
-	if(seed)
-		for(var/datum/plant_gene/trait/T in seed.genes)
-			T.on_new(src, newloc)
-
-		if(istype(src, seed.product)) // no adding reagents if it is just a trash item
-			seed.prepare_result(src)
-		transform *= TransformUsingVariable(seed.potency, 100, 0.5)
-		add_juice()
-
-
-/obj/item/grown/attackby(obj/item/O, mob/user, params)
-	..()
-	if (istype(O, /obj/item/device/plant_analyzer))
-		var/msg = "<span class='info'>*---------*\n This is \a <span class='name'>[src]</span>\n"
-		if(seed)
-			msg += seed.get_analyzer_text()
-		msg += "</span>"
-		to_chat(usr, msg)
-		return
-
-/obj/item/grown/proc/add_juice()
-	if(reagents)
-		return 1
-	return 0
-
-
-/obj/item/grown/Crossed(atom/movable/AM)
-	if(seed)
-		for(var/datum/plant_gene/trait/T in seed.genes)
-			T.on_cross(src, AM)
-	..()
-
-/obj/item/grown/throw_impact(atom/hit_atom)
-	if(!..()) //was it caught by a mob?
-		if(seed)
-			for(var/datum/plant_gene/trait/T in seed.genes)
-				T.on_throw_impact(src, hit_atom)
-
-/obj/item/grown/microwave_act(obj/machine/microwave/M)
-	return
-=======
 // **********************
 // Other harvested materials from plants (that are not food)
 // **********************
@@ -128,4 +62,3 @@
 
 /obj/item/grown/microwave_act(obj/machine/microwave/M)
 	return
->>>>>>> 7477a55... Merge pull request #31201 from AnturK/grownspam