Merge branch 'master' of github.com:SkyMarshal/Baystation12

Conflicts:
	maps/tgstation.2.0.8.dmm
This commit is contained in:
SkyMarshal
2012-01-05 01:07:31 -07:00
2 changed files with 1 additions and 4 deletions
+1 -3
View File
@@ -4,9 +4,7 @@
command_alert("The ship is now travelling through a radiation belt", "Medical Alert")
Tick()
for(var/mob/living/L in world)
if(istype(L,/mob/living/simple_animal))
continue
for(var/mob/living/carbon/L in world)
L.radiation += rand(1,7)
if (prob(4))
if (prob(75))