From 062bcd0ff0445229eeebc1b99c8bdbcdfdab1fdf Mon Sep 17 00:00:00 2001 From: panurgomatic Date: Sun, 10 Oct 2010 21:34:34 +0000 Subject: [PATCH] - Fixed bug with 'lazy OR' - Fixed bug with object deletion in proc called from deleted object proc git-svn-id: http://tgstation13.googlecode.com/svn/trunk@264 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/misc.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm index 0a44e44ae58..20f3d2f07b3 100644 --- a/code/game/objects/items/weapons/misc.dm +++ b/code/game/objects/items/weapons/misc.dm @@ -52,7 +52,9 @@ DNA INJECTOR M.dna.struc_enzymes = setblock(M.dna.struc_enzymes,block,dna,3) domutcheck(M, null,1) uses-- - del(src) + + spawn(0)//this prevents the collapse of space-time continuum + del(src) return uses /obj/item/weapon/dnainjector/attack(mob/M as mob, mob/user as mob) @@ -78,9 +80,9 @@ DNA INJECTOR for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] has been injected with [] by [].", M, src, user), 1) //Foreach goto(192) - if (!istype(M, /mob/living/carbon/human) || !istype(M, /mob/living/carbon/monkey)) + if (!(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))) user << "\red Apparently it didn't work." return inject(M) user.show_message(text("\red You inject [M]")) - return \ No newline at end of file + return