From 8d6d56195028dc037159298ff79caf86626225c2 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 17 Dec 2017 17:37:53 -0600 Subject: [PATCH] Update beebox.dm --- code/modules/hydroponics/beekeeping/beebox.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index 1e3cf41362..d4269013f7 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -257,10 +257,5 @@ B.forceMove(drop_location()) for(var/obj/item/honey_frame/HF in honey_frames) if(HF.loc == src) -<<<<<<< HEAD - HF.loc = get_turf(src) - qdel(src) -======= HF.forceMove(drop_location()) qdel(src) ->>>>>>> 5233ec1... Finishes the forceMove port (#33519)