diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index d8595f01..f13da05d 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -101,7 +101,17 @@ if(!LAZYLEN(operation_order)) //The list is empty, so we're done here end_harvesting() return - var/turf/target = get_turf(src) + var/turf/target + for(var/adir in list(EAST,NORTH,SOUTH,WEST)) + var/turf/T = get_step(src,adir) + if(!T) + continue + if(istype(T, /turf/closed)) + continue + target = T + break + if(!target) + target = get_turf(src) for(var/obj/item/bodypart/BP in operation_order) //first we do non-essential limbs BP.drop_limb() C.emote("scream") @@ -136,11 +146,6 @@ return return FALSE -/obj/machinery/harvester/wrench_act(mob/living/user, obj/item/I) - . = ..() - if(default_change_direction_wrench(user, I)) - return TRUE - /obj/machinery/harvester/crowbar_act(mob/living/user, obj/item/I) if(default_pry_open(I)) return TRUE @@ -184,6 +189,4 @@ if(state_open) . += "[src] must be closed before harvesting." else if(!harvesting) - . += "Alt-click [src] to start harvesting." - if(in_range(user, src) || isobserver(user)) - . += "The status display reads: Harvest speed at [interval*0.1] seconds per organ." + . += "Alt-click [src] to start harvesting." \ No newline at end of file