- Fixed a small noize-bug

- Fixed issue 783 Unstable mutagen now only reacts to mobs with dna.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4441 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-08-16 17:57:27 +00:00
parent c0465614da
commit 26314e1310
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -106,12 +106,12 @@
src.throwing = 0
if (src.loc == user)
//canremove==0 means that object may not be removed. You can still wear it. This only applies to clothing. /N
if(istype(src, /obj/item/clothing) && !src:canremove)
if(!src.canremove)
return
else
user.u_equip(src)
else
if(istype(src.loc, /mob/living))
if(isliving(src.loc))
return
src.pickup(user)
user.lastDblClick = world.time + 2
+2 -2
View File
@@ -817,7 +817,7 @@ datum
reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
if(!..()) return
if(isrobot(M) || isAI(M)) return // Mutagen doesn't do anything to robutts!
if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
src = null
if((method==TOUCH && prob(33)) || method==INGEST)
randmuti(M)
@@ -829,7 +829,7 @@ datum
updateappearance(M,M.dna.uni_identity)
return
on_mob_life(var/mob/living/M as mob)
if(isrobot(M) || isAI(M)) return // Mutagen doesn't do anything to robutts!
if(!M.dna) return //No robots, AIs, aliens, Ians or other mobs should be affected by this.
if(!M) M = holder.my_atom
M.apply_effect(10,IRRADIATE,0)
..()