From bd6657ebca792764e0be04a884dd898549d5fcf8 Mon Sep 17 00:00:00 2001 From: "aranclanos@hotmail.com" Date: Mon, 7 Jan 2013 10:11:48 +0000 Subject: [PATCH] Runtime fix for delivery chutes checking the vars of a weapon/dummy before cancelling the proc in Bumped() git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5483 316c924e-a436-60f5-8080-3fe189b3f50e --- 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 9fa94838a7b..d9eec60a02f 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -214,6 +214,7 @@ return Bumped(var/atom/movable/AM) //Go straight into the chute + if(istype(AM, /obj/item/projectile) || istype(AM, /obj/item/weapon/dummy)) return switch(dir) if(NORTH) if(AM.loc.y != src.loc.y+1) return @@ -223,7 +224,6 @@ if(AM.loc.y != src.loc.y-1) return if(WEST) if(AM.loc.x != src.loc.x-1) return - if(istype(AM, /obj/item/projectile) || istype(AM, /obj/item/weapon/dummy)) return if(istype(AM, /obj)) var/obj/O = AM