cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

The 515 MegaPR early downport (#7783)

Browse Source 
Co-authored-by: Selis <selis@xynolabs.com>
Co-authored-by: Selis <sirlionfur@hotmail.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: SatinIsle <thesatinisle@gmail.com>
Co-authored-by: Heroman <alesha3000@list.ru>
Co-authored-by: Casey <a.roaming.shadow@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
This commit is contained in:
Cadyn
2024-02-27 11:17:32 -08:00
committed by GitHub
parent 96a43a09c1
commit b90f7ec922
254 changed files with 2135 additions and 1576 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_REF(update_active_camera_screen))
RegisterSignal(owner, COMSIG_OBSERVER_MOVED, 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_REF(update_active_camera_screen))
UnregisterSignal(owner, COMSIG_OBSERVER_MOVED)
last_camera_turf = null
qdel(cam_screen)
QDEL_LIST(cam_plane_masters)

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

@@ -68,7 +68,7 @@
/datum/tgui_module/camera/Destroy()
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
UnregisterSignal(active_camera, COMSIG_OBSERVER_MOVED)
active_camera = null
last_camera_turf = null
qdel(cam_screen)
@@ -142,9 +142,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_REF(update_active_camera_screen))
UnregisterSignal(active_camera, COMSIG_OBSERVER_MOVED)
active_camera = C
GLOB.moved_event.register(active_camera, src, PROC_REF(update_active_camera_screen))
RegisterSignal(active_camera, COMSIG_OBSERVER_MOVED, PROC_REF(update_active_camera_screen))
playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE)
update_active_camera_screen()
return TRUE
@@ -169,9 +169,9 @@
if(target)
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
UnregisterSignal(active_camera, COMSIG_OBSERVER_MOVED)
active_camera = target
GLOB.moved_event.register(active_camera, src, PROC_REF(update_active_camera_screen))
RegisterSignal(active_camera, COMSIG_OBSERVER_MOVED, PROC_REF(update_active_camera_screen))
playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE)
update_active_camera_screen()
. = TRUE
@@ -276,7 +276,7 @@
// Turn off the console
if(length(concurrent_users) == 0 && is_living)
if(active_camera)
GLOB.moved_event.unregister(active_camera, src, PROC_REF(update_active_camera_screen))
UnregisterSignal(active_camera, COMSIG_OBSERVER_MOVED)
active_camera = null
playsound(tgui_host(), 'sound/machines/terminal_off.ogg', 25, FALSE)

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

@@ -55,13 +55,13 @@
user.set_machine(src)
user.reset_view(linked)
user.set_viewsize(world.view + extra_view)
GLOB.moved_event.register(user, src, /datum/tgui_module/ship/proc/unlook)
RegisterSignal(user, COMSIG_OBSERVER_MOVED, /datum/tgui_module/ship/proc/unlook)
LAZYDISTINCTADD(viewers, WEAKREF(user))
/datum/tgui_module/ship/proc/unlook(var/mob/user)
user.reset_view()
user.set_viewsize() // reset to default
GLOB.moved_event.unregister(user, src, /datum/tgui_module/ship/proc/unlook)
UnregisterSignal(user, COMSIG_OBSERVER_MOVED)
LAZYREMOVE(viewers, WEAKREF(user))
/datum/tgui_module/ship/proc/viewing_overmap(mob/user)

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

@@ -110,10 +110,7 @@
))
else
window.send_message("ping")
window.send_asset(get_asset_datum(/datum/asset/simple/fontawesome))
window.send_asset(get_asset_datum(/datum/asset/simple/tgfont))
for(var/datum/asset/asset in src_object.ui_assets(user))
window.send_asset(asset)
send_assets()
window.send_message("update", get_payload(
with_data = TRUE,
with_static_data = TRUE))
@@ -123,6 +120,17 @@
return TRUE
/datum/tgui/proc/send_assets()
var/flush_queue = window.send_asset(get_asset_datum(
/datum/asset/simple/namespaced/fontawesome))
flush_queue |= window.send_asset(get_asset_datum(
/datum/asset/simple/namespaced/tgfont))
for(var/datum/asset/asset in src_object.ui_assets(user))
flush_queue |= window.send_asset(asset)
if (flush_queue)
user.client.browse_queue_flush()
/**
* public
*