cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

More 515 Compatibility

Browse Source
This commit is contained in:
Heroman3003
2023-06-06 07:14:58 +10:00
committed by CHOMPStation2
parent 3129a35fe2
commit 2281afdf24
142 changed files with 507 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/tgui/modules/appearance_changer.dm
View File

@@ -65,13 +65,13 @@
owner = H
if(owner)
GLOB.moved_event.register(owner, src, .proc/update_active_camera_screen)
GLOB.moved_event.register(owner, src, PROC_REF(update_active_camera_screen))
check_whitelist = check_species_whitelist
whitelist = species_whitelist
blacklist = species_blacklist
/datum/tgui_module/appearance_changer/Destroy()
GLOB.moved_event.unregister(owner, src, .proc/update_active_camera_screen)
GLOB.moved_event.unregister(owner, src, PROC_REF(update_active_camera_screen))
last_camera_turf = null
qdel(cam_screen)
QDEL_LIST(cam_plane_masters)

17
code/modules/tgui/modules/camera.dm
View File

@@ -34,7 +34,7 @@
cam_screen.assigned_map = map_name
cam_screen.del_on_map_removal = FALSE
cam_screen.screen_loc = "[map_name]:1,1"
cam_plane_masters = get_tgui_plane_masters()
for(var/obj/screen/instance as anything in cam_plane_masters)
@@ -68,7 +68,7 @@
/datum/tgui_module/camera/Destroy()
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
active_camera = null
last_camera_turf = null
qdel(cam_screen)
@@ -131,7 +131,7 @@
/datum/tgui_module/camera/tgui_act(action, params)
if(..())
return TRUE
if(action && !issilicon(usr))
playsound(tgui_host(), "terminal_type", 50, 1)
@@ -140,9 +140,9 @@
var/list/cameras = get_available_cameras(usr)
var/obj/machinery/camera/C = cameras["[ckey(c_tag)]"]
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
active_camera = C
GLOB.moved_event.register(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.register(active_camera, src, PROC_REF(update_active_camera_screen))
playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE)
update_active_camera_screen()
return TRUE
@@ -167,9 +167,9 @@
if(target)
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
active_camera = target
GLOB.moved_event.register(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.register(active_camera, src, PROC_REF(update_active_camera_screen))
playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE)
update_active_camera_screen()
. = TRUE
@@ -273,7 +273,7 @@
// Turn off the console
if(length(concurrent_users) == 0 && is_living)
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, .proc/update_active_camera_screen)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
active_camera = null
playsound(tgui_host(), 'sound/machines/terminal_off.ogg', 25, FALSE)
@@ -298,4 +298,3 @@
/datum/tgui_module/camera/bigscreen/tgui_state(mob/user)
return GLOB.tgui_physical_state_bigscreen

2
code/modules/tgui/modules/ntos-only/uav.dm
View File

@@ -94,7 +94,7 @@
signal_strength = 0
current_uav = U
RegisterSignal(U, COMSIG_MOVABLE_Z_CHANGED, .proc/current_uav_changed_z)
RegisterSignal(U, COMSIG_MOVABLE_Z_CHANGED, PROC_REF(current_uav_changed_z))
if(LAZYLEN(viewers))
for(var/weakref/W in viewers)

2
code/modules/tgui/tgui.dm
View File

@@ -182,7 +182,7 @@
return
//if(!COOLDOWN_FINISHED(src, refresh_cooldown))
//refreshing = TRUE
//addtimer(CALLBACK(src, .proc/send_full_update), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
//addtimer(CALLBACK(src, PROC_REF(send_full_update)), TGUI_REFRESH_FULL_UPDATE_COOLDOWN, TIMER_UNIQUE)
//return
//refreshing = FALSE
var/should_update_data = force || status >= STATUS_UPDATE