cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 19:44:58 +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/wiremod/components/atom/remotecam.dm
+5 -5
View File
@@ -189,7 +189,7 @@
/obj/item/circuit_component/remotecam/proc/update_camera_location(atom/old_loc, movement_dir, forced, list/old_locs, momentum_change)
SIGNAL_HANDLER
if(current_camera_state && current_cameranet_state)
GLOB.cameranet.updatePortableCamera(shell_camera, 0.5 SECONDS)
SScameras.update_portable_camera(shell_camera, 0.5 SECONDS)
/**
* Add camera from global cameranet
@@ -197,8 +197,8 @@
/obj/item/circuit_component/remotecam/proc/cameranet_add()
if(current_cameranet_state)
return
GLOB.cameranet.cameras += shell_camera
GLOB.cameranet.addCamera(shell_camera)
SScameras.cameras += shell_camera
SScameras.add_camera_to_chunk(shell_camera)
current_cameranet_state = TRUE
/**
@@ -207,8 +207,8 @@
/obj/item/circuit_component/remotecam/proc/cameranet_remove()
if(!current_cameranet_state)
return
GLOB.cameranet.removeCamera(shell_camera)
GLOB.cameranet.cameras -= shell_camera
SScameras.remove_camera_from_chunk(shell_camera)
SScameras.cameras -= shell_camera
current_cameranet_state = FALSE
/**