Merge pull request #3395 from Citadel-Station-13/upstream-merge-31731

[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
This commit is contained in:
LetterJay
2017-10-15 10:20:04 -04:00
committed by GitHub
20 changed files with 45 additions and 39 deletions
+1 -1
View File
@@ -199,7 +199,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
radiation_pulse(get_turf(src), 150)
radiation_pulse(src, 150)
for(var/turf/closed/wall/mineral/uranium/T in orange(1,src))
T.radiate()
last_event = world.time
+1 -1
View File
@@ -131,7 +131,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
radiation_pulse(get_turf(src), 30)
radiation_pulse(src, 30)
last_event = world.time
active = null
return