cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes distress beacons breaking all sensors consoles. (#22864)

Browse Source 
These things are ultra shitcode and need to be remade from the ground
up, but for the time being this stops them from exploding the server.

Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
Matt Atlas
2026-07-18 00:13:08 +00:00
committed by GitHub
co-authored by Matt Atlas
parent a0c5ab0a09
commit 126c188758
3 changed files with 79 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/overmap/ships/computers/sensors.dm
+13 -4
View File
@@ -149,12 +149,18 @@
for(var/requester in SSdistress.active_distress_beacons)
var/datum/distress_beacon/beacon = SSdistress.active_distress_beacons[requester]
var/obj/effect/overmap/vessel = beacon.requester
var/mob/living/carbon/human/H = beacon.user
var/job_string = H.job ? "[H.job] " : ""
var/mob/living/carbon/human/H = beacon.user.resolve()
var/job_string = "N/A"
if(H)
job_string = H.job ? "[H.job] " : ""
var/bearing = round(90 - Atan2(vessel.x - linked.x, vessel.y - linked.y),5)
if(bearing < 0)
bearing += 360
distress_beacons.Add(list(list("requester" = vessel.name, "sender" = "[job_string][H.name]", "bearing" = bearing)))
distress_beacons.Add(list(list("requester" = vessel.name, "sender" = H ? "[job_string][beacon.user_name]" : "Unknown", "bearing" = bearing)))
if(length(distress_beacons))
data["distress_beacons"] = distress_beacons
data["desired_range"] = sensors.desired_range
@@ -379,7 +385,10 @@
if (action == "play_message")
var/requester = params["play_message"]
var/datum/distress_beacon/beacon = SSdistress.active_distress_beacons[requester]
var/mob/living/carbon/human/sender = beacon.user
var/mob/living/carbon/human/sender = beacon.user.resolve()
if(!sender)
visible_message(SPAN_NOTICE("\The [src] beeps unsuccessfully, signalling an error in the playback."))
return TRUE
var/user_name = beacon.user_name
var/accent_icon = sender.get_accent_icon()
visible_message(SPAN_NOTICE("\The [src] beeps a few times as it replays the distress message."))