Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909

[MIRROR] Radiation rework and subsystem
2017-10-13 23:58:04 -04:00
parent 243e9d7acb 14dc8a5a35
commit 8aebc3b15a
72 changed files with 831 additions and 336 deletions
@@ -206,7 +206,7 @@
 	if(!active)
 		if(world.time > last_event+15)
 			active = 1
-			radiation_pulse(get_turf(src), 3, 3, 1, 0)
+			radiation_pulse(get_turf(src), 10)
 			for(var/turf/open/floor/mineral/uranium/T in orange(1,src))
 				T.radiate()
 			last_event = world.time