new->init refactor

code/modules/hydroponics/beekeeping/beehive.dm

@@ -215,15 +215,9 @@
 	desc = "A frame for the beehive that the bees have filled with honeycombs."
 	honey = 20
 
-<<<<<<< HEAD
-/obj/item/honey_frame/filled/New()
-	..()
-	add_overlay("honeycomb")
-=======
 /obj/item/honey_frame/filled/Initialize()
 	. = ..()
-	overlays += "honeycomb"
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
+	add_overlay("honeycomb")
 
 /obj/item/beehive_assembly
 	name = "beehive assembly"
@@ -273,15 +267,9 @@ var/global/list/datum/stack_recipe/wax_recipes = list( \
 	icon_state = "beepack"
 	var/full = 1
 
-<<<<<<< HEAD
-/obj/item/bee_pack/New()
-	..()
-	add_overlay("beepack-full")
-=======
 /obj/item/bee_pack/Initialize()
 	. = ..()
-	overlays += "beepack-full"
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
+	add_overlay("beepack-full")
 
 /obj/item/bee_pack/proc/empty()
 	full = 0

code/modules/hydroponics/grown.dm

@@ -65,13 +65,11 @@
 /obj/item/weapon/reagent_containers/food/snacks/grown/proc/update_desc()
 	if(!seed)
 		return
-<<<<<<< HEAD
-=======
-	if(!plant_controller)
+
+	if(!SSplants)
 		testing("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
 		qdel(src)
 		return
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 
 	if(SSplants.product_descs["[seed.uid]"])
 		desc = SSplants.product_descs["[seed.uid]"]

code/modules/hydroponics/spreading/spreading.dm

@@ -91,13 +91,7 @@
 	else
 		parent = newparent
 
-<<<<<<< HEAD
 	if(!SSplants)
-		sleep(250) // ugly hack, should mean roundstart plants are fine. TODO initialize perhaps?
-	if(!SSplants)
-=======
-	if(!plant_controller)
->>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
 		to_world("<span class='danger'>Plant controller does not exist and [src] requires it. Aborting.</span>")
 		return INITIALIZE_HINT_QDEL