Runtime fix for the floral somatoray shooting at mechas.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3525 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-04-28 15:54:50 +00:00
parent 73837b0c4f
commit 4b9e382170

View File

@@ -60,20 +60,21 @@
// V.show_message("\red [M] is mutated by the radiation beam.", 3, "\red You hear the snapping of twigs.", 2) // V.show_message("\red [M] is mutated by the radiation beam.", 3, "\red You hear the snapping of twigs.", 2)
if(prob(80)) if(prob(80))
randmutb(M) randmutb(M)
domutcheck(M,null,1) domutcheck(M,null)
else else
randmutg(M) randmutg(M)
domutcheck(M,null,1) domutcheck(M,null)
else else
M.adjustFireLoss(rand(5,15)) M.adjustFireLoss(rand(5,15))
M.show_message("\red The radiation beam singes you!") M.show_message("\red The radiation beam singes you!")
// for (var/mob/V in viewers(src)) // for (var/mob/V in viewers(src))
// V.show_message("\red [M] is singed by the radiation beam.", 3, "\red You hear the crackle of burning leaves.", 2) // V.show_message("\red [M] is singed by the radiation beam.", 3, "\red You hear the crackle of burning leaves.", 2)
else else if(istype(target, /mob/living/carbon/))
// for (var/mob/V in viewers(src)) // for (var/mob/V in viewers(src))
// V.show_message("The radiation beam dissipates harmlessly through [M]", 3) // V.show_message("The radiation beam dissipates harmlessly through [M]", 3)
M.show_message("\blue The radiation beam dissipates harmlessly through your body.") M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
return ..() else
return 1
/obj/item/projectile/energy/florayield /obj/item/projectile/energy/florayield
name = "beta somatoray" name = "beta somatoray"
@@ -88,8 +89,7 @@
if(istype(target, /mob/living/carbon/human) && M:mutantrace == "plant") //These rays make plantmen fat. if(istype(target, /mob/living/carbon/human) && M:mutantrace == "plant") //These rays make plantmen fat.
if(M.nutrition < 500) //sanity check if(M.nutrition < 500) //sanity check
M.nutrition += 30 M.nutrition += 30
else else if (istype(target, /mob/living/carbon/))
// for (var/mob/V in viewers(src))
// V.show_message("The radiation beam dissipates harmlessly through [M]", 3)
M.show_message("\blue The radiation beam dissipates harmlessly through your body.") M.show_message("\blue The radiation beam dissipates harmlessly through your body.")
return ..() else
return 1