TG Sync 12/15/17

s

s

code/modules/hydroponics/beekeeping/beebox.dm

@@ -37,8 +37,8 @@
 	var/bee_resources = 0
 
 
-/obj/structure/beebox/New()
-	..()
+/obj/structure/beebox/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
 
@@ -55,8 +55,8 @@
 	var/random_reagent = FALSE
 
 
-/obj/structure/beebox/premade/New()
-	..()
+/obj/structure/beebox/premade/Initialize()
+	. = ..()
 
 	icon_state = "beebox"
 	var/datum/reagent/R = null
@@ -152,6 +152,7 @@
 		else
 			to_chat(user, "<span class='warning'>There's no room for any more frames in the apiary!</span>")
 		return
+
 	if(istype(I, /obj/item/wrench))
 		if(default_unfasten_wrench(user, I, time = 20))
 			return
@@ -178,7 +179,7 @@
 					bees -= B
 					B.beehome = null
 					if(B.loc == src)
-						B.loc = get_turf(src)
+						B.forceMove(drop_location())
 					relocated++
 			if(relocated)
 				to_chat(user, "<span class='warning'>This queen has a different reagent to some of the bees who live here, those bees will not return to this apiary!</span>")
@@ -201,7 +202,7 @@
 			if(B.isqueen)
 				continue
 			if(B.loc == src)
-				B.loc = get_turf(src)
+				B.forceMove(drop_location())
 			B.target = user
 			bees = TRUE
 		if(bees)
@@ -221,7 +222,7 @@
 				var/obj/item/honey_frame/HF = pick_n_take(honey_frames)
 				if(HF)
 					if(!user.put_in_active_hand(HF))
-						HF.loc = get_turf(src)
+						HF.forceMove(drop_location())
 					visible_message("<span class='notice'>[user] removes a frame from the apiary.</span>")
 
 					var/amtH = HF.honeycomb_capacity
@@ -229,7 +230,7 @@
 					while(honeycombs.len && amtH) //let's pretend you always grab the frame with the most honeycomb on it
 						var/obj/item/reagent_containers/honeycomb/HC = pick_n_take(honeycombs)
 						if(HC)
-							HC.loc = get_turf(user)
+							HC.forceMove(drop_location())
 							amtH--
 							fallen++
 					if(fallen)
@@ -241,12 +242,12 @@
 					to_chat(user, "<span class='warning'>There is no queen bee to remove!</span>")
 					return
 				var/obj/item/queen_bee/QB = new()
-				queen_bee.loc = QB
+				queen_bee.forceMove(QB)
 				bees -= queen_bee
 				QB.queen = queen_bee
 				QB.name = queen_bee.name
 				if(!user.put_in_active_hand(QB))
-					QB.loc = get_turf(src)
+					QB.forceMove(drop_location())
 				visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
 				queen_bee = null
 
@@ -254,8 +255,8 @@
 	new /obj/item/stack/sheet/mineral/wood (loc, 20)
 	for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
 		if(B.loc == src)
-			B.loc = get_turf(src)
+			B.forceMove(drop_location())
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		if(HF.loc == src)
-			HF.loc = get_turf(src)
-	qdel(src)
+			HF.forceMove(drop_location())
+	qdel(src)

code/modules/hydroponics/beekeeping/honeycomb.dm

@@ -10,10 +10,11 @@
 	volume = 10
 	amount_per_transfer_from_this = 0
 	list_reagents = list("honey" = 5)
+	grind_results = list()
 	var/honey_color = ""
 
-/obj/item/reagent_containers/honeycomb/New()
-	..()
+/obj/item/reagent_containers/honeycomb/Initialize()
+	. = ..()
 	pixel_x = rand(8,-8)
 	pixel_y = rand(8,-8)
 	update_icon()