Fixed issue 663, you should no longer be able to mass inject monkeys.

Fixed DNA injector sprites so they don't remain in your hand after injecting someone.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4135 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-07-21 20:06:29 +00:00
parent f40dcf358e
commit 5bd1f78eb1
2 changed files with 58 additions and 44 deletions
@@ -942,20 +942,23 @@ It can still be worn/put on as normal.
source << "\red Repeat every 7 seconds AT LEAST."
if("dnainjector")
var/obj/item/weapon/dnainjector/S = item
if(item)
item.add_fingerprint(source)
item:inject(target, null)
if(S)
S.add_fingerprint(source)
if (!( istype(S, /obj/item/weapon/dnainjector) ))
//SN src = null
S.inuse = 0
del(src)
return
S.inject(target, source)
if (S.s_time >= world.time + 30)
//SN src = null
S.inuse = 0
del(src)
return
S.s_time = world.time
for(var/mob/O in viewers(source, null))
O.show_message(text("\red [] injects [] with the DNA Injector!", source, target), 1)
S.inuse = 0
if("pockets")
if (target.l_store)
var/obj/item/W = target.l_store