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

[MIRROR] [s] Fixes camera mobs becoming contaminated and other tweaks
2017-10-15 10:20:04 -04:00
parent 5b4bb85ca1 5c95c983af
commit b02e9c6a90
20 changed files with 45 additions and 39 deletions
@@ -295,7 +295,7 @@
 	if(!active)
 		if(world.time > last_event+30)
 			active = 1
-			radiation_pulse(get_turf(H), 50)
+			radiation_pulse(H, 50)
 			last_event = world.time
 			active = null
 	..()