diff --git a/code/game/machinery/Freezer.dm b/code/game/machinery/Freezer.dm index 8a8c7a04114..542ed8b47b4 100644 --- a/code/game/machinery/Freezer.dm +++ b/code/game/machinery/Freezer.dm @@ -109,7 +109,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/atmospherics/unary/cold_sink/freezer/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["on"] = on ? 1 : 0 data["gasPressure"] = round(air_contents.return_pressure()) @@ -267,7 +267,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/atmospherics/unary/heat_reservoir/heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["on"] = on ? 1 : 0 data["gasPressure"] = round(air_contents.return_pressure()) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index 566fc4f80ff..a5db47222e6 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -696,7 +696,7 @@ data["danger"] = danger return data -/obj/machinery/alarm/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/alarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/list/href_list = state.href_list() diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index 8f7f6d72bb4..acdb4d30aa0 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -117,7 +117,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/pump/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/atmoalter/scrubber.dm b/code/game/machinery/atmoalter/scrubber.dm index de5ac2dc49d..044023c394a 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -128,7 +128,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, datum/topic_state/state = physical_state) +/obj/machinery/portable_atmospherics/scrubber/ui_data(mob/user, ui_key = "main", datum/topic_state/state = physical_state) var/data[0] data["portConnected"] = connected_port ? 1 : 0 data["tankPressure"] = round(air_contents.return_pressure() > 0 ? air_contents.return_pressure() : 0) diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 1c40370f56d..31700f8c2d3 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -92,7 +92,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/operating/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/operating/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/mob/living/carbon/human/occupant = src.table.victim data["hasOccupant"] = occupant ? 1 : 0 diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 7dd5075d28e..f42e50d9618 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -1,14 +1,14 @@ /obj/machinery/computer/security name = "security camera console" desc = "Used to access the various cameras networks on the station." - + icon_keyboard = "security_key" icon_screen = "cameras" light_color = LIGHT_COLOR_RED circuit = /obj/item/weapon/circuitboard/camera - + var/mapping = 0 // For the overview file (overview.dm), not used on this page - + var/list/network = list() var/list/available_networks = list() var/list/watchers = list() //who's using the console, associated with the camera they're on. @@ -16,7 +16,7 @@ /obj/machinery/computer/security/New() // Lists existing networks and their required access. Format: available_networks[] = list() generate_network_access() ..() - + /obj/machinery/computer/security/proc/generate_network_access() available_networks["SS13"] = list(access_hos,access_captain) available_networks["Telecomms"] = list(access_hos,access_captain) @@ -39,7 +39,7 @@ available_networks["ERT"] = list(access_cent_specops_commander,access_cent_commander) available_networks["CentComm"] = list(access_cent_security,access_cent_commander) available_networks["Thunderdome"] = list(access_cent_thunder,access_cent_commander) - + /obj/machinery/computer/security/Destroy() if(watchers.len) for(var/mob/M in watchers) @@ -58,11 +58,11 @@ user.unset_machine() return return 1 - + /obj/machinery/computer/security/on_unset_machine(mob/user) watchers.Remove(user) user.reset_perspective(null) - + /obj/machinery/computer/security/attack_hand(mob/user) if(stat || ..()) user.unset_machine() @@ -83,7 +83,7 @@ attack_hand(user) else attack_hand(user) - + /obj/machinery.computer/security/proc/get_user_access(mob/user) var/list/access = list() if(ishuman(user)) @@ -105,8 +105,8 @@ ui.add_template("mapHeader", "sec_camera_map_header.tmpl") ui.open() - -/obj/machinery/computer/security/ui_data(mob/user, datum/topic_state/state = default_state) + +/obj/machinery/computer/security/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/list/cameras = list() @@ -126,7 +126,7 @@ cameras.Swap(j, j + 1) data["cameras"] = cameras - + var/list/access = get_user_access(user) if(emagged) access = get_all_accesses() // Assume captain level access when emagged @@ -149,8 +149,8 @@ data["current"] = null if(watchers[user]) var/obj/machinery/camera/watched = watchers[user] - data["current"] = watched.nano_structure() - + data["current"] = watched.nano_structure() + return data /obj/machinery/computer/security/Topic(href, href_list) @@ -162,7 +162,7 @@ var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras if(!C) return 1 - + switch_to_camera(usr, C) else if(href_list["reset"]) @@ -180,31 +180,31 @@ else network += net break - + nanomanager.update_uis(src) // Check if camera is accessible when jumping /obj/machinery/computer/security/proc/can_access_camera(var/obj/machinery/camera/C, var/mob/M) if(CanUseTopic(M, default_state) != STATUS_INTERACTIVE || M.incapacitated() || M.blinded) return 0 - + if(isrobot(M)) var/list/viewing = viewers(src) if(!viewing.Find(M)) return 0 - + if(isAI(M)) var/mob/living/silicon/ai/A = M if(!A.is_in_chassis()) return 0 - + if(!issilicon(M) && !Adjacent(M)) return 0 - + var/list/shared_networks = network & C.network if(!shared_networks.len || !C.can_use()) return 0 - + return 1 // Switching to cameras @@ -212,7 +212,7 @@ if(!can_access_camera(C, user)) user.unset_machine() return 1 - + if(isAI(user)) var/mob/living/silicon/ai/A = user A.eyeobj.setLoc(get_turf(C)) @@ -226,12 +226,12 @@ /obj/machinery/computer/security/proc/jump_on_click(var/mob/user, var/A) if(user.machine != src) return - + var/obj/machinery/camera/jump_to - + if(istype(A, /obj/machinery/camera)) jump_to = A - + else if(ismob(A)) if(ishuman(A)) var/mob/living/carbon/human/H = A @@ -239,11 +239,11 @@ else if(isrobot(A)) var/mob/living/silicon/robot/R = A jump_to = R.camera - + else if(isobj(A)) var/obj/O = A jump_to = locate() in O - + else if(isturf(A)) var/best_dist = INFINITY for(var/obj/machinery/camera/camera in get_area(A)) @@ -255,10 +255,10 @@ if(dist < best_dist) best_dist = dist jump_to = camera - + if(isnull(jump_to)) return - + if(can_access_camera(jump_to, user)) switch_to_camera(user, jump_to) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index a33d3aa02eb..ebba68ec570 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -181,7 +181,7 @@ var/time_last_changed_position = 0 ui = new(user, src, ui_key, "identification_computer.tmpl", src.name, 775, 700) ui.open() -/obj/machinery/computer/card/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/card/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["src"] = UID() data["station_name"] = station_name() diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 847f20a3f23..0d47420edc9 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -127,7 +127,7 @@ ui = new(user, src, ui_key, "cloning_console.tmpl", "Cloning Console UI", 640, 520) ui.open() -/obj/machinery/computer/cloning/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/cloning/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["menu"] = src.menu data["scanner"] = sanitize("[src.scanner]") diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 9813597f9cd..86a8b2d2bcf 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -334,7 +334,7 @@ // open the new ui window ui.open() -/obj/machinery/computer/communications/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/communications/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["is_ai"] = isAI(user)||isrobot(user) data["menu_state"] = data["is_ai"] ? ai_menu_state : menu_state diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index 8664d786a24..75bad25bfab 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -20,7 +20,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/podtracker/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/podtracker/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/list/pods[0] for(var/obj/item/device/spacepod_equipment/misc/tracker/TR in world) diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index a195ad253df..5235fffd9ba 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -41,7 +41,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/robotics/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/robotics/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/list/robots = get_cyborgs(user) if(robots.len) diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index f42650a8e86..0b078a74ec8 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -190,7 +190,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/atmospherics/unary/cryo_cell/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["isOperating"] = on data["hasOccupant"] = occupant ? 1 : 0 diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index fe21020af5d..d3302487483 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -566,7 +566,7 @@ About the new airlock wires panel: ui.open() ui.set_auto_update(1) -/obj/machinery/door/airlock/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/door/airlock/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["main_power_loss"] = round(main_power_lost_until > 0 ? max(main_power_lost_until - world.time, 0) / 10 : main_power_lost_until, 1) diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index d9be59bde59..99b5189e206 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -27,7 +27,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data = list( @@ -83,7 +83,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data = list( @@ -146,7 +146,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data = list( diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index b1f7d33244d..3e77a7548b3 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -180,7 +180,7 @@ FIRE ALARM ui.open() ui.set_auto_update(1) -/obj/machinery/firealarm/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/firealarm/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/area/A = get_area(src) diff --git a/code/game/machinery/poolcontroller.dm b/code/game/machinery/poolcontroller.dm index 80f5e8be5d7..db60adb5c9a 100644 --- a/code/game/machinery/poolcontroller.dm +++ b/code/game/machinery/poolcontroller.dm @@ -135,7 +135,7 @@ ui = new(user, src, ui_key, "poolcontroller.tmpl", "Pool Controller Interface", 520, 410) ui.open() -/obj/machinery/poolcontroller/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/poolcontroller/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["currentTemp"] = temperature diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index de78d46178f..1944da8f071 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -49,7 +49,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/tag/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/porta_turret/tag/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index a6eb360f45d..17fe32f39ec 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -200,7 +200,7 @@ var/list/turret_icons ui.open() ui.set_auto_update(1) -/obj/machinery/porta_turret/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/porta_turret/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["access"] = !isLocked(user) data["screen"] = screen diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 9de1806852f..704da886685 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -115,7 +115,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() ui.open() ui.set_auto_update(1) -/obj/machinery/requests_console/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/requests_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["department"] = department diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index c72e987cd92..1c6dcf6322e 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -28,7 +28,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/slot_machine/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/slot_machine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["working"] = working diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index 0fec852c2f5..843002a804d 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -75,7 +75,7 @@ ui = new(user, src, ui_key, "teleporter_console.tmpl", "Teleporter Console UI", 400, 400) ui.open() -/obj/machinery/computer/teleporter/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/teleporter/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["powerstation"] = power_station if(power_station) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index eda38ee6120..21da8c4159c 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -125,7 +125,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/turretid/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/turretid/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 37666b2eba1..4ec9471a36a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -416,7 +416,7 @@ ui = new(user, src, ui_key, "vending_machine.tmpl", src.name, 440, 600) ui.open() -/obj/machinery/vending/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/vending/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/list/data = list() if(currently_vending) data["mode"] = 1 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index ea8a06961cc..24b6b1822d9 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -155,7 +155,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/computer/mech_bay_power_console/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/mech_bay_power_console/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] if(!recharge_port) reconnect() diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 6838aae1b29..11c940f7971 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -23,7 +23,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/mecha/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/mecha/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["screen"] = screen if(screen == 0) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index ab897d80ec0..0d02add30a3 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -48,7 +48,7 @@ ui.set_auto_update(1) -/obj/item/device/aicard/ui_data(mob/user, datum/topic_state/state = inventory_state) +/obj/item/device/aicard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) var/data[0] var/mob/living/silicon/ai/AI = locate() in src diff --git a/code/game/objects/items/devices/guitar.dm b/code/game/objects/items/devices/guitar.dm index 73831d1f468..eaf1c668e3c 100644 --- a/code/game/objects/items/devices/guitar.dm +++ b/code/game/objects/items/devices/guitar.dm @@ -33,8 +33,8 @@ song.ui_interact(user, ui_key, ui, force_open) -/obj/item/device/guitar/ui_data(mob/user, datum/topic_state/state = default_state) - return song.ui_data(user, state) +/obj/item/device/guitar/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) + return song.ui_data(user, ui_key, state) /obj/item/device/guitar/Topic(href, href_list) song.Topic(href, href_list) @@ -46,4 +46,4 @@ /obj/item/stack/cable_coil = 6, /obj/item/stack/tape_roll = 5) tools = list(/obj/item/weapon/screwdriver, /obj/item/weapon/wirecutters) - time = 80 \ No newline at end of file + time = 80 diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index 51859fd27ac..35848bdc087 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -105,7 +105,7 @@ ui.open() ui.set_auto_update(1) -/obj/item/device/radio/electropack/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/item/device/radio/electropack/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["power"] = on diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 6078f855b61..f4f95559ad9 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -114,7 +114,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/device/radio/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/item/device/radio/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["mic_status"] = broadcasting @@ -757,7 +757,7 @@ var/global/list/default_medbay_channels = list( ui.open() ui.set_auto_update(1) -/obj/item/device/radio/borg/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/item/device/radio/borg/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["mic_status"] = broadcasting diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 84b397780dc..f126910bcbb 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -101,7 +101,7 @@ // auto update every Master Controller tick //ui.set_auto_update(1) -/obj/item/device/transfer_valve/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/item/device/transfer_valve/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["attachmentOne"] = tank_one ? tank_one.name : null diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index d29e5e5ede4..0c21ef212c9 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -198,7 +198,7 @@ var/list/world_uplinks = list() // open the new ui window ui.open() -/obj/item/device/uplink/hidden/ui_data(mob/user, datum/topic_state/state = inventory_state) +/obj/item/device/uplink/hidden/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) var/data[0] data["welcome"] = welcome diff --git a/code/game/objects/items/devices/violin.dm b/code/game/objects/items/devices/violin.dm index 7802e832fde..323fb3db4f4 100644 --- a/code/game/objects/items/devices/violin.dm +++ b/code/game/objects/items/devices/violin.dm @@ -38,8 +38,8 @@ song.ui_interact(user, ui_key, ui, force_open) -/obj/item/device/violin/ui_data(mob/user, datum/topic_state/state = default_state) - return song.ui_data(user, state) +/obj/item/device/violin/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) + return song.ui_data(user, ui_key, state) /obj/item/device/violin/Topic(href, href_list) song.Topic(href, href_list) diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index 0a503aa7cb9..088c26f06c2 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -89,7 +89,7 @@ RCD ui.open() ui.set_auto_update(1) -/obj/item/weapon/rcd/ui_data(mob/user, datum/topic_state/state = inventory_state) +/obj/item/weapon/rcd/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) var/data[0] data["mode"] = mode data["door_type"] = door_type diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 5dbcc68ab2b..a61a3cea5ce 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -152,7 +152,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/item/weapon/tank/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/item/weapon/tank/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/using_internal if(iscarbon(loc)) var/mob/living/carbon/C = loc diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index c28ebe05c55..f1d9b6ac578 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -122,7 +122,7 @@ ui.open() ui.set_auto_update(1) -/datum/song/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/song/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["lines"] = lines @@ -296,8 +296,8 @@ song.ui_interact(user, ui_key, ui, force_open) -/obj/structure/piano/ui_data(mob/user, datum/topic_state/state = default_state) - return song.ui_data(user, state) +/obj/structure/piano/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) + return song.ui_data(user, ui_key, state) /obj/structure/piano/Topic(href, href_list) song.Topic(href, href_list) diff --git a/code/modules/awaymissions/bluespaceartillery.dm b/code/modules/awaymissions/bluespaceartillery.dm index 9eb71904de5..6b6eb863b45 100644 --- a/code/modules/awaymissions/bluespaceartillery.dm +++ b/code/modules/awaymissions/bluespaceartillery.dm @@ -24,7 +24,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/computer/artillerycontrol/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/artillerycontrol/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/time_to_wait = round(reload_cooldown - ((world.time / 10) - last_fire), 1) diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 7e5dfcad115..2ebd01a9162 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -514,7 +514,7 @@ ui.open() ui.set_auto_update(1) -/obj/item/weapon/rig/ui_data(mob/user, datum/topic_state/state = inventory_state) +/obj/item/weapon/rig/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) var/data[0] data["primarysystem"] = null diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 1b238acea6e..44299826454 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -83,7 +83,7 @@ ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640) ui.open() -/obj/machinery/computer/account_database/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/account_database/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["src"] = UID() diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 4c487d05afb..149744675a9 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -322,7 +322,7 @@ ui = new(user, src, ui_key, "smartfridge.tmpl", name, 400, 500) ui.open() -/obj/machinery/smartfridge/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/smartfridge/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["contents"] = null diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index c50503d7aa5..7e21e12370e 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -166,7 +166,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/botany/extractor/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/botany/extractor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/list/geneMasks[0] @@ -318,7 +318,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/botany/editor/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/botany/editor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["activity"] = active diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 9d3ad378f34..860099f0297 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -58,7 +58,7 @@ var/global/list/default_pai_software = list() ui.open() ui.set_auto_update(1) -/mob/living/silicon/pai/ui_data(mob/user, datum/topic_state/state = self_state) +/mob/living/silicon/pai/ui_data(mob/user, ui_key = "main", datum/topic_state/state = self_state) var/data[0] // Software we have bought diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 40756a81a1e..12f94d5fe64 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -14,7 +14,7 @@ // Vars for pAI nanoUI handling var/autoupdate = 0 - var/template_file = "" + var/template_file = "oops" var/ui_title = "somebody forgot to set this" var/ui_width = 450 var/ui_height = 600 diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm index cf90b61bf29..015d0990ee7 100644 --- a/code/modules/nano/modules/alarm_monitor.dm +++ b/code/modules/nano/modules/alarm_monitor.dm @@ -62,7 +62,7 @@ ui.open() ui.set_auto_update(1) -/datum/nano_module/alarm_monitor/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/alarm_monitor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/categories[0] diff --git a/code/modules/nano/modules/atmos_control.dm b/code/modules/nano/modules/atmos_control.dm index ee776ba4467..0670193e498 100644 --- a/code/modules/nano/modules/atmos_control.dm +++ b/code/modules/nano/modules/atmos_control.dm @@ -39,7 +39,7 @@ ui.set_auto_update(1) ui_ref = ui -/datum/nano_module/atmos_control/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/atmos_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["alarms"] = air_alarm_repository.air_alarm_data(monitored_alarms) return data diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index c5f8f6ecfb8..05749741461 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -31,7 +31,7 @@ // should make the UI auto-update; doesn't seem to? ui.set_auto_update(1) -/datum/nano_module/crew_monitor/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/crew_monitor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/turf/T = get_turf(nano_host()) diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/nano/modules/human_appearance.dm index 8bc9058db37..21636465d4a 100644 --- a/code/modules/nano/modules/human_appearance.dm +++ b/code/modules/nano/modules/human_appearance.dm @@ -217,7 +217,7 @@ ui.open() ui.set_auto_update(1) -/datum/nano_module/appearance_changer/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/appearance_changer/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) generate_data(check_whitelist, whitelist, blacklist) var/data[0] diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm index 0d79f719677..92378e3abcc 100644 --- a/code/modules/nano/modules/law_manager.dm +++ b/code/modules/nano/modules/law_manager.dm @@ -154,7 +154,7 @@ ui.open() ui.set_auto_update(1) -/datum/nano_module/law_manager/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/law_manager/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] owner.lawsync() diff --git a/code/modules/nano/modules/power_monitor.dm b/code/modules/nano/modules/power_monitor.dm index 1ebe6e99c9f..33e08b00e83 100644 --- a/code/modules/nano/modules/power_monitor.dm +++ b/code/modules/nano/modules/power_monitor.dm @@ -18,7 +18,7 @@ ui.open() ui.set_auto_update(1) -/datum/nano_module/power_monitor/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/nano_module/power_monitor/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["powermonitor"] = powermonitor diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 288a9df2255..2a98343408b 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -48,7 +48,7 @@ * * @return list() */ -/datum/proc/ui_data(mob/user, datum/topic_state/state = default_state) +/datum/proc/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) return list() // Used by the Nano UI Manager (/datum/nanomanager) to track UIs opened by this mob diff --git a/code/modules/nano/nanomanager.dm b/code/modules/nano/nanomanager.dm index 2d0fe09c887..774aa875b89 100644 --- a/code/modules/nano/nanomanager.dm +++ b/code/modules/nano/nanomanager.dm @@ -23,7 +23,7 @@ ui = get_open_ui(user, src_object, ui_key) if(!isnull(ui)) - var/data = src_object.ui_data(user, ui.state) // Get data from src_object. + var/data = src_object.ui_data(user, ui_key, ui.state) // Get data from src_object. if(!force_open) ui.push_data(data) else diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index be5ad871a36..1622fe1700e 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -415,7 +415,7 @@ nanoui is used to open and update nano browser uis return if(!initial_data) - set_initial_data(src_object.ui_data(user, state)) // Get the UI data. + set_initial_data(src_object.ui_data(user, ui_key, state)) // Get the UI data. user << browse(get_html(), "window=[window_id];[window_size][window_options]") winset(user, "mapwindow.map", "focus=true") // return keyboard focus to map diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 6fbd805f6b0..80f45fa0eaf 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -62,7 +62,7 @@ var/list/alldepartments = list() ui = new(user, src, ui_key, "faxmachine.tmpl", "Fax Machine UI", 540, 450) ui.open() -/obj/machinery/photocopier/faxmachine/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/photocopier/faxmachine/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] if(scan) diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm index 5cbaf08fd34..6874593f33a 100755 --- a/code/modules/pda/PDA.dm +++ b/code/modules/pda/PDA.dm @@ -129,7 +129,7 @@ var/global/list/obj/item/device/pda/PDAs = list() // auto update every Master Controller tick ui.set_auto_update(auto_update) -/obj/item/device/pda/ui_data(mob/user, datum/topic_state/state = inventory_state) +/obj/item/device/pda/ui_data(mob/user, ui_key = "main", datum/topic_state/state = inventory_state) var/data[0] data["owner"] = owner // Who is your daddy... diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 675cbcdfac6..ae931484524 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -787,7 +787,7 @@ // Auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/power/apc/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/power/apc/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["locked"] = is_locked(user) data["isOperating"] = operating diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 4a35e57764c..0abb033e3e8 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -327,7 +327,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/power/port_gen/pacman/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/power/port_gen/pacman/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["active"] = active diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 62557e85384..02597b46840 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -375,7 +375,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/power/smes/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/power/smes/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["nameTag"] = name_tag diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 98d899cdbca..5f137f4cb74 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -395,7 +395,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/power/solar_control/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/power/solar_control/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["generated"] = round(lastgen) diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index e0be4e3c0a0..323c240d239 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -265,7 +265,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/power/supermatter_shard/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/power/supermatter_shard/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["integrity_percentage"] = round(get_integrity()) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index acbdc19b659..9a3ecffedb6 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -121,7 +121,7 @@ // open the new ui window ui.open() -/obj/machinery/chem_dispenser/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/chem_dispenser/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["amount"] = amount diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index bd32fcee6cd..e9025a2aa3d 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -136,7 +136,7 @@ ui = new(user, src, ui_key, "chem_heater.tmpl", "ChemHeater", 350, 270) ui.open() -/obj/machinery/chem_heater/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/chem_heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["targetTemp"] = desired_temp diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 3ef20cff9b3..569bdb3f4e1 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -328,7 +328,7 @@ ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 400) ui.open() -/obj/machinery/chem_master/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["condi"] = condi diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index feb350d4d91..6691df19a1d 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -247,7 +247,7 @@ ui.open() ui.set_auto_update(1) -/obj/machinery/disposal/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/disposal/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] var/pressure = Clamp(100* air_contents.return_pressure() / (SEND_PRESSURE), 0, 100) diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index a39c6485fc7..121eb0ee2d3 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -652,7 +652,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, ui = new(user, src, ui_key, "r_n_d.tmpl", src.name, 800, 550) ui.open() -/obj/machinery/computer/rdconsole/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/rdconsole/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] files.RefreshResearch() diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index c231912484b..bd2c704f21f 100644 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -126,7 +126,7 @@ // auto update every Master Controller tick ui.set_auto_update(1) -/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/radiocarbon_spectrometer/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["scanned_item"] = (scanned_item ? scanned_item.name : "") data["scanned_item_desc"] = (scanned_item ? (scanned_item.desc ? scanned_item.desc : "No information on record.") : "") diff --git a/code/modules/security_levels/keycard authentication.dm b/code/modules/security_levels/keycard authentication.dm index f2d36842504..8435d8cf992 100644 --- a/code/modules/security_levels/keycard authentication.dm +++ b/code/modules/security_levels/keycard authentication.dm @@ -75,7 +75,7 @@ ui = new(user, src, ui_key, "keycard_auth.tmpl", "Keycard Authentication Device UI", 540, 320) ui.open() -/obj/machinery/keycard_auth/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/keycard_auth/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["screen"] = screen data["event"] = event diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm index 23d2fe52787..970daf16e80 100644 --- a/code/modules/shuttle/supply.dm +++ b/code/modules/shuttle/supply.dm @@ -430,7 +430,7 @@ ui = new(user, src, ui_key, "order_console.tmpl", name, ORDER_SCREEN_WIDTH, ORDER_SCREEN_HEIGHT) ui.open() -/obj/machinery/computer/ordercomp/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/ordercomp/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["last_viewed_group"] = last_viewed_group @@ -579,7 +579,7 @@ ui = new(user, src, ui_key, "supply_console.tmpl", name, SUPPLY_SCREEN_WIDTH, SUPPLY_SCREEN_HEIGHT) ui.open() -/obj/machinery/computer/supplycomp/ui_data(mob/user, datum/topic_state/state = default_state) +/obj/machinery/computer/supplycomp/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) var/data[0] data["last_viewed_group"] = last_viewed_group