mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 11:07:12 +01:00
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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user