Skip to content

Radio jammers now jam suit sensors #6738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 22, 2025
Merged

Radio jammers now jam suit sensors #6738

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7fd8a2c
Radio jammers now block suit sensors
Absolucy May 18, 2025
0b8e3be
add a `QDELING` check.
Absolucy May 18, 2025
62d2bf0
changes
Absolucy May 18, 2025
01419e8
e
Absolucy May 18, 2025
3327633
Revert "e"
Absolucy May 18, 2025
84bf558
Revert "changes"
Absolucy May 18, 2025
d565645
Revert "add a `QDELING` check."
Absolucy May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions monkestation/code/game/machinery/computer/crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
return NTNET_NO_SIGNAL

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

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

// Radio jammers block sensors.
if(is_within_radio_jammer_range(pos))
return SENSOR_OFF

// Machinery and the target should be on the same level or different levels of the same station
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))
return SENSOR_OFF
Expand Down
Loading