TGUI file convert : camera console and religion screen

Author: ShiftyRail

code/controllers/subsystem/assets.dm

@@ -11,6 +11,12 @@ var/datum/subsystem/assets/SSassets
 	NEW_SS_GLOBAL(SSassets)
 
 /datum/subsystem/assets/Initialize()
+
+	// -- FIXME ASSETS:.
+	// -- Old, crusty /vg/ style of populating assets (relying on 'global cache.dm')
+	// TOFIX asap!!! Having two concurrent, parralel & independant asset delivery system is BAD
+	populate_asset_cache()
+
 	var/newtransporttype = /datum/asset_transport
 	switch (config.tg_asset_transport)
 		if ("webroot")

code/controllers/subsystem/tgui.dm

@@ -216,7 +216,7 @@ var/datum/subsystem/tgui/SStgui
  */
 /datum/subsystem/tgui/proc/close_uis(datum/src_object)
 	// No UIs opened for this src_object
-	if(!(src_object?.open_uis.len))
+	if(!(src_object?.open_uis?.len))
 		return 0
 	var/count = 0
 	for(var/datum/tgui/ui in src_object.open_uis)

code/game/machinery/computer/camera.dm

@@ -132,25 +132,27 @@ var/list/obj/machinery/camera/cyborg_cams = list(
 
 /obj/machinery/computer/security/ui_static_data()
 	var/list/data = list()
-	data["title"] = name
 	data["mapRef"] = map_name
 	var/list/cameras = get_available_cameras()
 	data["cameras"] = list()
 	for(var/i in cameras)
 		var/obj/machinery/camera/C = cameras[i]
 		data["cameras"] += list(list(
 			name = C.c_tag,
+			ref = ref(C),
 		))
 
 	return data
 
 /obj/machinery/computer/security/ui_act(action, params)
 	. = ..()
+	message_admins("Active camera change")
 	if(.)
 		return
 
 	if(action == "switch_camera")
 		var/c_tag = params["name"]
+		message_admins("Act = switch_camera, [c_tag]")
 		var/list/cameras = get_available_cameras()
 		var/obj/machinery/camera/selected_camera = cameras[c_tag]
 		active_camera = selected_camera

code/modules/tgui/tgui.dm

@@ -118,6 +118,19 @@
 		/datum/tg_asset/json/icon_ref_map))
 	for(var/datum/tg_asset/asset in src_object.ui_assets(user))
 		flush_queue |= window.send_asset(asset)
+
+	// -- Legacy code for /vg/ style spritesheet datums --
+	// TOFIX!!! One thing at the time..
+	for(var/asset_type in src_object.ui_assets(user))
+		message_admins("Legacy style spreedsheet datum sent: [asset_type]")
+		window.sent_assets |= list(asset_type)
+		var/datum/asset/instance = get_asset_datum(asset_type)
+		instance.send(window.client)
+		if(istype(instance, /datum/asset/spritesheet))
+			var/datum/asset/spritesheet/spritesheet = instance
+			window.send_message("asset/stylesheet", spritesheet.css_filename())
+		window.send_raw_message(TGUI_CREATE_MESSAGE("asset/mappings", instance.get_url_mappings()))
+	// -- END legacy code for /vg/ style spritesheet datums --
 	if (flush_queue)
 		user.client.tg_browse_queue_flush()
 
@@ -319,7 +332,7 @@
 			src_object = src_object)
 		process_status()
 		if(src_object.ui_act(act_type, payload, src, state))
-			SStgui.update_uis(src_object)		
+			SStgui.update_uis(src_object)
 		return FALSE
 	switch(type)
 		if("ready")

tgui/packages/tgui/interfaces/CameraConsole.tsx

@@ -17,7 +17,6 @@ import { Window } from '../layouts';
 type Data = {
   activeCamera: Camera & { status: BooleanLike };
   cameras: Camera[];
-  can_spy: BooleanLike;
   mapRef: string;
   network: string[];
 };
@@ -143,7 +142,7 @@ const CameraSelector = (props) => {
               ])}
               onClick={() =>
                 act('switch_camera', {
-                  camera: camera.ref,
+                  name: camera.name,
                 })
               }
             >
@@ -158,7 +157,7 @@ const CameraSelector = (props) => {
 
 const CameraControls = (props: { searchText: string }) => {
   const { act, data } = useBackend<Data>();
-  const { activeCamera, can_spy, mapRef } = data;
+  const { activeCamera, mapRef } = data;
   const { searchText } = props;
 
   const cameras = selectCameras(data.cameras, searchText);
@@ -178,16 +177,6 @@ const CameraControls = (props: { searchText: string }) => {
               )}
             </Stack.Item>
 
-            <Stack.Item>
-              {!!can_spy && (
-                <Button
-                  icon="magnifying-glass"
-                  tooltip="Track Person"
-                  onClick={() => act('start_tracking')}
-                />
-              )}
-            </Stack.Item>
-
             <Stack.Item>
               <Button
                 icon="chevron-left"