From 83173b107719e3fdd34eadb5902a4d7f94983a61 Mon Sep 17 00:00:00 2001 From: Citinited Date: Fri, 9 Nov 2018 00:35:33 +0000 Subject: [PATCH] Ghosts and other anchored mobs can no longer speed up conveyors --- code/modules/recycling/conveyor2.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index e5ca5fb0d28..64c201a319f 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -1,7 +1,7 @@ #define DIRECTION_FORWARDS 1 #define DIRECTION_OFF 0 #define DIRECTION_REVERSED -1 -#define IS_OPERATING (can_conveyor_run() && operating) +#define IS_OPERATING (operating && can_conveyor_run()) GLOBAL_LIST_INIT(conveyor_belts, list()) //Saves us having to look through the entire machines list for our things GLOBAL_LIST_INIT(conveyor_switches, list()) @@ -178,7 +178,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) makeSpeedProcess() /obj/machinery/conveyor/Crossed(atom/movable/AM) - if(!speed_process) + if(!speed_process && !AM.anchored) makeSpeedProcess() ..()