Skip to content

Commit b10392f

Browse files
authored
Radio jammers now jam suit sensors (#6738)
1 parent c9eeb96 commit b10392f

File tree

1 file changed

+6
-2
lines changed
  • monkestation/code/game/machinery/computer

1 file changed

+6
-2
lines changed

monkestation/code/game/machinery/computer/crew.dm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
return NTNET_NO_SIGNAL
1111

1212
/datum/crewmonitor/proc/get_tracking_level(tracked_mob, tracker_z, nt_net, validation=TRUE)
13-
if(!tracked_mob)
13+
if(isnull(tracked_mob))
1414
if (validation)
1515
stack_trace("Null entry in suit sensors or nanite sensors list.")
1616
return SENSOR_OFF
@@ -21,11 +21,15 @@
2121
var/turf/pos = get_turf(tracked_living_mob)
2222

2323
// Is our target in nullspace for some reason?
24-
if(!pos)
24+
if(isnull(pos))
2525
if (validation)
2626
stack_trace("Tracked mob has no loc and is likely in nullspace: [tracked_living_mob] ([tracked_living_mob.type])")
2727
return SENSOR_OFF
2828

29+
// Radio jammers block sensors.
30+
if(is_within_radio_jammer_range(pos))
31+
return SENSOR_OFF
32+
2933
// Machinery and the target should be on the same level or different levels of the same station
3034
if(pos.z != tracker_z && !(tracker_z in SSmapping.get_connected_levels(pos.z)) && !(nt_net && get_ntnet_wireless_status(pos.z)) && !HAS_TRAIT(tracked_living_mob, TRAIT_MULTIZ_SUIT_SENSORS))
3135
return SENSOR_OFF

0 commit comments

Comments
 (0)