Merge branch 'master' into upstream-merge-31601

2017-10-14 10:17:16 -04:00
parent c28932e4d4 2d2adfbee5
commit d6903bcf3c
101 changed files with 4200 additions and 11173 deletions
@@ -255,7 +255,7 @@
 			ejectItem()
 		else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
 			visible_message("<span class='danger'>[src] malfunctions, melting [exp_on] and leaking radiation!</span>")
-			radiation_pulse(get_turf(src), 1, 1, 25, 1)
+			radiation_pulse(get_turf(src), 50)
 			ejectItem(TRUE)
 		else if(prob(EFFECT_PROB_LOW-badThingCoeff))
 			visible_message("<span class='warning'>[src] malfunctions, spewing toxic waste!</span>")