cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-27 07:03:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update

Browse Source
This commit is contained in:
izac112
2024-01-09 21:28:33 +01:00
parent c63f56f22d 032cc8beb5
commit 376ce75686
20 changed files with 151 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tgui/modules/camera.dm
+6 -3
View File
@@ -80,8 +80,10 @@
/datum/tgui_module/camera/tgui_interact(mob/user, datum/tgui/ui = null)
// Update UI
ui = SStgui.try_update_ui(user, src, ui)
var/turf/newturf = get_turf(active_camera)
var/area/B = newturf?.loc // No cam tracking in dorms!
// Show static if can't use the camera
if(!active_camera?.can_use())
if(!active_camera?.can_use() || B.block_tracking)
show_camera_static()
if(!ui)
var/user_ref = REF(user)
@@ -175,15 +177,16 @@
. = TRUE
/datum/tgui_module/camera/proc/update_active_camera_screen()
var/turf/newturf = get_turf(active_camera)
var/area/B = newturf?.loc // No cam tracking in dorms!
// Show static if can't use the camera
if(!active_camera?.can_use())
if(!active_camera?.can_use() || B.block_tracking)
show_camera_static()
return TRUE
// If we're not forcing an update for some reason and the cameras are in the same location,
// we don't need to update anything.
// Most security cameras will end here as they're not moving.
var/turf/newturf = get_turf(active_camera)
if(newturf == last_camera_turf)
return