Merge tgstation r4572 into bs12_with_tgport, fixed missing title screen (tgside problem?), some conflicts

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-08-28 20:22:22 +10:00
parent eacd84b212
commit e6078b100f
15 changed files with 127 additions and 41 deletions

View File

@@ -80,10 +80,9 @@
on_hit(var/atom/target, var/blocked = 0)
var/mob/living/M = target
if(ishuman(target) && M.dna && M.dna.mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
var/mob/living/L = target
if(prob(15))
L.apply_effect((rand(30,80)),IRRADIATE)
L.Weaken(5)
M.apply_effect((rand(30,80)),IRRADIATE)
M.Weaken(5)
for (var/mob/V in viewers(src))
V.show_message("\red [M] writhes in pain as \his vacuoles boil.", 3, "\red You hear the crunching of leaves.", 2)
if(prob(35))