cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 16:44:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-2025-11-12

Browse Source
This commit is contained in:
Roxy
2025-11-12 16:42:38 -05:00
parent b4dbcc9db1 44b3075544
commit 71faa643bf
379 changed files with 37535 additions and 33147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/raptordex.dm
+1 -1
View File
@@ -5,7 +5,7 @@
program_open_overlay = "bountyboard"
extended_desc = "Scan and analyze raptor genes."
size = 2
tgui_id = "RaptorDex"
tgui_id = "NtosRaptorDex"
program_icon = "crow"
can_run_on_flags = PROGRAM_PDA
/// Raptor scan data we have stored
code/modules/modular_computers/file_system/programs/secureye.dm
+7 -6
View File
@@ -129,7 +129,7 @@
data["network"] = network
data["mapRef"] = cam_screen.assigned_map
data["can_spy"] = !!spying
data["cameras"] = GLOB.cameranet.get_available_cameras_data(network)
data["cameras"] = SScameras.get_available_cameras_data(network)
return data
/datum/computer_file/program/secureye/ui_act(action, params, datum/tgui/ui, datum/ui_state/state)
@@ -145,7 +145,7 @@
if(!spying)
playsound(computer, SFX_TERMINAL_TYPE, 25, FALSE)
var/obj/machinery/camera/selected_camera = locate(params["camera"]) in GLOB.cameranet.cameras
var/obj/machinery/camera/selected_camera = locate(params["camera"]) in SScameras.cameras
if(selected_camera)
camera_ref = WEAKREF(selected_camera)
else
@@ -168,12 +168,13 @@
/datum/computer_file/program/secureye/proc/on_track_target(datum/trackable/source, mob/living/target)
SIGNAL_HANDLER
var/datum/camerachunk/target_camerachunk = GLOB.cameranet.getTurfVis(get_turf(target))
var/target_turf = get_turf(target)
var/datum/camerachunk/target_camerachunk = SScameras.get_turf_camera_chunk(target_turf)
if(!target_camerachunk)
CRASH("[src] was able to track [target] through /datum/trackable, but was not on a visible turf to cameras.")
for(var/obj/machinery/camera/cameras as anything in target_camerachunk.cameras["[target.z]"])
var/found_target = locate(target) in cameras.can_see()
if(!found_target)
for(var/obj/machinery/camera/cameras as anything in target_camerachunk.cameras[target.z])
// We need to find a particular camera that can see this turf
if(!(target_turf in cameras.can_see()))
continue
var/new_camera = WEAKREF(cameras)
if(camera_ref == new_camera)