From e915af4fe5b2d842fa88690d7716524f5e83f806 Mon Sep 17 00:00:00 2001 From: Loganbacca Date: Sat, 22 Feb 2014 01:07:45 +1300 Subject: [PATCH] Runtime fix - Fixed a runtime caused by effects bumping disposal chutes. Conflicts: code/modules/recycling/sortingmachinery.dm --- code/modules/recycling/sortingmachinery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index ae3dd52b4cc..28dad70da25 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -218,7 +218,7 @@ return Bumped(var/atom/movable/AM) //Go straight into the chute - if(istype(AM, /obj/item/projectile)) return + if(istype(AM, /obj/item/projectile) || istype(AM, /obj/effect)) return switch(dir) if(NORTH) if(AM.loc.y != src.loc.y+1) return