From 6901bc7fec60f1a576e96d8ae5da713e05d15fda Mon Sep 17 00:00:00 2001
From: MrSky12 <71841824+MrSky12@users.noreply.github.com>
Date: Wed, 15 May 2024 23:28:35 +0200
Subject: [PATCH] Reapply "Porteded from yogger"
This reverts commit acf1d99ad262358ae52c38aca19bb099e1b7abeb.
---
code/game/machinery/harvester.dm | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm
index f13da05d..d8595f01 100644
--- a/code/game/machinery/harvester.dm
+++ b/code/game/machinery/harvester.dm
@@ -101,17 +101,7 @@
if(!LAZYLEN(operation_order)) //The list is empty, so we're done here
end_harvesting()
return
- 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)
+ var/turf/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")
@@ -146,6 +136,11 @@
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
@@ -189,4 +184,6 @@
if(state_open)
. += "[src] must be closed before harvesting."
else if(!harvesting)
- . += "Alt-click [src] to start harvesting."
\ No newline at end of file
+ . += "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."