Merge pull request #5012 from Citadel-Station-13/upstream-merge-34705

[MIRROR] Fix radio jammers affecting other z-levels
2018-01-21 23:13:24 -06:00
parent e8ec0580d1 b3f8fa0b10
commit fac7b08506
1 changed files with 2 additions and 1 deletions
@@ -228,7 +228,8 @@
 	// Nearby active jammers severely gibberish the message
 	var/turf/position = get_turf(src)
 	for(var/obj/item/device/jammer/jammer in GLOB.active_jammers)
-		if(get_dist(position,get_turf(jammer)) < jammer.range)
+		var/turf/jammer_turf = get_turf(jammer)
+		if(position.z == jammer_turf.z && (get_dist(position, jammer_turf) < jammer.range))
 			message = Gibberish(message,100)
 			break