From 188fe4993c29c22b57c8218a04ca37b82e1b55a0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 16 Feb 2022 18:11:24 -0500 Subject: [PATCH] legit does nothing Renames all ui_interact with nano_ui_interact --- .../components/binary_devices/passive_gate.dm | 4 ++-- .../components/binary_devices/pump.dm | 4 ++-- .../components/omni_devices/filter.dm | 2 +- .../components/omni_devices/mixer.dm | 2 +- .../components/omni_devices/omni_base.dm | 2 +- .../components/unary/cold_sink.dm | 4 ++-- .../components/unary/heat_source.dm | 4 ++-- code/__DEFINES/nanoui.dm | 2 +- code/datums/craft/menu.dm | 4 ++-- code/game/dna/dna_modifier.dm | 12 +++++------ code/game/machinery/Sleeper.dm | 4 ++-- code/game/machinery/alarm.dm | 16 +++++++-------- code/game/machinery/atmoalter/canister.dm | 4 ++-- code/game/machinery/atmoalter/pump.dm | 4 ++-- code/game/machinery/atmoalter/scrubber.dm | 4 ++-- code/game/machinery/autodoc.dm | 6 +++--- code/game/machinery/autodoc_excelsior.dm | 6 +++--- code/game/machinery/autolathe/artist_bench.dm | 2 +- code/game/machinery/autolathe/autolathe.dm | 6 +++--- code/game/machinery/autolathe/fabricators.dm | 4 ++-- code/game/machinery/autolathe/matterforge.dm | 4 ++-- code/game/machinery/autolathe/mechfab.dm | 2 +- .../nanite_reconstitution_apparatus.dm | 6 +++--- code/game/machinery/autolathe_disk_cloner.dm | 6 +++--- code/game/machinery/biogenerator.dm | 4 ++-- code/game/machinery/computer/atmos_alert.dm | 4 ++-- code/game/machinery/computer/atmos_control.dm | 6 +++--- code/game/machinery/computer/medical.dm | 4 ++-- code/game/machinery/computer/robot.dm | 4 ++-- code/game/machinery/computer/security.dm | 4 ++-- code/game/machinery/computer/station_alert.dm | 6 +++--- code/game/machinery/cryo.dm | 10 +++++----- code/game/machinery/doors/airlock.dm | 4 ++-- .../machinery/doors/airlock_electronics.dm | 4 ++-- .../airlock_controllers.dm | 6 +++--- .../airlock_docking_controller.dm | 2 +- .../airlock_docking_controller_multi.dm | 4 ++-- .../embedded_controller_base.dm | 4 ++-- .../simple_docking_controller.dm | 2 +- .../excelsior/blackshield_teleporter.dm | 10 +++++----- .../game/machinery/excelsior/ex_teleporter.dm | 10 +++++----- code/game/machinery/excelsior/ex_turret.dm | 4 ++-- code/game/machinery/jukebox.dm | 4 ++-- code/game/machinery/kitchen/smartfridge.dm | 4 ++-- code/game/machinery/nuclear_bomb.dm | 4 ++-- code/game/machinery/portable_turret.dm | 4 ++-- code/game/machinery/requests_console.dm | 4 ++-- code/game/machinery/smelter.dm | 4 ++-- code/game/machinery/sorter.dm | 4 ++-- code/game/machinery/turret_control.dm | 6 +++--- code/game/machinery/vending.dm | 4 ++-- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_control_console.dm | 4 ++-- code/game/objects/items/boombox.dm | 4 ++-- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- code/game/objects/items/devices/aicard.dm | 4 ++-- code/game/objects/items/devices/hacktool.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 6 +++--- code/game/objects/items/devices/t_scanner.dm | 6 +++--- .../objects/items/devices/transfer_valve.dm | 4 ++-- code/game/objects/items/devices/uplink.dm | 4 ++-- .../items/weapons/cards_ids_syndicate.dm | 4 ++-- .../objects/items/weapons/storage/bsdm.dm | 6 +++--- .../game/objects/items/weapons/tanks/tanks.dm | 4 ++-- .../objects/items/weapons/tools/_tools.dm | 4 ++-- code/game/objects/objs.dm | 2 +- code/game/objects/structures/janicart.dm | 4 ++-- code/game/objects/structures/mirror.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 2 +- code/modules/assembly/signaler.dm | 4 ++-- .../biomatter_manipulation/biogenerator.dm | 4 ++-- .../bioreactor/console.dm | 4 ++-- code/modules/bs_snare/machinery.dm | 4 ++-- code/modules/clothing/clothing.dm | 4 ++-- .../spacesuits/rig/modules/computer.dm | 4 ++-- .../spacesuits/rig/modules/utility.dm | 6 +++--- code/modules/clothing/spacesuits/rig/rig.dm | 2 +- .../clothing/spacesuits/rig/rig_verbs.dm | 2 +- code/modules/core_implant/ritual_book.dm | 4 ++-- .../detectivework/microscope/dnascanner.dm | 4 ++-- code/modules/dungeons/junk_tractor_beam.dm | 4 ++-- code/modules/economy/Accounts_DB.dm | 4 ++-- .../genetics/machinery/genetics_analyzer.dm | 4 ++-- .../genetics/machinery/genetics_cloner.dm | 10 +++++----- code/modules/hydroponics/seed_machines.dm | 6 +++--- .../integrated_electronics/core/assemblies.dm | 8 ++++---- .../core/integrated_circuit.dm | 6 +++--- .../integrated_electronics/subtpes/smart.dm | 6 +++--- .../mob/living/carbon/human/appearance.dm | 2 +- .../mob/living/silicon/pai/software.dm | 8 ++++---- .../living/silicon/pai/software_modules.dm | 20 +++++++++---------- code/modules/mob/living/silicon/subsystems.dm | 4 ++-- .../modular_computers/NTNet/NTNet_relay.dm | 4 ++-- .../computers/modular_computer/core.dm | 8 ++++---- .../computers/modular_computer/interaction.dm | 4 ++-- .../computers/modular_computer/ui.dm | 4 ++-- .../modular_computers/file_system/program.dm | 8 ++++---- .../programs/antagonist/access_decrypter.dm | 2 +- .../file_system/programs/antagonist/dos.dm | 2 +- .../programs/antagonist/hacked_camera.dm | 2 +- .../programs/antagonist/revelation.dm | 2 +- .../file_system/programs/antagonist/uplink.dm | 2 +- .../file_system/programs/command/card.dm | 2 +- .../file_system/programs/command/comm.dm | 2 +- .../programs/engineering/alarm_monitor.dm | 2 +- .../programs/engineering/atmos_control.dm | 4 ++-- .../programs/engineering/power_monitor.dm | 2 +- .../programs/engineering/rcon_console.dm | 2 +- .../programs/engineering/shield_control.dm | 6 +++--- .../engineering/supermatter_monitor.dm | 2 +- .../programs/generic/audio_player.dm | 2 +- .../programs/generic/bounty_board.dm | 2 +- .../file_system/programs/generic/camera.dm | 2 +- .../programs/generic/coin_miner.dm | 2 +- .../programs/generic/configurator.dm | 2 +- .../programs/generic/crew_manifest.dm | 2 +- .../file_system/programs/generic/docks.dm | 2 +- .../programs/generic/drink_catalog.dm | 2 +- .../programs/generic/email_client.dm | 6 +++--- .../programs/generic/file_browser.dm | 2 +- .../file_system/programs/generic/game.dm | 4 ++-- .../file_system/programs/generic/library.dm | 2 +- .../programs/generic/news_browser.dm | 2 +- .../programs/generic/ntdownloader.dm | 2 +- .../programs/generic/ntnrc_client.dm | 2 +- .../programs/generic/nttransfer.dm | 2 +- .../file_system/programs/generic/records.dm | 6 +++--- .../file_system/programs/generic/reports.dm | 2 +- .../file_system/programs/generic/scanner.dm | 2 +- .../file_system/programs/generic/signaller.dm | 2 +- .../file_system/programs/generic/supply.dm | 2 +- .../file_system/programs/generic/taxes.dm | 2 +- .../file_system/programs/generic/trade.dm | 2 +- .../programs/generic/wordprocessor.dm | 2 +- .../programs/medical/chem_catalog.dm | 2 +- .../programs/medical/suit_sensors.dm | 2 +- .../programs/research/ai_restorer.dm | 2 +- .../programs/research/cyborg_remote.dm | 2 +- .../programs/research/email_administration.dm | 2 +- .../programs/research/ntmonitor.dm | 2 +- .../programs/security/digitalwarrant.dm | 2 +- .../programs/security/forceauthorization.dm | 2 +- .../hardware/scanners/scanner_atmos.dm | 2 +- .../hardware/scanners/scanner_medical.dm | 2 +- .../hardware/scanners/scanner_price.dm | 2 +- .../hardware/scanners/scanner_reagent.dm | 2 +- .../modular_computers/laptop_vendor.dm | 4 ++-- code/modules/nano/modules/alarm_monitor.dm | 2 +- .../nano/modules/catalog_all_entries.dm | 2 +- code/modules/nano/modules/crew_monitor.dm | 2 +- code/modules/nano/modules/human_appearance.dm | 2 +- code/modules/nano/modules/law_manager.dm | 2 +- code/modules/nano/modules/power_monitor.dm | 2 +- code/modules/nano/modules/rcon.dm | 2 +- code/modules/nano/nanoexternal.dm | 8 ++++---- code/modules/nano/nanoui.dm | 2 +- code/modules/organs/internal/carrion.dm | 4 ++-- .../overmap/ships/computers/engine_control.dm | 4 ++-- code/modules/overmap/ships/computers/helm.dm | 8 ++++---- .../overmap/ships/computers/sensors.dm | 4 ++-- .../overmap/ships/computers/shuttle.dm | 2 +- code/modules/power/apc.dm | 4 ++-- code/modules/power/diesel_gen.dm | 6 +++--- code/modules/power/generator.dm | 4 ++-- code/modules/power/hydroelectric.dm | 4 ++-- code/modules/power/port_gen.dm | 4 ++-- .../power/sensors/sensor_monitoring.dm | 6 +++--- code/modules/power/smes.dm | 4 ++-- code/modules/power/supermatter/supermatter.dm | 6 +++--- code/modules/projectiles/gun_hud_actions.dm | 4 ++-- code/modules/reagents/machinery/centrifuge.dm | 8 ++++---- .../reagents/machinery/chem_dispenser.dm | 4 ++-- .../modules/reagents/machinery/chem_heater.dm | 4 ++-- .../reagents/machinery/electrolyzer.dm | 10 +++++----- code/modules/reagents/machinery/grinder.dm | 6 +++--- code/modules/research/rdconsole.dm | 4 ++-- .../machinery/geosample_scanner.dm | 4 ++-- .../security levels/keycard authentication.dm | 4 ++-- .../shield_generators/shield_generator.dm | 6 +++--- code/modules/shuttles/escape_pods.dm | 4 ++-- code/modules/shuttles/shuttle_console.dm | 4 ++-- code/modules/shuttles/shuttle_emergency.dm | 2 +- code/modules/surgery/autodoc.dm | 2 +- code/modules/surgery/organic.dm | 2 +- code/modules/surgery/robotic.dm | 2 +- code/modules/surgery/surgery.dm | 4 ++-- code/modules/surgery/surgery_ui.dm | 2 +- .../synthesized_instruments/echo_editor.dm | 2 +- .../synthesized_instruments/env_editor.dm | 2 +- .../real_instruments.dm | 16 +++++++-------- .../synthesized_instruments/song_editor.dm | 2 +- .../synthesized_instruments/usage_info.dm | 2 +- code/modules/telesci/telesci_computer.dm | 6 +++--- code/modules/virus2/centrifuge.dm | 4 ++-- code/modules/virus2/diseasesplicer.dm | 4 ++-- code/modules/virus2/dishincubator.dm | 4 ++-- code/modules/virus2/isolator.dm | 4 ++-- oldcode/shuttles_old/old_escape_pods.dm | 4 ++-- oldcode/shuttles_old/old_shuttle_console.dm | 4 ++-- 199 files changed, 399 insertions(+), 399 deletions(-) diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index 5de6d3c0184..70d3ebbec16 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -187,10 +187,10 @@ to_chat(user, SPAN_WARNING("Access denied.")) return usr.set_machine(src) - ui_interact(user) + nano_ui_interact(user) return -/obj/machinery/atmospherics/binary/passive_gate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/binary/passive_gate/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(stat & (BROKEN|NOPOWER)) return diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 991f0d454ec..e641d2b3837 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -117,7 +117,7 @@ Thus, the two variables affect pump operation are set in New(): return 1 -/obj/machinery/atmospherics/binary/pump/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/binary/pump/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(stat & (BROKEN|NOPOWER)) return @@ -189,7 +189,7 @@ Thus, the two variables affect pump operation are set in New(): to_chat(user, SPAN_WARNING("Access denied.")) return usr.set_machine(src) - ui_interact(user) + nano_ui_interact(user) return /obj/machinery/atmospherics/binary/pump/Topic(href, href_list) diff --git a/code/ATMOSPHERICS/components/omni_devices/filter.dm b/code/ATMOSPHERICS/components/omni_devices/filter.dm index e54fde98c43..ec3975792f1 100644 --- a/code/ATMOSPHERICS/components/omni_devices/filter.dm +++ b/code/ATMOSPHERICS/components/omni_devices/filter.dm @@ -85,7 +85,7 @@ return 1 -/obj/machinery/atmospherics/omni/filter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/omni/filter/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) user.set_machine(src) var/list/data = ui_data() diff --git a/code/ATMOSPHERICS/components/omni_devices/mixer.dm b/code/ATMOSPHERICS/components/omni_devices/mixer.dm index c5796e103d5..4804eae37ce 100644 --- a/code/ATMOSPHERICS/components/omni_devices/mixer.dm +++ b/code/ATMOSPHERICS/components/omni_devices/mixer.dm @@ -123,7 +123,7 @@ return 1 -/obj/machinery/atmospherics/omni/mixer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/omni/mixer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) usr.set_machine(src) var/list/data = new() diff --git a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm index 4cec4a041d9..28867a46d92 100644 --- a/code/ATMOSPHERICS/components/omni_devices/omni_base.dm +++ b/code/ATMOSPHERICS/components/omni_devices/omni_base.dm @@ -105,7 +105,7 @@ return src.add_fingerprint(usr) - ui_interact(user) + nano_ui_interact(user) return /obj/machinery/atmospherics/omni/proc/build_icons() diff --git a/code/ATMOSPHERICS/components/unary/cold_sink.dm b/code/ATMOSPHERICS/components/unary/cold_sink.dm index ebdaa9fb7a2..f70fb863e9d 100644 --- a/code/ATMOSPHERICS/components/unary/cold_sink.dm +++ b/code/ATMOSPHERICS/components/unary/cold_sink.dm @@ -55,9 +55,9 @@ return /obj/machinery/atmospherics/unary/freezer/attack_hand(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/atmospherics/unary/freezer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/unary/freezer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/data[0] data["on"] = use_power ? 1 : 0 diff --git a/code/ATMOSPHERICS/components/unary/heat_source.dm b/code/ATMOSPHERICS/components/unary/heat_source.dm index d3421e4ce4c..6fe932a4616 100644 --- a/code/ATMOSPHERICS/components/unary/heat_source.dm +++ b/code/ATMOSPHERICS/components/unary/heat_source.dm @@ -78,9 +78,9 @@ update_icon() /obj/machinery/atmospherics/unary/heater/attack_hand(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/atmospherics/unary/heater/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/unary/heater/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/data[0] data["on"] = use_power ? 1 : 0 diff --git a/code/__DEFINES/nanoui.dm b/code/__DEFINES/nanoui.dm index 0bf9a965b95..428c237458b 100644 --- a/code/__DEFINES/nanoui.dm +++ b/code/__DEFINES/nanoui.dm @@ -1,4 +1,4 @@ -// Argument passed to the force_open parameter on things such as ui_interact. +// Argument passed to the force_open parameter on things such as nano_ui_interact. #define NANOUI_UPDATE 0 // Simply update the UI. #define NANOUI_REINITIALIZE 1 // Re-initialize the UI without closing the window. #define NANOUI_FOCUS 2 // Update the UI and focus it to move it to top. diff --git a/code/datums/craft/menu.dm b/code/datums/craft/menu.dm index d3abb680ee1..437cfb9af3b 100644 --- a/code/datums/craft/menu.dm +++ b/code/datums/craft/menu.dm @@ -12,7 +12,7 @@ if(!CM) CM = new(src) CM.set_category(category, src) - CM.ui_interact(src) + CM.nano_ui_interact(src) /datum/nano_module/craft name = "Craft menu" @@ -37,7 +37,7 @@ /datum/nano_module/craft/proc/set_item(item_ref, mob/mob) SScraft.current_item[mob.ckey] = locate(item_ref) -/datum/nano_module/craft/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/datum/nano_module/craft/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) if(!usr) return if(usr.incapacitated()) diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index cf324fba1ea..34bc779093e 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -287,19 +287,19 @@ /obj/machinery/computer/scan_consolenew/attack_ai(user as mob) src.add_hiddenprint(user) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/scan_consolenew/attack_hand(user as mob) if(!usr.stats?.getPerk(PERK_SI_SCI) && !usr.stat_check(STAT_COG, 80)) //Again outdated tech to_chat(usr, SPAN_WARNING("This is a bit beyond your cognitive understanding.")) return if(!..()) - ui_interact(user) + nano_ui_interact(user) /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") @@ -307,7 +307,7 @@ * * @return nothing */ -/obj/machinery/computer/scan_consolenew/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/scan_consolenew/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(user == connected.occupant || user.stat) return diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index df807692410..6d225d54af7 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -113,9 +113,9 @@ if(..()) return 1 - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/sleeper/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) +/obj/machinery/sleeper/nano_ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) var/data[0] data["power"] = stat & (NOPOWER|BROKEN) ? 0 : 1 diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index cb1b9725ed3..a3d9da97db7 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -402,7 +402,7 @@ to_chat(usr, "Air Alarm mode changed to Filtering.") for(var/device_id in alarm_area.air_scrub_names) send_signal(device_id, list("power"= 0) ) - + for(var/device_id in alarm_area.air_vent_names) send_signal(device_id, list("power"= 0) ) @@ -410,12 +410,12 @@ if(mode == AALARM_MODE_PANIC) to_chat(usr, "Air Alarm mode changed to Panic.") for(var/device_id in alarm_area.air_scrub_names) - send_signal(device_id, list("power"= 1, "panic_siphon"= 1) ) + send_signal(device_id, list("power"= 1, "panic_siphon"= 1) ) else to_chat(usr, "Air Alarm mode changed to Cycle.") for(var/device_id in alarm_area.air_scrub_names) send_signal(device_id, list("power"= 1, "co2_scrub"= 1, "scrubbing"= 1, "panic_siphon"= 0) ) - + for(var/device_id in alarm_area.air_vent_names) send_signal(device_id, list("power"= 1, "checks"= "default", "set_external_pressure"= "default") ) @@ -467,7 +467,7 @@ frequency.post_signal(src, alert_signal) /obj/machinery/alarm/attack_ai(mob/user) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/alarm/attack_hand(mob/user) . = ..() @@ -476,10 +476,10 @@ return interact(user) /obj/machinery/alarm/interact(mob/user) - ui_interact(user) + nano_ui_interact(user) wires.Interact(user) -/obj/machinery/alarm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) +/obj/machinery/alarm/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) var/data[0] var/remote_connection = 0 var/remote_access = 0 @@ -980,7 +980,7 @@ FIRE ALARM . = ..() if (.) return - return ui_interact(user) + return nano_ui_interact(user) /obj/machinery/firealarm/bullet_act() return src.alarm() @@ -1109,7 +1109,7 @@ FIRE ALARM spawn(rand(0,15)) update_icon() -/obj/machinery/firealarm/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.outside_state) +/obj/machinery/firealarm/nano_ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.outside_state) var/data[0] var/decl/security_state/security_state = decls_repository.get_decl(GLOB.maps_data.security_state) diff --git a/code/game/machinery/atmoalter/canister.dm b/code/game/machinery/atmoalter/canister.dm index 5657367a546..454199d215e 100644 --- a/code/game/machinery/atmoalter/canister.dm +++ b/code/game/machinery/atmoalter/canister.dm @@ -284,9 +284,9 @@ update_flag return src.attack_hand(user) /obj/machinery/portable_atmospherics/canister/attack_hand(var/mob/user as mob) - return src.ui_interact(user) + return src.nano_ui_interact(user) -/obj/machinery/portable_atmospherics/canister/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/portable_atmospherics/canister/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if (src.destroyed) return diff --git a/code/game/machinery/atmoalter/pump.dm b/code/game/machinery/atmoalter/pump.dm index e6f5f64005a..b686fea9b1c 100644 --- a/code/game/machinery/atmoalter/pump.dm +++ b/code/game/machinery/atmoalter/pump.dm @@ -119,9 +119,9 @@ return src.attack_hand(user) /obj/machinery/portable_atmospherics/powered/pump/attack_hand(var/mob/user) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/portable_atmospherics/powered/pump/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS) +/obj/machinery/portable_atmospherics/powered/pump/nano_ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS) var/list/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 a1af03cf605..7e65738f756 100644 --- a/code/game/machinery/atmoalter/scrubber.dm +++ b/code/game/machinery/atmoalter/scrubber.dm @@ -95,10 +95,10 @@ return src.attack_hand(user) /obj/machinery/portable_atmospherics/powered/scrubber/attack_hand(var/mob/user) - ui_interact(user) + nano_ui_interact(user) return -/obj/machinery/portable_atmospherics/powered/scrubber/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS) +/obj/machinery/portable_atmospherics/powered/scrubber/nano_ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS) var/list/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/autodoc.dm b/code/game/machinery/autodoc.dm index ba1281c70d0..0510a440f44 100644 --- a/code/game/machinery/autodoc.dm +++ b/code/game/machinery/autodoc.dm @@ -86,7 +86,7 @@ return else autodoc_processor.set_patient(L) - ui_interact(L) + nano_ui_interact(L) update_use_power(2) L.set_machine(src) update_icon() @@ -136,8 +136,8 @@ locked = autodoc_processor.active update_icon() -/obj/machinery/autodoc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FORCE_OPEN, var/datum/topic_state/state = GLOB.default_state) - autodoc_processor.ui_interact(user, ui_key, ui, force_open, state) +/obj/machinery/autodoc/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FORCE_OPEN, var/datum/topic_state/state = GLOB.default_state) + autodoc_processor.nano_ui_interact(user, ui_key, ui, force_open, state) /obj/machinery/autodoc/Topic(href, href_list) return autodoc_processor.Topic(href, href_list) diff --git a/code/game/machinery/autodoc_excelsior.dm b/code/game/machinery/autodoc_excelsior.dm index b8ee3f05d72..69bb6dc4208 100644 --- a/code/game/machinery/autodoc_excelsior.dm +++ b/code/game/machinery/autodoc_excelsior.dm @@ -145,7 +145,7 @@ if(!cover_closed) close_cover() - ui_interact(user) + nano_ui_interact(user) /obj/machinery/excelsior_autodoc/affect_grab(mob/user, mob/target) if (occupant) @@ -193,8 +193,8 @@ autodoc_processor.stop() update_icon() -/obj/machinery/excelsior_autodoc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FORCE_OPEN, datum/topic_state/state = GLOB.default_state) - autodoc_processor.ui_interact(user, ui_key, ui, force_open, state) +/obj/machinery/excelsior_autodoc/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FORCE_OPEN, datum/topic_state/state = GLOB.default_state) + autodoc_processor.nano_ui_interact(user, ui_key, ui, force_open, state) /obj/machinery/excelsior_autodoc/Topic(href, href_list) return autodoc_processor.Topic(href, href_list) diff --git a/code/game/machinery/autolathe/artist_bench.dm b/code/game/machinery/autolathe/artist_bench.dm index 796c4fbb458..0eb965c92b4 100644 --- a/code/game/machinery/autolathe/artist_bench.dm +++ b/code/game/machinery/autolathe/artist_bench.dm @@ -43,7 +43,7 @@ return data -/obj/machinery/autolathe/artist_bench/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui, force_open = NANOUI_FOCUS) +/obj/machinery/autolathe/artist_bench/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui, force_open = NANOUI_FOCUS) var/list/data = ui_data(user, ui_key) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/autolathe/autolathe.dm b/code/game/machinery/autolathe/autolathe.dm index 5a05bdbc1f3..3d84509a6c7 100644 --- a/code/game/machinery/autolathe/autolathe.dm +++ b/code/game/machinery/autolathe/autolathe.dm @@ -205,7 +205,7 @@ return data -/obj/machinery/autolathe/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/autolathe/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/data = ui_data(user, ui_key) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -250,7 +250,7 @@ return user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/autolathe/attack_hand(mob/user) @@ -258,7 +258,7 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) wires.Interact(user) /obj/machinery/autolathe/Topic(href, href_list) diff --git a/code/game/machinery/autolathe/fabricators.dm b/code/game/machinery/autolathe/fabricators.dm index 13b67984225..cb44954d17d 100644 --- a/code/game/machinery/autolathe/fabricators.dm +++ b/code/game/machinery/autolathe/fabricators.dm @@ -270,7 +270,7 @@ update_icon() return -/obj/machinery/bulletfabricator/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) +/obj/machinery/bulletfabricator/nano_ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) user.set_machine(src) var/list/data = list() data["points"] = points @@ -316,7 +316,7 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/bulletfabricator/proc/activate() if (usr.stat) diff --git a/code/game/machinery/autolathe/matterforge.dm b/code/game/machinery/autolathe/matterforge.dm index b16cd183506..ad446cee761 100644 --- a/code/game/machinery/autolathe/matterforge.dm +++ b/code/game/machinery/autolathe/matterforge.dm @@ -153,7 +153,7 @@ return data -/obj/machinery/matter_nanoforge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/matter_nanoforge/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/data = ui_data(user, ui_key) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -182,7 +182,7 @@ user.set_machine(src) if(!design_list?.len) get_designs() - ui_interact(user) + nano_ui_interact(user) /obj/machinery/matter_nanoforge/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/autolathe/mechfab.dm b/code/game/machinery/autolathe/mechfab.dm index 5ee5e72ba3b..c9194ae70ba 100644 --- a/code/game/machinery/autolathe/mechfab.dm +++ b/code/game/machinery/autolathe/mechfab.dm @@ -39,7 +39,7 @@ return design_files -/obj/machinery/autolathe/mechfab/ui_interact() +/obj/machinery/autolathe/mechfab/nano_ui_interact() if(!categories) update_categories() ..() diff --git a/code/game/machinery/autolathe/nanite_reconstitution_apparatus.dm b/code/game/machinery/autolathe/nanite_reconstitution_apparatus.dm index 3c32d9f5982..cadc8aa105d 100644 --- a/code/game/machinery/autolathe/nanite_reconstitution_apparatus.dm +++ b/code/game/machinery/autolathe/nanite_reconstitution_apparatus.dm @@ -112,7 +112,7 @@ return data -/obj/machinery/nanite_reconstitution_apparatus/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) //Calls specific templates for the UI +/obj/machinery/nanite_reconstitution_apparatus/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) //Calls specific templates for the UI var/list/data = ui_data(user, ui_key) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -304,7 +304,7 @@ flick("d_analyzer_la", src) addtimer(CALLBACK(src, .proc/reset_busy), 1 SECONDS) user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) else to_chat(user, SPAN_NOTICE("\the [I] is not designed for this!")) @@ -313,7 +313,7 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/nanite_reconstitution_apparatus/proc/insert_beaker(mob/living/user, obj/item/reagent_containers/glass/beaker) if(!beaker && istype(user)) diff --git a/code/game/machinery/autolathe_disk_cloner.dm b/code/game/machinery/autolathe_disk_cloner.dm index 9516f92a912..8f7df1268ed 100755 --- a/code/game/machinery/autolathe_disk_cloner.dm +++ b/code/game/machinery/autolathe_disk_cloner.dm @@ -63,7 +63,7 @@ to_chat(user, SPAN_NOTICE("[src]'s slots is full.")) user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) update_icon() @@ -91,7 +91,7 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) update_icon() @@ -112,7 +112,7 @@ return data -/obj/machinery/autolathe_disk_cloner/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/autolathe_disk_cloner/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index ef7ccc9292f..1cc62d3e32d 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -150,7 +150,7 @@ update_icon() return -/obj/machinery/biogenerator/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) +/obj/machinery/biogenerator/nano_ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.outside_state) user.set_machine(src) var/list/data = list() data["points"] = points @@ -196,7 +196,7 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/biogenerator/proc/activate() if (usr.stat) diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index c1f02c59392..bb09dede1e2 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -23,9 +23,9 @@ var/global/list/minor_air_alarms = list() /obj/machinery/computer/atmos_alert/attack_hand(mob/user) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/atmos_alert/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/atmos_alert/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/major_alarms[0] var/minor_alarms[0] diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index b06acaef7c5..17b7d66ecac 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -27,7 +27,7 @@ /obj/machinery/computer/atmoscontrol/attack_hand(mob/user) if(..()) return 1 - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/atmoscontrol/emag_act(var/remaining_carges, var/mob/user) if(!emagged) @@ -37,7 +37,7 @@ atmos_control.emagged = 1 return 1 -/obj/machinery/computer/atmoscontrol/ui_interact(var/mob/user) +/obj/machinery/computer/atmoscontrol/nano_ui_interact(var/mob/user) if(!atmos_control) atmos_control = new(src, req_access, req_one_access, monitored_alarm_ids) - atmos_control.ui_interact(user) + atmos_control.nano_ui_interact(user) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index e22e5027232..f09d6ba4a72 100755 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -46,9 +46,9 @@ /obj/machinery/computer/med_data/attack_hand(mob/user as mob) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/med_data/ui_interact(mob/user) +/obj/machinery/computer/med_data/nano_ui_interact(mob/user) var/dat if (src.temp) dat = text("[src.temp]

Clear Screen") diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 36fe743822b..b24c17f0310 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -13,9 +13,9 @@ /obj/machinery/computer/robotics/attack_hand(var/mob/user as mob) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/robotics/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/robotics/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["robots"] = get_cyborgs(user) data["safety"] = safety diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index f1af6de5857..5046463d2f6 100755 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -51,9 +51,9 @@ /obj/machinery/computer/secure_data/attack_hand(mob/user as mob) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/secure_data/ui_interact(user) +/obj/machinery/computer/secure_data/nano_ui_interact(user) if (src.z > 6) to_chat(user, "Unable to establish a connection: You're too far away from the station!") return diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index c3b3f952ffe..caad8107961 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -45,11 +45,11 @@ /obj/machinery/computer/station_alert/attack_hand(mob/user) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/station_alert/ui_interact(mob/user) +/obj/machinery/computer/station_alert/nano_ui_interact(mob/user) if(alarm_monitor) - alarm_monitor.ui_interact(user) + alarm_monitor.nano_ui_interact(user) /obj/machinery/computer/station_alert/nano_container() return alarm_monitor diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 78978570922..6ebbcafc94b 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -72,12 +72,12 @@ if(!user.stats?.getPerk(PERK_MEDICAL_EXPERT) && !user.stat_check(STAT_BIO, STAT_LEVEL_BASIC) && !usr.stat_check(STAT_COG, 30)) //Are we missing the perk AND to low on bio? Cog needs 30 as bio is 15 to_chat(usr, SPAN_WARNING("Your biological understanding isn't enough to use this.")) return - ui_interact(user) + nano_ui_interact(user) /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") @@ -85,7 +85,7 @@ * * @return nothing */ -/obj/machinery/atmospherics/unary/cryo_cell/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/atmospherics/unary/cryo_cell/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(user == occupant || user.stat) return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 098f29069ef..0297b4c9a1f 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -758,9 +758,9 @@ There are 9 wires. return /obj/machinery/door/airlock/attack_ai(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/door/airlock/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/obj/machinery/door/airlock/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.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/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 1d669d5b0a7..869d66aab88 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -19,10 +19,10 @@ if (!ishuman(user) && !istype(user,/mob/living/silicon/robot)) return ..(user) - ui_interact(user) + nano_ui_interact(user) -/obj/item/airlock_electronics/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = GLOB.hands_state) +/obj/item/airlock_electronics/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = GLOB.hands_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/embedded_controller/airlock_controllers.dm b/code/game/machinery/embedded_controller/airlock_controllers.dm index 1f079968706..a86927cecbc 100644 --- a/code/game/machinery/embedded_controller/airlock_controllers.dm +++ b/code/game/machinery/embedded_controller/airlock_controllers.dm @@ -20,7 +20,7 @@ /obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller name = "Advanced Airlock Controller" -/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/airlock/advanced_airlock_controller/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( @@ -63,7 +63,7 @@ name = "Airlock Controller" tag_secure = 1 -/obj/machinery/embedded_controller/radio/airlock/airlock_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/airlock/airlock_controller/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( @@ -117,7 +117,7 @@ else icon_state = "access_control_off" -/obj/machinery/embedded_controller/radio/airlock/access_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/airlock/access_controller/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller.dm b/code/game/machinery/embedded_controller/airlock_docking_controller.dm index 4e3a3aa87be..e567d49a32d 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller.dm @@ -11,7 +11,7 @@ docking_program = new/datum/computer/file/embedded_program/docking/airlock(src, airlock_program) program = docking_program -/obj/machinery/embedded_controller/radio/airlock/docking_port/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/airlock/docking_port/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( diff --git a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm index 4fc283195b5..e84ac8ef5c3 100644 --- a/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm +++ b/code/game/machinery/embedded_controller/airlock_docking_controller_multi.dm @@ -24,7 +24,7 @@ child_names[tags[i]] = names[i] -/obj/machinery/embedded_controller/radio/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/docking_port_multi/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/list/airlocks[child_names.len] @@ -62,7 +62,7 @@ airlock_program = new/datum/computer/file/embedded_program/airlock/multi_docking(src) program = airlock_program -/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/airlock/docking_port_multi/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( diff --git a/code/game/machinery/embedded_controller/embedded_controller_base.dm b/code/game/machinery/embedded_controller/embedded_controller_base.dm index 6ce8608889a..1bd6ff623b8 100644 --- a/code/game/machinery/embedded_controller/embedded_controller_base.dm +++ b/code/game/machinery/embedded_controller/embedded_controller_base.dm @@ -34,9 +34,9 @@ obj/machinery/embedded_controller/radio/Destroy() if(!user.IsAdvancedToolUser()) return 0 - src.ui_interact(user) + src.nano_ui_interact(user) -/obj/machinery/embedded_controller/ui_interact() +/obj/machinery/embedded_controller/nano_ui_interact() return /obj/machinery/embedded_controller/radio diff --git a/code/game/machinery/embedded_controller/simple_docking_controller.dm b/code/game/machinery/embedded_controller/simple_docking_controller.dm index 534b4c2d731..1bdda10b1c8 100644 --- a/code/game/machinery/embedded_controller/simple_docking_controller.dm +++ b/code/game/machinery/embedded_controller/simple_docking_controller.dm @@ -10,7 +10,7 @@ docking_program = new progtype(src) program = docking_program -/obj/machinery/embedded_controller/radio/simple_docking_controller/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/simple_docking_controller/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( diff --git a/code/game/machinery/excelsior/blackshield_teleporter.dm b/code/game/machinery/excelsior/blackshield_teleporter.dm index a0767eeb619..05f1bbcbe08 100644 --- a/code/game/machinery/excelsior/blackshield_teleporter.dm +++ b/code/game/machinery/excelsior/blackshield_teleporter.dm @@ -127,16 +127,16 @@ var/global/blackshield_max_energy //Maximaum combined energy of all teleporters return /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") * * @return nothing */ -/obj/machinery/blackshield_teleporter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/blackshield_teleporter/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(stat & (BROKEN|NOPOWER)) return if(user.stat || user.restrained()) return @@ -269,4 +269,4 @@ var/global/blackshield_max_energy //Maximaum combined energy of all teleporters if(stat & BROKEN) return current_user = user - ui_interact(user) \ No newline at end of file + nano_ui_interact(user) \ No newline at end of file diff --git a/code/game/machinery/excelsior/ex_teleporter.dm b/code/game/machinery/excelsior/ex_teleporter.dm index 40bc3f08b77..b64d1022a39 100644 --- a/code/game/machinery/excelsior/ex_teleporter.dm +++ b/code/game/machinery/excelsior/ex_teleporter.dm @@ -162,16 +162,16 @@ var/global/excelsior_last_draft = 0 return /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") * * @return nothing */ -/obj/machinery/complant_teleporter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/complant_teleporter/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(stat & (BROKEN|NOPOWER)) return if(user.stat || user.restrained()) return @@ -310,7 +310,7 @@ var/global/excelsior_last_draft = 0 if(stat & BROKEN) return current_user = user - ui_interact(user) + nano_ui_interact(user) /obj/machinery/complant_teleporter/affect_grab(var/mob/user, var/mob/target) try_put_inside(target, user) diff --git a/code/game/machinery/excelsior/ex_turret.dm b/code/game/machinery/excelsior/ex_turret.dm index 71e22f5b42e..2dd6d0ea4f1 100644 --- a/code/game/machinery/excelsior/ex_turret.dm +++ b/code/game/machinery/excelsior/ex_turret.dm @@ -48,7 +48,7 @@ return 0 return 1 -/obj/machinery/porta_turret/excelsior/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/porta_turret/excelsior/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked @@ -203,7 +203,7 @@ return 0 return 1 -/obj/machinery/porta_turret/artificer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/porta_turret/artificer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/jukebox.dm b/code/game/machinery/jukebox.dm index 97d2746e8ce..3d08693b353 100644 --- a/code/game/machinery/jukebox.dm +++ b/code/game/machinery/jukebox.dm @@ -260,9 +260,9 @@ if(inoperable()) to_chat(usr, "\The [src] doesn't appear to function.") return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/media/jukebox/ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/media/jukebox/nano_ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1) var/title = "RetroBox - Space Style" var/data[0] diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index b5c099d4a55..41a3a03e59a 100755 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -355,7 +355,7 @@ if(stat & (NOPOWER|BROKEN)) return wires.Interact(user) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/smartfridge/proc/update_contents() @@ -366,7 +366,7 @@ * SmartFridge Menu ********************/ -/obj/machinery/smartfridge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/smartfridge/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/code/game/machinery/nuclear_bomb.dm b/code/game/machinery/nuclear_bomb.dm index 3c62091389e..d792ec0b1b0 100644 --- a/code/game/machinery/nuclear_bomb.dm +++ b/code/game/machinery/nuclear_bomb.dm @@ -148,7 +148,7 @@ var/bomb_set if (panel_open) wires.Interact(user) else - ui_interact(user) + nano_ui_interact(user) else if (deployable) if(removal_stage < 5) src.anchored = 1 @@ -161,7 +161,7 @@ var/bomb_set update_icon() return -/obj/machinery/nuclearbomb/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/nuclearbomb/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["hacking"] = 0 data["auth"] = is_auth(user) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index ae34499cd61..22cfd309d2a 100755 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -214,9 +214,9 @@ var/list/turret_icons if(isLocked(user)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/porta_turret/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/porta_turret/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["access"] = !isLocked(user) data["locked"] = locked diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index e64d3bd6aa4..3caf2d1ed00 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -101,9 +101,9 @@ var/list/obj/machinery/requests_console/allConsoles = list() /obj/machinery/requests_console/attack_hand(user as mob) if(..(user)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/requests_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/requests_console/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["department"] = department diff --git a/code/game/machinery/smelter.dm b/code/game/machinery/smelter.dm index 3a2d85f9072..80663f03eaf 100644 --- a/code/game/machinery/smelter.dm +++ b/code/game/machinery/smelter.dm @@ -216,7 +216,7 @@ /obj/machinery/smelter/attack_hand(mob/user as mob) - return ui_interact(user) + return nano_ui_interact(user) /obj/machinery/smelter/ui_data() @@ -235,7 +235,7 @@ return data -/obj/machinery/smelter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/smelter/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/sorter.dm b/code/game/machinery/sorter.dm index e9e3313f6ce..ea9670e8ad4 100644 --- a/code/game/machinery/sorter.dm +++ b/code/game/machinery/sorter.dm @@ -192,7 +192,7 @@ ..() /obj/machinery/sorter/attack_hand(mob/user as mob) - return ui_interact(user) + return nano_ui_interact(user) //UI @@ -224,7 +224,7 @@ return data -/obj/machinery/sorter/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/obj/machinery/sorter/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 27a692eda89..f5fa1fa3c3a 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -125,15 +125,15 @@ if(isLocked(user)) return - ui_interact(user) + nano_ui_interact(user) /obj/machinery/turretid/attack_hand(mob/user as mob) if(isLocked(user)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/turretid/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/turretid/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) 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 702bace9145..020d31d4982 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -564,14 +564,14 @@ return wires.Interact(user) - ui_interact(user) + nano_ui_interact(user) /** * Display the NanoUI window for the vending machine. * * See NanoUI documentation for details. */ -/obj/machinery/vending/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/vending/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/list/data = list() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index c0e755cb632..8d2bd159cb5 100755 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -404,7 +404,7 @@ target.attack_hand(src.occupant) return 1 if(istype(target, /obj/machinery/embedded_controller)) - target.ui_interact(src.occupant) + target.nano_ui_interact(src.occupant) return 1 return 0 diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index bd91f81d329..e96130e6ef8 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -16,7 +16,7 @@ /obj/machinery/computer/mecha/attack_hand(var/mob/user as mob) if(..()) return - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/mecha/Topic(href, href_list)// TODO: fix everything if(..()) @@ -50,7 +50,7 @@ src.visible_message("\The [src] spits out a piece of paper.") //I have no idea what im doing -/obj/machinery/computer/mecha/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/obj/machinery/computer/mecha/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(..()) return user.set_machine(src) diff --git a/code/game/objects/items/boombox.dm b/code/game/objects/items/boombox.dm index d895f3808a0..d94b9bdd5d3 100644 --- a/code/game/objects/items/boombox.dm +++ b/code/game/objects/items/boombox.dm @@ -152,9 +152,9 @@ return 1 /obj/item/media/boombox/attack_self(mob/user) - ui_interact(user) + nano_ui_interact(user) -/obj/item/media/boombox/ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/item/media/boombox/nano_ui_interact(mob/user, ui_key = "jukebox", var/datum/nanoui/ui = null, var/force_open = 1) var/title = "Boombox - Space Style" var/data[0] diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 1af851af5ab..f3194aea5c6 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -319,7 +319,7 @@ var/global/list/obj/item/device/pda/PDAs = list() return ..() -/obj/item/device/pda/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/pda/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) ui_tick++ var/datum/nanoui/old_ui = SSnano.get_open_ui(user, src, "main") var/auto_update = 1 @@ -522,7 +522,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(active_uplink_check(user)) return - ui_interact(user) //NanoUI requires this proc + nano_ui_interact(user) //NanoUI requires this proc return /obj/item/device/pda/Topic(href, href_list) diff --git a/code/game/objects/items/devices/aicard.dm b/code/game/objects/items/devices/aicard.dm index 195a57ad1b6..9908296643f 100644 --- a/code/game/objects/items/devices/aicard.dm +++ b/code/game/objects/items/devices/aicard.dm @@ -19,9 +19,9 @@ /obj/item/device/aicard/attack_self(mob/user) - ui_interact(user) + nano_ui_interact(user) -/obj/item/device/aicard/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.inventory_state) +/obj/item/device/aicard/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state =GLOB.inventory_state) var/data[0] data["has_ai"] = carded_ai != null if(carded_ai) diff --git a/code/game/objects/items/devices/hacktool.dm b/code/game/objects/items/devices/hacktool.dm index f9202290f42..8609f85da8a 100644 --- a/code/game/objects/items/devices/hacktool.dm +++ b/code/game/objects/items/devices/hacktool.dm @@ -40,7 +40,7 @@ if(!attempt_hack(user, A)) return 0 - A.ui_interact(user, state = hack_state) + A.nano_ui_interact(user, state = hack_state) return 1 /obj/item/tool/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 9d82e43fdac..0a1a1e24239 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -110,9 +110,9 @@ var/global/list/default_medbay_channels = list( if(b_stat) wires.Interact(user) - return ui_interact(user) + return nano_ui_interact(user) -/obj/item/device/radio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/radio/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["mic_status"] = broadcasting @@ -720,7 +720,7 @@ var/global/list/default_medbay_channels = list( . = ..() -/obj/item/device/radio/borg/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/radio/borg/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["mic_status"] = broadcasting diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm index 5b3c1b1d39b..57ca6a37286 100644 --- a/code/game/objects/items/devices/t_scanner.dm +++ b/code/game/objects/items/devices/t_scanner.dm @@ -204,7 +204,7 @@ are technically visible but obscured, for example by catwalks or trash sitting o ***************************************/ /obj/item/device/t_scanner/attack_self(mob/user) set_user(user) - ui_interact(user) + nano_ui_interact(user) //set_enabled(!enabled) /obj/item/device/t_scanner/New() @@ -220,7 +220,7 @@ are technically visible but obscured, for example by catwalks or trash sitting o if (loc == M) set_enabled(!enabled) -/obj/item/device/t_scanner/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/t_scanner/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/data[0] data["enabled"] = enabled ? 1 : 0 @@ -256,7 +256,7 @@ are technically visible but obscured, for example by catwalks or trash sitting o playsound(loc, 'sound/machines/machine_switch.ogg', 40, 1, -2) add_fingerprint(usr) spawn() - ui_interact(usr) + nano_ui_interact(usr) /obj/item/device/t_scanner/examine(var/mob/user) diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index 92c841af418..59ce9fab1bc 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -67,9 +67,9 @@ /obj/item/device/transfer_valve/attack_self(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) -/obj/item/device/transfer_valve/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/transfer_valve/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/data[0] diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 2178058bb0f..f3acffba294 100755 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -114,7 +114,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid /* NANO UI FOR UPLINK WOOP WOOP */ -/obj/item/device/uplink/hidden/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/uplink/hidden/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/title = "Remote Uplink" var/data[0] @@ -138,7 +138,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button. /obj/item/device/uplink/interact(mob/user) - ui_interact(user) + nano_ui_interact(user) // The purchasing code. /obj/item/device/uplink/hidden/Topic(href, href_list) diff --git a/code/game/objects/items/weapons/cards_ids_syndicate.dm b/code/game/objects/items/weapons/cards_ids_syndicate.dm index 8a401940257..08d4e490e25 100644 --- a/code/game/objects/items/weapons/cards_ids_syndicate.dm +++ b/code/game/objects/items/weapons/cards_ids_syndicate.dm @@ -32,13 +32,13 @@ if(registered_user == user) switch(alert("Would you like edit the ID, or show it?","Show or Edit?", "Edit","Show")) if("Edit") - ui_interact(user) + nano_ui_interact(user) if("Show") ..() else ..() -/obj/item/card/id/syndicate/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/card/id/syndicate/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/entries[0] entries[++entries.len] = list("name" = "Age", "value" = age) diff --git a/code/game/objects/items/weapons/storage/bsdm.dm b/code/game/objects/items/weapons/storage/bsdm.dm index cac54e7b8ae..862f1529f5a 100644 --- a/code/game/objects/items/weapons/storage/bsdm.dm +++ b/code/game/objects/items/weapons/storage/bsdm.dm @@ -16,10 +16,10 @@ return owner && (locate(/area/nadezhda/outside/lakeside) in view(get_turf(src))) /obj/item/storage/bsdm/attack_self(mob/user) - ui_interact(user) + nano_ui_interact(user) /obj/item/storage/bsdm/interact(mob/user) - ui_interact(user) + nano_ui_interact(user) /obj/item/storage/bsdm/ui_data(mob/user) var/list/list/data = list() @@ -40,7 +40,7 @@ return data -/obj/item/storage/bsdm/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/item/storage/bsdm/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm index 504977ab364..73b03664275 100644 --- a/code/game/objects/items/weapons/tanks/tanks.dm +++ b/code/game/objects/items/weapons/tanks/tanks.dm @@ -91,9 +91,9 @@ var/list/global/tank_gauge_cache = list() if (!(src.air_contents)) return - ui_interact(user) + nano_ui_interact(user) -/obj/item/tank/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/tank/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/mob/living/carbon/location = null if(istype(loc, /obj/item/rig)) // check for tanks in rigs diff --git a/code/game/objects/items/weapons/tools/_tools.dm b/code/game/objects/items/weapons/tools/_tools.dm index 0a63b4bf045..ea4a1045c5b 100755 --- a/code/game/objects/items/weapons/tools/_tools.dm +++ b/code/game/objects/items/weapons/tools/_tools.dm @@ -234,7 +234,7 @@ return data -/obj/item/tool/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) +/obj/item/tool/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -1096,4 +1096,4 @@ /obj/item/tool/ui_action_click(mob/living/user, action_name) switch(action_name) if("Tool information") - ui_interact(user) + nano_ui_interact(user) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 03ec50b4443..4000217d41c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -148,7 +148,7 @@ in_use = 0 /obj/attack_ghost(mob/user) - ui_interact(user) + nano_ui_interact(user) ..() /obj/proc/interact(mob/user) diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm index 38e88f7036c..019e298e5d2 100644 --- a/code/game/objects/structures/janicart.dm +++ b/code/game/objects/structures/janicart.dm @@ -139,10 +139,10 @@ /obj/structure/janitorialcart/attack_hand(mob/user) - ui_interact(user) + nano_ui_interact(user) return -/obj/structure/janitorialcart/ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/structure/janitorialcart/nano_ui_interact(var/mob/user, var/ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["name"] = capitalize(name) data["bag"] = mybag ? capitalize(mybag.name) : null diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index 390250e9725..3bd6590805c 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -30,7 +30,7 @@ AC.name = "SalonPro Nano-Mirror™" AC.flags = appearance_changer_flags ui_users[user] = AC - AC.ui_interact(user) + AC.nano_ui_interact(user) /obj/structure/mirror/proc/shatter() if(shattered) return @@ -96,7 +96,7 @@ AC.name = "SalonPro Nano-Mirror™" AC.flags = APPEARANCE_HAIR ui_users[user] = AC - AC.ui_interact(user) + AC.nano_ui_interact(user) /obj/item/mirror/Destroy() for(var/user in ui_users) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index a9db2ae3156..d7adce4d733 100755 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -440,7 +440,7 @@ ADMIN_VERB_ADD(/client/proc/manage_silicon_laws, R_ADMIN, TRUE) if(!S) return var/datum/nano_module/law_manager/L = new(S) - L.ui_interact(usr, state = GLOB.admin_state) + L.nano_ui_interact(usr, state = GLOB.admin_state) log_and_message_admins("has opened [S]'s law manager.") diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index 7fba34e8a02..b77a4523bc1 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -45,7 +45,7 @@ set_frequency(sanitize_frequency(round(new_freq), RADIO_LOW_FREQ, RADIO_HIGH_FREQ)) /obj/item/device/assembly/signaler/interact(mob/user, flag1) - ui_interact(user) + nano_ui_interact(user) /obj/item/device/assembly/signaler/ui_data() var/list/data = list( @@ -54,7 +54,7 @@ ) return data -/obj/item/device/assembly/signaler/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/obj/item/device/assembly/signaler/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/biomatter_manipulation/biogenerator.dm b/code/modules/biomatter_manipulation/biogenerator.dm index f0650209a9f..3d48204eeb0 100644 --- a/code/modules/biomatter_manipulation/biogenerator.dm +++ b/code/modules/biomatter_manipulation/biogenerator.dm @@ -175,7 +175,7 @@ /obj/machinery/multistructure/biogenerator_part/console/attack_hand(mob/user as mob) if(MS) - return ui_interact(user) + return nano_ui_interact(user) //UI @@ -183,7 +183,7 @@ return metrics -/obj/machinery/multistructure/biogenerator_part/console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/obj/machinery/multistructure/biogenerator_part/console/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/biomatter_manipulation/bioreactor/console.dm b/code/modules/biomatter_manipulation/bioreactor/console.dm index 80ad5bc63a8..e068896e79f 100644 --- a/code/modules/biomatter_manipulation/bioreactor/console.dm +++ b/code/modules/biomatter_manipulation/bioreactor/console.dm @@ -15,7 +15,7 @@ /obj/machinery/multistructure/bioreactor_part/console/attack_hand(mob/user as mob) if(MS) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/multistructure/bioreactor_part/console/ui_data() @@ -56,7 +56,7 @@ return data -/obj/machinery/multistructure/bioreactor_part/console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/obj/machinery/multistructure/bioreactor_part/console/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/bs_snare/machinery.dm b/code/modules/bs_snare/machinery.dm index bbcde5e668f..9277b16e2f9 100644 --- a/code/modules/bs_snare/machinery.dm +++ b/code/modules/bs_snare/machinery.dm @@ -107,9 +107,9 @@ /obj/machinery/computer/bssilk_control/attack_hand(mob/user) if(connected_hub) connected_hub.sync_with_parts() - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/bssilk_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) +/obj/machinery/computer/bssilk_control/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1) var/list/data = ui_data() if(!connected_hub) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index dadaaae8a89..bf744ce8bf4 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -128,7 +128,7 @@ data["equip_delay"] = equip_delay return data -/obj/item/clothing/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) +/obj/item/clothing/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -140,7 +140,7 @@ /obj/item/clothing/ui_action_click(mob/living/user, action_name) if(action_name == "Clothing information") - ui_interact(user) + nano_ui_interact(user) return TRUE return ..() diff --git a/code/modules/clothing/spacesuits/rig/modules/computer.dm b/code/modules/clothing/spacesuits/rig/modules/computer.dm index ff226730f1c..d53e5422583 100644 --- a/code/modules/clothing/spacesuits/rig/modules/computer.dm +++ b/code/modules/clothing/spacesuits/rig/modules/computer.dm @@ -23,7 +23,7 @@ to_chat(usr, "Your module is not installed in a hardsuit.") return - module.holder.ui_interact(usr, nano_state = GLOB.contained_state) + module.holder.nano_ui_interact(usr, nano_state = GLOB.contained_state) /obj/item/rig_module/ai_container @@ -146,7 +146,7 @@ if(!target) if(ai_card) if(istype(ai_card,/obj/item/device/aicard)) - ai_card.ui_interact(H, state =GLOB.deep_inventory_state) + ai_card.nano_ui_interact(H, state =GLOB.deep_inventory_state) else eject_ai(H) update_verb_holder() diff --git a/code/modules/clothing/spacesuits/rig/modules/utility.dm b/code/modules/clothing/spacesuits/rig/modules/utility.dm index 1ad8759ddd0..3efae30fa14 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility.dm @@ -433,7 +433,7 @@ if(autodoc_processor.active) autodoc_processor.stop() autodoc_processor.set_patient(holder.wearer) - ui_interact(usr) + nano_ui_interact(usr) return 1 /obj/item/rig_module/autodoc/Topic(href, href_list) return autodoc_processor.Topic(href, href_list) @@ -453,8 +453,8 @@ passive_power_cost = 0 wearer_loc = null -/obj/item/rig_module/autodoc/ui_interact(mob/user, ui_key, datum/nanoui/ui, force_open, datum/nanoui/master_ui, datum/topic_state/state = GLOB.deep_inventory_state) - autodoc_processor.ui_interact(user, ui_key, ui, force_open, state = GLOB.deep_inventory_state) +/obj/item/rig_module/autodoc/nano_ui_interact(mob/user, ui_key, datum/nanoui/ui, force_open, datum/nanoui/master_ui, datum/topic_state/state = GLOB.deep_inventory_state) + autodoc_processor.nano_ui_interact(user, ui_key, ui, force_open, state = GLOB.deep_inventory_state) /obj/item/rig_module/autodoc/activate() return /obj/item/rig_module/autodoc/deactivate() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index c5a082588bf..289d36a6436 100755 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -443,7 +443,7 @@ cell.use(cost*10) return 1 -/obj/item/rig/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/nano_state =GLOB.inventory_state) +/obj/item/rig/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/nano_state =GLOB.inventory_state) if(!user) return diff --git a/code/modules/clothing/spacesuits/rig/rig_verbs.dm b/code/modules/clothing/spacesuits/rig/rig_verbs.dm index ad105d8c001..ebda953c2a7 100644 --- a/code/modules/clothing/spacesuits/rig/rig_verbs.dm +++ b/code/modules/clothing/spacesuits/rig/rig_verbs.dm @@ -7,7 +7,7 @@ set src = usr.contents if(wearer && wearer.back == src) - ui_interact(usr) + nano_ui_interact(usr) /obj/item/rig/verb/toggle_vision() diff --git a/code/modules/core_implant/ritual_book.dm b/code/modules/core_implant/ritual_book.dm index 32383ea78ec..5338b791efc 100644 --- a/code/modules/core_implant/ritual_book.dm +++ b/code/modules/core_implant/ritual_book.dm @@ -81,7 +81,7 @@ return data -/obj/item/book/ritual/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/item/book/ritual/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data(user, ui_key) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -96,7 +96,7 @@ /obj/item/book/ritual/interact(mob/living/carbon/human/H) - ui_interact(H) + nano_ui_interact(H) /obj/item/book/ritual/Topic(href, href_list) diff --git a/code/modules/detectivework/microscope/dnascanner.dm b/code/modules/detectivework/microscope/dnascanner.dm index 480bcb2a9d2..99ea626caf4 100755 --- a/code/modules/detectivework/microscope/dnascanner.dm +++ b/code/modules/detectivework/microscope/dnascanner.dm @@ -35,7 +35,7 @@ to_chat(user, SPAN_WARNING("\The [src] only accepts used swabs.")) return -/obj/machinery/dnaforensics/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/dnaforensics/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(stat & (NOPOWER)) return if(user.stat || user.restrained()) return var/list/data = list() @@ -122,7 +122,7 @@ return /obj/machinery/dnaforensics/attack_hand(mob/user) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/dnaforensics/verb/toggle_lid() set category = "Object" diff --git a/code/modules/dungeons/junk_tractor_beam.dm b/code/modules/dungeons/junk_tractor_beam.dm index e49be9498ca..16f5725b559 100644 --- a/code/modules/dungeons/junk_tractor_beam.dm +++ b/code/modules/dungeons/junk_tractor_beam.dm @@ -694,9 +694,9 @@ playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) src.audible_message("The junk tractor beam console beeps: 'NOTICE: Critical error. No tractor beam detected.'") return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/jtb_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/jtb_console/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!jtb_gen) playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 1) src.audible_message("The junk tractor beam console beeps: 'NOTICE: Critical error. No tractor beam detected.'") diff --git a/code/modules/economy/Accounts_DB.dm b/code/modules/economy/Accounts_DB.dm index 0f41ed1794a..f88fe8a09dd 100644 --- a/code/modules/economy/Accounts_DB.dm +++ b/code/modules/economy/Accounts_DB.dm @@ -52,9 +52,9 @@ /obj/machinery/account_database/attack_hand(mob/user as mob) if(stat & (NOPOWER|BROKEN)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/account_database/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/account_database/nano_ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/code/modules/genetics/machinery/genetics_analyzer.dm b/code/modules/genetics/machinery/genetics_analyzer.dm index 9d151b332e4..c013f8bddaf 100644 --- a/code/modules/genetics/machinery/genetics_analyzer.dm +++ b/code/modules/genetics/machinery/genetics_analyzer.dm @@ -105,7 +105,7 @@ cannot isolate or combine desired genes. /obj/machinery/genetics/gene_analyzer/attack_hand(mob/user) if(..()) return TRUE - ui_interact(user) + nano_ui_interact(user) /obj/machinery/genetics/gene_analyzer/proc/eject(var/obj/item/genetics/sample/outbound_sample) log_debug("Called sample plate eject function") @@ -123,7 +123,7 @@ cannot isolate or combine desired genes. else icon_state = "implant_container0" */ -/obj/machinery/genetics/gene_analyzer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/genetics/gene_analyzer/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/list/data = form_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/genetics/machinery/genetics_cloner.dm b/code/modules/genetics/machinery/genetics_cloner.dm index 0e90eeca37e..8d51f3eec9b 100644 --- a/code/modules/genetics/machinery/genetics_cloner.dm +++ b/code/modules/genetics/machinery/genetics_cloner.dm @@ -679,12 +679,12 @@ and which aren't. return if(..()) return TRUE - ui_interact(user) + nano_ui_interact(user) /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable (which is inherited by /obj and /mob) * * @param user /mob The mob who is interacting with this ui * @param ui_key string A string key to use for this ui. Allows for multiple unique uis on one obj/mob (defaut value "main") @@ -692,7 +692,7 @@ and which aren't. * * @return nothing */ -/obj/machinery/computer/genetics/clone_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/computer/genetics/clone_console/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/list/data = form_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/hydroponics/seed_machines.dm b/code/modules/hydroponics/seed_machines.dm index 34510a0db69..100e2f2f899 100644 --- a/code/modules/hydroponics/seed_machines.dm +++ b/code/modules/hydroponics/seed_machines.dm @@ -55,7 +55,7 @@ finished_task() /obj/machinery/botany/attack_hand(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/botany/proc/finished_task() active = 0 @@ -128,7 +128,7 @@ var/datum/seed/genetics // Currently scanned seed genetic structure. var/degradation = 0 // Increments with each scan, stops allowing gene mods after a certain point. -/obj/machinery/botany/extractor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_panel_open = NANOUI_FOCUS) +/obj/machinery/botany/extractor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_panel_open = NANOUI_FOCUS) if(!user) return @@ -254,7 +254,7 @@ circuit = /obj/item/circuitboard/editor -/obj/machinery/botany/editor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_panel_open = NANOUI_FOCUS) +/obj/machinery/botany/editor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_panel_open = NANOUI_FOCUS) if(!user) return diff --git a/code/modules/integrated_electronics/core/assemblies.dm b/code/modules/integrated_electronics/core/assemblies.dm index a95d777f583..33b7c8da6ea 100644 --- a/code/modules/integrated_electronics/core/assemblies.dm +++ b/code/modules/integrated_electronics/core/assemblies.dm @@ -125,11 +125,11 @@ /obj/item/device/electronic_assembly/interact(mob/user, circuit) if(opened) - ui_interact(user, circuit) + nano_ui_interact(user, circuit) if(use_ui_window) - closed_ui_interact(user) + closed_nano_ui_interact(user) -/obj/item/device/electronic_assembly/proc/closed_ui_interact(mob/user) +/obj/item/device/electronic_assembly/proc/closed_nano_ui_interact(mob/user) if(!check_interactivity(user)) return var/datum/browser/popup = new(user, "scannerpanel", name, 600, 330) // Set up the popup browser window @@ -159,7 +159,7 @@ else qdel(popup) -/obj/item/device/electronic_assembly/ui_interact(mob/user, obj/item/integrated_circuit/circuit_pins) +/obj/item/device/electronic_assembly/nano_ui_interact(mob/user, obj/item/integrated_circuit/circuit_pins) . = ..() if(!check_interactivity(user)) return diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm index bb8bf2a9edc..0e00d76f10e 100644 --- a/code/modules/integrated_electronics/core/integrated_circuit.dm +++ b/code/modules/integrated_electronics/core/integrated_circuit.dm @@ -190,15 +190,15 @@ a creative player the means to solve many problems. Circuits are held inside an displayed_name = input /obj/item/integrated_circuit/interact(mob/user) - ui_interact(user) + nano_ui_interact(user) -/obj/item/integrated_circuit/ui_interact(mob/user) +/obj/item/integrated_circuit/nano_ui_interact(mob/user) . = ..() if(!check_interactivity(user)) return if(assembly) - assembly.ui_interact(user, src) + assembly.nano_ui_interact(user, src) return var/table_edge_width = "30%" diff --git a/code/modules/integrated_electronics/subtpes/smart.dm b/code/modules/integrated_electronics/subtpes/smart.dm index 6ed0e3dbf44..d3800aaa633 100644 --- a/code/modules/integrated_electronics/subtpes/smart.dm +++ b/code/modules/integrated_electronics/subtpes/smart.dm @@ -226,7 +226,7 @@ check_bot_self = TRUE if(holdingassembly.opened) - holdingassembly.ui_interact(src) + holdingassembly.nano_ui_interact(src) holdingassembly.attack_self(src) check_bot_self = FALSE return @@ -350,7 +350,7 @@ check_bot_self = TRUE if(holdingassembly.opened) - holdingassembly.ui_interact(src) + holdingassembly.nano_ui_interact(src) holdingassembly.attack_self(src) check_bot_self = FALSE return @@ -466,7 +466,7 @@ check_bot_self = TRUE if(holdingassembly.opened) - holdingassembly.ui_interact(src) + holdingassembly.nano_ui_interact(src) holdingassembly.attack_self(src) check_bot_self = FALSE return diff --git a/code/modules/mob/living/carbon/human/appearance.dm b/code/modules/mob/living/carbon/human/appearance.dm index bedf2fcf063..6fd925060d6 100644 --- a/code/modules/mob/living/carbon/human/appearance.dm +++ b/code/modules/mob/living/carbon/human/appearance.dm @@ -1,7 +1,7 @@ /mob/living/carbon/human/proc/change_appearance(var/flags = APPEARANCE_ALL_HAIR, var/location = src, var/mob/user = src, var/check_species_whitelist = 1, var/list/species_whitelist = list(), var/list/species_blacklist = list(), var/datum/topic_state/state =GLOB.default_state) var/datum/nano_module/appearance_changer/AC = new(location, src, check_species_whitelist, species_whitelist, species_blacklist) AC.flags = flags - AC.ui_interact(user, state = state) + AC.nano_ui_interact(user, state = state) /mob/living/carbon/human/proc/change_species(var/new_species) if(!new_species) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index a712eaa9ec1..1ecd74e4ba3 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -41,9 +41,9 @@ var/global/list/default_pai_software = list() set category = "pAI Commands" set name = "Software Interface" - ui_interact(src) + nano_ui_interact(src) -/mob/living/silicon/pai/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/mob/living/silicon/pai/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(user != src) if(ui) ui.set_status(STATUS_CLOSE, 0) return @@ -51,7 +51,7 @@ var/global/list/default_pai_software = list() if(ui_key != "main") var/datum/pai_software/S = software[ui_key] if(S && !S.toggle) - S.on_ui_interact(src, ui, force_open) + S.on_nano_ui_interact(src, ui, force_open) else if(ui) ui.set_status(STATUS_CLOSE, 0) return @@ -107,7 +107,7 @@ var/global/list/default_pai_software = list() if(S.toggle) S.toggle(src) else - ui_interact(src, ui_key = soft) + nano_ui_interact(src, ui_key = soft) return 1 else if(href_list["stopic"]) diff --git a/code/modules/mob/living/silicon/pai/software_modules.dm b/code/modules/mob/living/silicon/pai/software_modules.dm index 0f90ddaaacf..f5fedeaeb32 100644 --- a/code/modules/mob/living/silicon/pai/software_modules.dm +++ b/code/modules/mob/living/silicon/pai/software_modules.dm @@ -7,12 +7,12 @@ var/id = "" // Whether this software is a toggle or not // Toggled software should override toggle() and is_active() - // Non-toggled software should override on_ui_interact() and Topic() + // Non-toggled software should override on_nano_ui_interact() and Topic() var/toggle = 1 // Whether pAIs should automatically receive this module at no cost var/default = 0 - proc/on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + proc/on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) return proc/toggle(mob/living/silicon/pai/user) @@ -28,7 +28,7 @@ toggle = 0 default = 1 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] data["master"] = user.master @@ -84,7 +84,7 @@ toggle = 0 default = 1 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui = null, force_open = 1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui = null, force_open = 1) var/data[0] data["listening"] = user.radio.broadcasting @@ -120,7 +120,7 @@ id = "manifest" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) data_core.get_manifest_json() var/data[0] @@ -141,7 +141,7 @@ id = "med_records" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] var/records[0] @@ -195,7 +195,7 @@ id = "sec_records" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] var/records[0] @@ -253,7 +253,7 @@ id = "door_jack" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] data["cable"] = user.cable != null @@ -327,7 +327,7 @@ id = "atmos_sense" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] var/turf/T = get_turf_or_move(user.loc) @@ -401,7 +401,7 @@ id = "signaller" toggle = 0 - on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) + on_nano_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1) var/data[0] data["frequency"] = format_frequency(user.sradio.frequency) diff --git a/code/modules/mob/living/silicon/subsystems.dm b/code/modules/mob/living/silicon/subsystems.dm index d4e62ede174..ff8aaac3b29 100644 --- a/code/modules/mob/living/silicon/subsystems.dm +++ b/code/modules/mob/living/silicon/subsystems.dm @@ -145,6 +145,6 @@ /stat_silicon_subsystem/Click(var/mob/given = usr) if (istype(given)) - subsystem.ui_interact(given, state = ui_state) + subsystem.nano_ui_interact(given, state = ui_state) else - subsystem.ui_interact(usr, state = ui_state) + subsystem.nano_ui_interact(usr, state = ui_state) diff --git a/code/modules/modular_computers/NTNet/NTNet_relay.dm b/code/modules/modular_computers/NTNet/NTNet_relay.dm index 5a31096e04a..57cc92f2d92 100644 --- a/code/modules/modular_computers/NTNet/NTNet_relay.dm +++ b/code/modules/modular_computers/NTNet/NTNet_relay.dm @@ -59,7 +59,7 @@ ntnet_global.add_log("Quantum relay switched from overload recovery mode to normal operation mode.") ..() -/obj/machinery/ntnet_relay/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/obj/machinery/ntnet_relay/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = list() data["enabled"] = enabled data["dos_capacity"] = dos_capacity @@ -74,7 +74,7 @@ ui.set_auto_update(1) /obj/machinery/ntnet_relay/attack_hand(var/mob/living/user) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/ntnet_relay/Topic(href, href_list) if(..()) diff --git a/code/modules/modular_computers/computers/modular_computer/core.dm b/code/modules/modular_computers/computers/modular_computer/core.dm index ae358ba6b4d..fa36d156fd5 100644 --- a/code/modules/modular_computers/computers/modular_computer/core.dm +++ b/code/modules/modular_computers/computers/modular_computer/core.dm @@ -191,7 +191,7 @@ active_program = null var/mob/user = usr if(user && istype(user)) - ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. + nano_ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. update_icon() // Returns 0 for No Signal, 1 for Low Signal and 2 for Good Signal. 3 is for wired connection (always-on) @@ -237,7 +237,7 @@ autorun_program(hard_drive) if(user) - ui_interact(user) + nano_ui_interact(user) /obj/item/modular_computer/proc/autorun_program(obj/item/computer_hardware/hard_drive/disk) var/datum/computer_file/data/autorun = disk?.find_file_by_name("AUTORUN") @@ -253,7 +253,7 @@ active_program = null update_icon() if(istype(user)) - ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. + nano_ui_interact(user) // Re-open the UI on this computer. It should show the main screen now. /obj/item/modular_computer/proc/run_program(prog_name, obj/item/computer_hardware/hard_drive/disk) var/datum/computer_file/program/P = null @@ -292,7 +292,7 @@ if(P.run_program(user)) active_program = P all_threads.Add(P) - active_program.ui_interact(user) + active_program.nano_ui_interact(user) update_uis() update_icon() return TRUE diff --git a/code/modules/modular_computers/computers/modular_computer/interaction.dm b/code/modules/modular_computers/computers/modular_computer/interaction.dm index d49555792b1..a7c19383c5b 100644 --- a/code/modules/modular_computers/computers/modular_computer/interaction.dm +++ b/code/modules/modular_computers/computers/modular_computer/interaction.dm @@ -143,7 +143,7 @@ /obj/item/modular_computer/attack_ghost(var/mob/observer/ghost/user) if(enabled) - ui_interact(user) + nano_ui_interact(user) else if(check_rights(R_ADMIN, 0, user)) var/response = alert(user, "This computer is turned off. Would you like to turn it on?", "Admin Override", "Yes", "No") if(response == "Yes") @@ -160,7 +160,7 @@ // On-click handling. Turns on the computer if it's off and opens the GUI. /obj/item/modular_computer/attack_self(var/mob/user) if(enabled && screen_on) - ui_interact(user) + nano_ui_interact(user) else if(!enabled && screen_on) turn_on(user) diff --git a/code/modules/modular_computers/computers/modular_computer/ui.dm b/code/modules/modular_computers/computers/modular_computer/ui.dm index e1f84329435..92fa8cac6ea 100644 --- a/code/modules/modular_computers/computers/modular_computer/ui.dm +++ b/code/modules/modular_computers/computers/modular_computer/ui.dm @@ -1,5 +1,5 @@ // Operates NanoUI -/obj/item/modular_computer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/modular_computer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!screen_on || !enabled || bsod) if(ui) ui.close() @@ -13,7 +13,7 @@ if(active_program) if(ui) // This is the main laptop screen. Since we are switching to program's UI close it for now. ui.close() - active_program.ui_interact(user) + active_program.nano_ui_interact(user) return // We are still here, that means there is no program loaded. Load the BIOS/ROM/OS/whatever you want to call it. diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 81acb3bfe39..35c47a2dc12 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -5,7 +5,7 @@ var/required_access = null // Access level required to run/download the program. var/requires_access_to_run = 1 // Whether the program checks for required_access when run. var/requires_access_to_download = 1 // Whether the program checks for required_access when downloading. - var/datum/nano_module/NM = null // If the program uses NanoModule, put it here and it will be automagically opened. Otherwise implement ui_interact. + var/datum/nano_module/NM = null // If the program uses NanoModule, put it here and it will be automagically opened. Otherwise implement nano_ui_interact. var/nanomodule_path = null // Path to nanomodule, make sure to set this if implementing new program. var/program_state = PROGRAM_STATE_KILLED // PROGRAM_STATE_KILLED or PROGRAM_STATE_BACKGROUND or PROGRAM_STATE_ACTIVE - specifies whether this program is running. var/obj/item/modular_computer/computer // Device that runs this program. @@ -193,13 +193,13 @@ // This is called every tick when the program is enabled. Ensure you do parent call if you override it. If parent returns 1 continue with UI initialisation. // It returns 0 if it can't run or if NanoModule was used instead. I suggest using NanoModules where applicable. -/datum/computer_file/program/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/datum/computer_file/program/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(program_state != PROGRAM_STATE_ACTIVE) // Our program was closed. Close the ui if it exists. if(ui) ui.close() - return computer.ui_interact(user) + return computer.nano_ui_interact(user) if(istype(NM)) - NM.ui_interact(user, ui_key, null, force_open) + NM.nano_ui_interact(user, ui_key, null, force_open) return 0 return 1 diff --git a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm index 8e24f660efa..f9bb8294123 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/access_decrypter.dm @@ -101,7 +101,7 @@ /datum/nano_module/program/access_decrypter name = "Access Decrypter" -/datum/nano_module/program/access_decrypter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/access_decrypter/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!ntnet_global) return var/datum/computer_file/program/access_decrypter/PRG = program diff --git a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm index ddb2b6587af..9713175f993 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/dos.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/dos.dm @@ -37,7 +37,7 @@ /datum/nano_module/program/computer_dos name = "DoS Traffic Generator" -/datum/nano_module/program/computer_dos/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_dos/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!ntnet_global) return var/datum/computer_file/program/ntnet_dos/PRG = program diff --git a/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm b/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm index 230b5b8c637..0872f2ca945 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/hacked_camera.dm @@ -23,7 +23,7 @@ ntnet_global.add_log("IDS WARNING - Unauthorised access detected to camera network [HNM.current_network] by device with NID [computer.network_card.get_network_tag()]") ntnet_global.intrusion_detection_alarm = 1 -/datum/computer_file/program/camera_monitor/hacked/ui_interact(mob/user) +/datum/computer_file/program/camera_monitor/hacked/nano_ui_interact(mob/user) operator_skill = get_operator_skill(user, STAT_COG) . = ..() // Actual work done by nanomodule's parent. diff --git a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm index 1aaf676459b..da4b999c161 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/revelation.dm @@ -70,7 +70,7 @@ /datum/nano_module/program/revelation name = "Revelation Virus" -/datum/nano_module/program/revelation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/revelation/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = list() var/datum/computer_file/program/revelation/PRG = program if(!istype(PRG)) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/uplink.dm index 4e9e090e0e0..197ee39e9ce 100755 --- a/code/modules/modular_computers/file_system/programs/antagonist/uplink.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/uplink.dm @@ -44,7 +44,7 @@ return 1 return 1 -/datum/nano_module/program/uplink/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/uplink/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/datum/computer_file/program/uplink/PRG = program data["error"] = error diff --git a/code/modules/modular_computers/file_system/programs/command/card.dm b/code/modules/modular_computers/file_system/programs/command/card.dm index 9d732a64826..695f9487021 100644 --- a/code/modules/modular_computers/file_system/programs/command/card.dm +++ b/code/modules/modular_computers/file_system/programs/command/card.dm @@ -15,7 +15,7 @@ var/is_centcom = 0 var/show_assignments = 0 -/datum/nano_module/program/card_mod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/card_mod/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data["src"] = "\ref[src]" diff --git a/code/modules/modular_computers/file_system/programs/command/comm.dm b/code/modules/modular_computers/file_system/programs/command/comm.dm index 4df47ae5cfa..4d348f82f90 100644 --- a/code/modules/modular_computers/file_system/programs/command/comm.dm +++ b/code/modules/modular_computers/file_system/programs/command/comm.dm @@ -40,7 +40,7 @@ ..() crew_announcement.newscast = 1 -/datum/nano_module/program/comm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/comm/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() diff --git a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm index f25bda4825f..47e16db918b 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/alarm_monitor.dm @@ -102,7 +102,7 @@ usr.switch_to_camera(C) return 1 -/datum/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/alarm_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/categories[0] diff --git a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm index 4ba8d89723e..610eeeb3cc7 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/atmos_control.dm @@ -49,10 +49,10 @@ var/obj/machinery/alarm/alarm = locate(href_list["alarm"]) in (monitored_alarms.len ? monitored_alarms : GLOB.alarm_list) if(alarm) var/datum/topic_state/TS = generate_state(alarm) - alarm.ui_interact(usr, master_ui = ui_ref, state = TS) + alarm.nano_ui_interact(usr, master_ui = ui_ref, state = TS) return 1 -/datum/nano_module/atmos_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/atmos_control/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/master_ui = null, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/alarms[0] diff --git a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm index 8a782c9ff45..5b92da3752f 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/power_monitor.dm @@ -53,7 +53,7 @@ // If PC is not null header template is loaded. Use PC.get_header_data() to get relevant nanoui data from it. All data entries begin with "PC_...." // In future it may be expanded to other modular computer devices. -/datum/nano_module/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/power_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/list/sensors = list() diff --git a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm index 92f300acd82..13b32412db5 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/rcon_console.dm @@ -22,7 +22,7 @@ var/hide_SMES_details = 0 var/hide_breakers = 0 -/datum/nano_module/rcon/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/rcon/nano_ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) FindDevices() // Update our devices list var/list/data = host.initial_data() diff --git a/code/modules/modular_computers/file_system/programs/engineering/shield_control.dm b/code/modules/modular_computers/file_system/programs/engineering/shield_control.dm index 0e5ae6d6b6a..9e089d9e883 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/shield_control.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/shield_control.dm @@ -66,7 +66,7 @@ playsound_host('sound/machines/buzz-two.ogg', 50) genloc = "" -/datum/nano_module/shield_control/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/datum/nano_module/shield_control/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) if(!host) return var/list/data = host.initial_data() @@ -191,7 +191,7 @@ gen.toggle_flag(text2num(href_list["toggle_mode"])) . = 1 - ui_interact(usr) + nano_ui_interact(usr) /* @@ -199,7 +199,7 @@ // If PC is not null header template is loaded. Use PC.get_header_data() to get relevant nanoui data from it. All data entries begin with "PC_...." // In future it may be expanded to other modular computer devices. -/datum/nano_module/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = default_state) +/datum/nano_module/power_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = default_state) var/list/data = host.initial_data() var/list/sensors = list() diff --git a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm index 3487523eb0f..dc9d6baafe5 100644 --- a/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/engineering/supermatter_monitor.dm @@ -59,7 +59,7 @@ for(var/obj/machinery/power/supermatter/S in supermatters) . = max(., S.get_status()) -/datum/nano_module/supermatter_monitor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/datum/nano_module/supermatter_monitor/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() if(istype(active)) var/turf/T = get_turf(active) diff --git a/code/modules/modular_computers/file_system/programs/generic/audio_player.dm b/code/modules/modular_computers/file_system/programs/generic/audio_player.dm index e2d393c5284..7705b62284b 100755 --- a/code/modules/modular_computers/file_system/programs/generic/audio_player.dm +++ b/code/modules/modular_computers/file_system/programs/generic/audio_player.dm @@ -131,7 +131,7 @@ /datum/nano_module/program/audio name = "Audio Player" -/datum/nano_module/program/audio/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/audio/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/datum/computer_file/program/audio/PRG var/list/data = host.initial_data() diff --git a/code/modules/modular_computers/file_system/programs/generic/bounty_board.dm b/code/modules/modular_computers/file_system/programs/generic/bounty_board.dm index a0523a046b0..2fe9dc0ad2a 100644 --- a/code/modules/modular_computers/file_system/programs/generic/bounty_board.dm +++ b/code/modules/modular_computers/file_system/programs/generic/bounty_board.dm @@ -52,7 +52,7 @@ data["claimed_bounties"] = claimed_bounties return data -/datum/nano_module/bounty_board/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) +/datum/nano_module/bounty_board/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/modular_computers/file_system/programs/generic/camera.dm b/code/modules/modular_computers/file_system/programs/generic/camera.dm index 8979f98ec51..71e04fa3040 100644 --- a/code/modules/modular_computers/file_system/programs/generic/camera.dm +++ b/code/modules/modular_computers/file_system/programs/generic/camera.dm @@ -41,7 +41,7 @@ var/obj/machinery/camera/current_camera = null var/current_network = null -/datum/nano_module/camera_monitor/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/camera_monitor/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() data["current_camera"] = current_camera ? current_camera.nano_structure() : null diff --git a/code/modules/modular_computers/file_system/programs/generic/coin_miner.dm b/code/modules/modular_computers/file_system/programs/generic/coin_miner.dm index 4fa08dab849..36f37231e4b 100644 --- a/code/modules/modular_computers/file_system/programs/generic/coin_miner.dm +++ b/code/modules/modular_computers/file_system/programs/generic/coin_miner.dm @@ -84,7 +84,7 @@ return 1 -/datum/nano_module/program/coin_miner/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/coin_miner/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!ntnet_global) return var/datum/computer_file/program/coin_miner/PRG = program diff --git a/code/modules/modular_computers/file_system/programs/generic/configurator.dm b/code/modules/modular_computers/file_system/programs/generic/configurator.dm index fa73438f4e7..64435cc2465 100644 --- a/code/modules/modular_computers/file_system/programs/generic/configurator.dm +++ b/code/modules/modular_computers/file_system/programs/generic/configurator.dm @@ -21,7 +21,7 @@ name = "NTOS Computer Configuration Tool" var/obj/item/modular_computer/movable = null -/datum/nano_module/program/computer_configurator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_configurator/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(program) movable = program.computer if(!istype(movable)) diff --git a/code/modules/modular_computers/file_system/programs/generic/crew_manifest.dm b/code/modules/modular_computers/file_system/programs/generic/crew_manifest.dm index 1473e6a984e..62972854ea5 100644 --- a/code/modules/modular_computers/file_system/programs/generic/crew_manifest.dm +++ b/code/modules/modular_computers/file_system/programs/generic/crew_manifest.dm @@ -13,7 +13,7 @@ /datum/nano_module/crew_manifest name = "Crew Manifest" -/datum/nano_module/crew_manifest/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/crew_manifest/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() data["crew_manifest"] = html_crew_manifest(TRUE) diff --git a/code/modules/modular_computers/file_system/programs/generic/docks.dm b/code/modules/modular_computers/file_system/programs/generic/docks.dm index 2a56eb61dd9..58a6de4736e 100644 --- a/code/modules/modular_computers/file_system/programs/generic/docks.dm +++ b/code/modules/modular_computers/file_system/programs/generic/docks.dm @@ -41,7 +41,7 @@ continue docking_controllers += D.docking_program.id_tag -/datum/nano_module/docking/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/docking/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() var/list/docks = list() for(var/docktag in docking_controllers) diff --git a/code/modules/modular_computers/file_system/programs/generic/drink_catalog.dm b/code/modules/modular_computers/file_system/programs/generic/drink_catalog.dm index 21a0cd2a312..90d4574baaf 100644 --- a/code/modules/modular_computers/file_system/programs/generic/drink_catalog.dm +++ b/code/modules/modular_computers/file_system/programs/generic/drink_catalog.dm @@ -12,7 +12,7 @@ /datum/nano_module/drink_catalog name = "Drinks Catalog" -/datum/nano_module/drink_catalog/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) +/datum/nano_module/drink_catalog/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) diff --git a/code/modules/modular_computers/file_system/programs/generic/email_client.dm b/code/modules/modular_computers/file_system/programs/generic/email_client.dm index de2cfcbb090..ab96d4d843e 100755 --- a/code/modules/modular_computers/file_system/programs/generic/email_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/email_client.dm @@ -300,7 +300,7 @@ data["stored_password"] = stars(stored_password, 0) return data -/datum/nano_module/email_client/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/email_client/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) @@ -360,7 +360,7 @@ var/mob/living/user = usr if(href_list["open"]) - ui_interact() + nano_ui_interact() check_for_new_messages(1) // Any actual interaction (button pressing) is considered as acknowledging received message, for the purpose of notification icons. if(href_list["login"]) @@ -499,7 +499,7 @@ var/atom/movable/AM = host if(istype(AM)) if(ismob(AM.loc)) - ui_interact(AM.loc) + nano_ui_interact(AM.loc) return 1 if(href_list["view"]) diff --git a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm index af04ec272c6..21f962da616 100755 --- a/code/modules/modular_computers/file_system/programs/generic/file_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/file_browser.dm @@ -184,7 +184,7 @@ return data -/datum/nano_module/program/computer_filemanager/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_filemanager/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/modular_computers/file_system/programs/generic/game.dm b/code/modules/modular_computers/file_system/programs/generic/game.dm index 5e65c0e8189..f01e8c52dc7 100644 --- a/code/modules/modular_computers/file_system/programs/generic/game.dm +++ b/code/modules/modular_computers/file_system/programs/generic/game.dm @@ -58,9 +58,9 @@ ..() new_game() -// ui_interact handles transfer of data to NanoUI. Keep in mind that data you pass from here is actually sent to the client. In other words, don't send anything you don't want a client +// nano_ui_interact handles transfer of data to NanoUI. Keep in mind that data you pass from here is actually sent to the client. In other words, don't send anything you don't want a client // to see, and don't send unnecessarily large amounts of data (due to laginess). -/datum/nano_module/arcade_classic/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/arcade_classic/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data["player_health"] = player_health diff --git a/code/modules/modular_computers/file_system/programs/generic/library.dm b/code/modules/modular_computers/file_system/programs/generic/library.dm index 37f498f1b11..55c5bba3f4f 100644 --- a/code/modules/modular_computers/file_system/programs/generic/library.dm +++ b/code/modules/modular_computers/file_system/programs/generic/library.dm @@ -26,7 +26,7 @@ The answer was five and a half years -ZeroBits var/obj/machinery/libraryscanner/scanner var/sort_by = "id" -/datum/nano_module/library/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/library/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() if(error_message) diff --git a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm index ceaf5738c95..2942f3988f3 100644 --- a/code/modules/modular_computers/file_system/programs/generic/news_browser.dm +++ b/code/modules/modular_computers/file_system/programs/generic/news_browser.dm @@ -82,7 +82,7 @@ /datum/nano_module/program/computer_newsbrowser name = "News Browser" -/datum/nano_module/program/computer_newsbrowser/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_newsbrowser/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/datum/computer_file/program/newsbrowser/PRG var/list/data = list() diff --git a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm index c8876d47c7c..6b81a0012c4 100644 --- a/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntdownloader.dm @@ -146,7 +146,7 @@ name = "Software Download Tool" var/obj/item/modular_computer/my_computer = null -/datum/nano_module/program/computer_ntnetdownload/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_ntnetdownload/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(program) my_computer = program.computer diff --git a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm index a9f0e288b84..05b5154e62e 100755 --- a/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/generic/ntnrc_client.dm @@ -193,7 +193,7 @@ /datum/nano_module/program/computer_chatclient name = "NTNet Relay Chat Client" -/datum/nano_module/program/computer_chatclient/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_chatclient/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!ntnet_global || !ntnet_global.chat_channels) return diff --git a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm index 5eb3d706d1c..b8734b59ca5 100644 --- a/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm +++ b/code/modules/modular_computers/file_system/programs/generic/nttransfer.dm @@ -79,7 +79,7 @@ var/global/nttransfer_uid = 0 /datum/nano_module/program/computer_nttransfer name = "P2P Transfer Client" -/datum/nano_module/program/computer_nttransfer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_nttransfer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!program) return var/datum/computer_file/program/nttransfer/PRG = program diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm index b3c4f552f53..2836b1a741b 100644 --- a/code/modules/modular_computers/file_system/programs/generic/records.dm +++ b/code/modules/modular_computers/file_system/programs/generic/records.dm @@ -15,7 +15,7 @@ var/datum/computer_file/report/crew_record/active_record var/message = null -/datum/nano_module/records/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/records/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() var/list/user_access = get_record_access(user) @@ -117,13 +117,13 @@ var/photo = get_photo(usr) if(photo && active_record) active_record.photo_front = photo - ui_interact(usr) + nano_ui_interact(usr) return 1 if(href_list["edit_photo_side"]) var/photo = get_photo(usr) if(photo && active_record) active_record.photo_side = photo - ui_interact(usr) + nano_ui_interact(usr) return 1 if(href_list["edit_field"]) edit_field(usr, text2num(href_list["edit_field"])) diff --git a/code/modules/modular_computers/file_system/programs/generic/reports.dm b/code/modules/modular_computers/file_system/programs/generic/reports.dm index e6461302542..00038b39fa8 100644 --- a/code/modules/modular_computers/file_system/programs/generic/reports.dm +++ b/code/modules/modular_computers/file_system/programs/generic/reports.dm @@ -18,7 +18,7 @@ var/datum/computer_file/report/saved_report //The computer file open. var/prog_state = REPORTS_VIEW -/datum/nano_module/program/reports/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/program/reports/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() data["prog_state"] = prog_state switch(prog_state) diff --git a/code/modules/modular_computers/file_system/programs/generic/scanner.dm b/code/modules/modular_computers/file_system/programs/generic/scanner.dm index 5a7ae270d29..38a41aabfef 100644 --- a/code/modules/modular_computers/file_system/programs/generic/scanner.dm +++ b/code/modules/modular_computers/file_system/programs/generic/scanner.dm @@ -82,7 +82,7 @@ /datum/nano_module/program/scanner name = "Scanner" -/datum/nano_module/program/scanner/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/scanner/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/datum/computer_file/program/scanner/prog = program if(!prog.computer) diff --git a/code/modules/modular_computers/file_system/programs/generic/signaller.dm b/code/modules/modular_computers/file_system/programs/generic/signaller.dm index 7c9e4921cd3..478f5101111 100644 --- a/code/modules/modular_computers/file_system/programs/generic/signaller.dm +++ b/code/modules/modular_computers/file_system/programs/generic/signaller.dm @@ -43,7 +43,7 @@ return data -/datum/computer_file/program/signaller/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) +/datum/computer_file/program/signaller/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui, force_open = NANOUI_FOCUS, datum/topic_state/state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/modular_computers/file_system/programs/generic/supply.dm b/code/modules/modular_computers/file_system/programs/generic/supply.dm index 0a210149a88..7b6c93141ae 100644 --- a/code/modules/modular_computers/file_system/programs/generic/supply.dm +++ b/code/modules/modular_computers/file_system/programs/generic/supply.dm @@ -25,7 +25,7 @@ var/emagged = FALSE // TODO: Implement synchronisation with modular computer framework. var/current_security_level -/datum/nano_module/supply/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/supply/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = host.initial_data() var/is_admin = check_access(user, access_cargo) var/decl/security_state/security_state = decls_repository.get_decl(GLOB.maps_data.security_state) diff --git a/code/modules/modular_computers/file_system/programs/generic/taxes.dm b/code/modules/modular_computers/file_system/programs/generic/taxes.dm index 9724dba4bc3..24d84f88693 100644 --- a/code/modules/modular_computers/file_system/programs/generic/taxes.dm +++ b/code/modules/modular_computers/file_system/programs/generic/taxes.dm @@ -249,7 +249,7 @@ return TOPIC_HANDLED -/datum/nano_module/program/tax/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/tax/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data["stored_login"] = account_num ? account_num : "" data["popup"] = popup diff --git a/code/modules/modular_computers/file_system/programs/generic/trade.dm b/code/modules/modular_computers/file_system/programs/generic/trade.dm index 09639978d51..02899aa75a6 100644 --- a/code/modules/modular_computers/file_system/programs/generic/trade.dm +++ b/code/modules/modular_computers/file_system/programs/generic/trade.dm @@ -158,7 +158,7 @@ /datum/nano_module/program/trade name = "Trading Program" -/datum/nano_module/program/trade/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) +/datum/nano_module/program/trade/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, state = GLOB.default_state) var/list/data = ui_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm index 9218709ff3f..c500bc1a2b9 100755 --- a/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm +++ b/code/modules/modular_computers/file_system/programs/generic/wordprocessor.dm @@ -162,7 +162,7 @@ /datum/nano_module/program/computer_wordprocessor name = "Word Processor" -/datum/nano_module/program/computer_wordprocessor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_wordprocessor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() var/datum/computer_file/program/wordprocessor/PRG PRG = program diff --git a/code/modules/modular_computers/file_system/programs/medical/chem_catalog.dm b/code/modules/modular_computers/file_system/programs/medical/chem_catalog.dm index 0338aabed99..eefac13996b 100644 --- a/code/modules/modular_computers/file_system/programs/medical/chem_catalog.dm +++ b/code/modules/modular_computers/file_system/programs/medical/chem_catalog.dm @@ -12,7 +12,7 @@ /datum/nano_module/chem_catalog name = "Chemistry Catalog" -/datum/nano_module/chem_catalog/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) +/datum/nano_module/chem_catalog/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) diff --git a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm index b97a6948bc9..401cb9ce489 100644 --- a/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm +++ b/code/modules/modular_computers/file_system/programs/medical/suit_sensors.dm @@ -120,7 +120,7 @@ data["search"] = search ? search : "Search" return data -/datum/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/crew_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm index e6aee392f37..d2da66d6329 100644 --- a/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm +++ b/code/modules/modular_computers/file_system/programs/research/ai_restorer.dm @@ -88,7 +88,7 @@ /datum/nano_module/program/computer_aidiag name = "AI Maintenance Utility" -/datum/nano_module/program/computer_aidiag/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_aidiag/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data += "skill_fail" diff --git a/code/modules/modular_computers/file_system/programs/research/cyborg_remote.dm b/code/modules/modular_computers/file_system/programs/research/cyborg_remote.dm index 0bbc03a1dea..fcdee5a829a 100644 --- a/code/modules/modular_computers/file_system/programs/research/cyborg_remote.dm +++ b/code/modules/modular_computers/file_system/programs/research/cyborg_remote.dm @@ -16,7 +16,7 @@ name = "Cyborg Remote Access & Monitor" available_to_ai = TRUE -/datum/nano_module/program/remote_cyborg_controle/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/remote_cyborg_controle/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/data[0] var/safety = 1 data["robots"] = get_cyborgs(user) diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 5867c7c58f4..c17847cfdd7 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -18,7 +18,7 @@ var/datum/computer_file/data/email_message/current_message = null var/error = "" -/datum/nano_module/program/email_administration/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/email_administration/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data += "skill_fail" diff --git a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm index e05e1611a9f..361e985e196 100644 --- a/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/research/ntmonitor.dm @@ -15,7 +15,7 @@ name = "NTNet Diagnostics and Monitoring" available_to_ai = TRUE -/datum/nano_module/program/computer_ntnetmonitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/program/computer_ntnetmonitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!ntnet_global) return var/list/data = host.initial_data() diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index df0e77eb527..ff0e58443c4 100755 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -19,7 +19,7 @@ LEGACY_RECORD_STRUCTURE(all_warrants, warrant) name = "Warrant Assistant" var/datum/computer_file/data/warrant/activewarrant -/datum/nano_module/digitalwarrant/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/digitalwarrant/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() if(activewarrant) diff --git a/code/modules/modular_computers/file_system/programs/security/forceauthorization.dm b/code/modules/modular_computers/file_system/programs/security/forceauthorization.dm index a250722b4b7..fbd6ffe615b 100644 --- a/code/modules/modular_computers/file_system/programs/security/forceauthorization.dm +++ b/code/modules/modular_computers/file_system/programs/security/forceauthorization.dm @@ -14,7 +14,7 @@ /datum/nano_module/forceauthorization/ name = "Use of Force Authorization Manager" -/datum/nano_module/forceauthorization/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/forceauthorization/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) var/list/data = host.initial_data() data["is_silicon_usr"] = issilicon(user) diff --git a/code/modules/modular_computers/hardware/scanners/scanner_atmos.dm b/code/modules/modular_computers/hardware/scanners/scanner_atmos.dm index 057005a3c16..e7cd90ff812 100644 --- a/code/modules/modular_computers/hardware/scanners/scanner_atmos.dm +++ b/code/modules/modular_computers/hardware/scanners/scanner_atmos.dm @@ -26,7 +26,7 @@ driver.data_buffer = data if(!SSnano.update_uis(driver.NM)) holder2.run_program(driver.filename) - driver.NM.ui_interact(user) + driver.NM.nano_ui_interact(user) /obj/item/computer_hardware/scanner/atmos/proc/scan_data(mob/user, atom/target, proximity = TRUE) if(!can_use_scanner(user, target, proximity)) diff --git a/code/modules/modular_computers/hardware/scanners/scanner_medical.dm b/code/modules/modular_computers/hardware/scanners/scanner_medical.dm index 98f6252c918..efab74eaa75 100644 --- a/code/modules/modular_computers/hardware/scanners/scanner_medical.dm +++ b/code/modules/modular_computers/hardware/scanners/scanner_medical.dm @@ -12,4 +12,4 @@ driver.data_buffer = dat if(!SSnano.update_uis(driver.NM)) holder2.run_program(driver.filename) - driver.NM.ui_interact(user) + driver.NM.nano_ui_interact(user) diff --git a/code/modules/modular_computers/hardware/scanners/scanner_price.dm b/code/modules/modular_computers/hardware/scanners/scanner_price.dm index 398b91eac34..8da2f4664a6 100644 --- a/code/modules/modular_computers/hardware/scanners/scanner_price.dm +++ b/code/modules/modular_computers/hardware/scanners/scanner_price.dm @@ -29,4 +29,4 @@ driver.data_buffer += "
[dat]" if(!SSnano.update_uis(driver.NM)) holder2.run_program(driver.filename) - driver.NM.ui_interact(user) + driver.NM.nano_ui_interact(user) diff --git a/code/modules/modular_computers/hardware/scanners/scanner_reagent.dm b/code/modules/modular_computers/hardware/scanners/scanner_reagent.dm index 20ff3188e26..0937bb14bd6 100644 --- a/code/modules/modular_computers/hardware/scanners/scanner_reagent.dm +++ b/code/modules/modular_computers/hardware/scanners/scanner_reagent.dm @@ -19,4 +19,4 @@ driver.data_buffer = dat if(!SSnano.update_uis(driver.NM)) holder2.run_program(driver.filename) - driver.NM.ui_interact(user) \ No newline at end of file + driver.NM.nano_ui_interact(user) \ No newline at end of file diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 1292c11031e..b17f7381a71 100755 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -233,9 +233,9 @@ return FALSE /obj/machinery/lapvend/attack_hand(var/mob/user) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/lapvend/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/lapvend/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(stat & (BROKEN | NOPOWER | MAINT)) if(ui) ui.close() diff --git a/code/modules/nano/modules/alarm_monitor.dm b/code/modules/nano/modules/alarm_monitor.dm index 88669ab327a..3e699f6414e 100644 --- a/code/modules/nano/modules/alarm_monitor.dm +++ b/code/modules/nano/modules/alarm_monitor.dm @@ -71,7 +71,7 @@ usr.switch_to_camera(C) return 1 -/datum/nano_module/alarm_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/alarm_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/data = host.initial_data() var/categories[0] diff --git a/code/modules/nano/modules/catalog_all_entries.dm b/code/modules/nano/modules/catalog_all_entries.dm index 925248583d6..927d063b205 100644 --- a/code/modules/nano/modules/catalog_all_entries.dm +++ b/code/modules/nano/modules/catalog_all_entries.dm @@ -1,7 +1,7 @@ /datum/nano_module/catalog name = "Catalog" -/datum/nano_module/catalog/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) +/datum/nano_module/catalog/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_REINITIALIZE, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) if (!ui) diff --git a/code/modules/nano/modules/crew_monitor.dm b/code/modules/nano/modules/crew_monitor.dm index aa8e0a69b2a..db2d6538b02 100644 --- a/code/modules/nano/modules/crew_monitor.dm +++ b/code/modules/nano/modules/crew_monitor.dm @@ -16,7 +16,7 @@ AI.ai_actual_track(H) return 1 -/datum/nano_module/crew_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/crew_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/data = host.initial_data() 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 55843941229..64e559cb3a6 100644 --- a/code/modules/nano/modules/human_appearance.dm +++ b/code/modules/nano/modules/human_appearance.dm @@ -94,7 +94,7 @@ return 0 -/datum/nano_module/appearance_changer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/appearance_changer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(!owner || !owner.species) return diff --git a/code/modules/nano/modules/law_manager.dm b/code/modules/nano/modules/law_manager.dm index 3d6ccf79cf8..042dcab7d90 100755 --- a/code/modules/nano/modules/law_manager.dm +++ b/code/modules/nano/modules/law_manager.dm @@ -147,7 +147,7 @@ return 0 -/datum/nano_module/law_manager/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/datum/nano_module/law_manager/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = GLOB.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 709721ace25..e8ff7211aa1 100644 --- a/code/modules/nano/modules/power_monitor.dm +++ b/code/modules/nano/modules/power_monitor.dm @@ -16,7 +16,7 @@ // If PC is not null header template is loaded. Use PC.get_header_data() to get relevant nanoui data from it. All data entries begin with "PC_...." // In future it may be expanded to other modular computer devices. -/datum/nano_module/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = default_state) +/datum/nano_module/power_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS, var/datum/topic_state/state = default_state) var/list/data = host.initial_data() var/list/sensors = list() diff --git a/code/modules/nano/modules/rcon.dm b/code/modules/nano/modules/rcon.dm index db99e85822b..a838c5cbaff 100644 --- a/code/modules/nano/modules/rcon.dm +++ b/code/modules/nano/modules/rcon.dm @@ -7,7 +7,7 @@ var/hide_SMES_details = 0 var/hide_breakers = 0 -/datum/nano_module/rcon/ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state =GLOB.default_state) +/datum/nano_module/rcon/nano_ui_interact(mob/user, ui_key = "rcon", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state =GLOB.default_state) FindDevices() // Update our devices list var/list/data = host.initial_data() diff --git a/code/modules/nano/nanoexternal.dm b/code/modules/nano/nanoexternal.dm index 32935868d66..4cb0169fceb 100644 --- a/code/modules/nano/nanoexternal.dm +++ b/code/modules/nano/nanoexternal.dm @@ -42,9 +42,9 @@ src.mob.unset_machine() /** - * The ui_interact proc is used to open and update Nano UIs - * If ui_interact is not used then the UI will not update correctly - * ui_interact is currently defined for /atom/movable + * The nano_ui_interact proc is used to open and update Nano UIs + * If nano_ui_interact is not used then the UI will not update correctly + * nano_ui_interact is currently defined for /atom/movable * * @param user /mob The mob who is interacting with this UI * @param ui_key string A string key to use for this UI. Allows for multiple unique UIs on one obj/mob (defaut value "main") @@ -53,7 +53,7 @@ * * @return nothing */ -/datum/proc/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/nanoui/master_ui = null, datum/topic_state/state = GLOB.default_state) +/datum/proc/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS, datum/nanoui/master_ui = null, datum/topic_state/state = GLOB.default_state) return /** diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm index e6fa817acb6..c2da3bd1083 100644 --- a/code/modules/nano/nanoui.dm +++ b/code/modules/nano/nanoui.dm @@ -581,4 +581,4 @@ nanoui is used to open and update nano browser uis * @return nothing */ /datum/nanoui/proc/update(var/force_open = 0) - src_object.ui_interact(user, ui_key, src, force_open, master_ui, state) \ No newline at end of file + src_object.nano_ui_interact(user, ui_key, src, force_open, master_ui, state) \ No newline at end of file diff --git a/code/modules/organs/internal/carrion.dm b/code/modules/organs/internal/carrion.dm index 6c6c5cf177d..349dd098ad7 100644 --- a/code/modules/organs/internal/carrion.dm +++ b/code/modules/organs/internal/carrion.dm @@ -96,7 +96,7 @@ owner.put_in_active_hand(spider) -/obj/item/organ/internal/carrion/core/ui_interact(mob/user, ui_key, datum/nanoui/ui, force_open, datum/nanoui/master_ui, datum/topic_state/state) +/obj/item/organ/internal/carrion/core/nano_ui_interact(mob/user, ui_key, datum/nanoui/ui, force_open, datum/nanoui/master_ui, datum/topic_state/state) var/list/data = list() var/list/spiders_in_list = list() @@ -156,7 +156,7 @@ set category = "Carrion" set name = "Open spider menu" - ui_interact(owner) + nano_ui_interact(owner) /obj/item/organ/internal/carrion/core/removed(mob/living/user) if(!associated_spider && owner) diff --git a/code/modules/overmap/ships/computers/engine_control.dm b/code/modules/overmap/ships/computers/engine_control.dm index 6aefa630532..9d817856a4a 100644 --- a/code/modules/overmap/ships/computers/engine_control.dm +++ b/code/modules/overmap/ships/computers/engine_control.dm @@ -21,9 +21,9 @@ if(!isAI(user)) user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/engines/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/engines/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!linked) to_chat(user, "Unable to connect to ship control systems.") return diff --git a/code/modules/overmap/ships/computers/helm.dm b/code/modules/overmap/ships/computers/helm.dm index 1d87a03942e..28c6204cb3e 100644 --- a/code/modules/overmap/ships/computers/helm.dm +++ b/code/modules/overmap/ships/computers/helm.dm @@ -77,9 +77,9 @@ if(linked && manual_control) user.reset_view(linked) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/helm/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/helm/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!linked) return @@ -222,7 +222,7 @@ icon_keyboard = "generic_key" icon_screen = "helm" -/obj/machinery/computer/navigation/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/navigation/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!linked) return @@ -277,7 +277,7 @@ user.set_machine(src) user.reset_view(linked) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/navigation/Topic(href, href_list) if(..()) diff --git a/code/modules/overmap/ships/computers/sensors.dm b/code/modules/overmap/ships/computers/sensors.dm index 4e9a1d1132f..f658417a7d0 100644 --- a/code/modules/overmap/ships/computers/sensors.dm +++ b/code/modules/overmap/ships/computers/sensors.dm @@ -24,7 +24,7 @@ sensors = S break -/obj/machinery/computer/sensors/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/sensors/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!linked) return @@ -76,7 +76,7 @@ user.set_machine(src) if(linked) user.reset_view(linked) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/sensors/Topic(href, href_list, state) if(..()) diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm index 07cb103e156..1f419981a7f 100644 --- a/code/modules/overmap/ships/computers/shuttle.dm +++ b/code/modules/overmap/ships/computers/shuttle.dm @@ -2,7 +2,7 @@ /obj/machinery/computer/shuttle_control/explore name = "general shuttle control console" -/obj/machinery/computer/shuttle_control/explore/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/shuttle_control/explore/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/datum/shuttle/autodock/overmap/shuttle = SSshuttle.shuttles[shuttle_tag] if (!istype(shuttle)) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 178dc3b9102..9870dceee42 100755 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -777,7 +777,7 @@ if(wiresexposed && !isAI(user)) wires.Interact(user) - return ui_interact(user) + return nano_ui_interact(user) /obj/machinery/power/apc/proc/toggle_lock(mob/user) if(emagged) @@ -806,7 +806,7 @@ else toggle_lock(user) -/obj/machinery/power/apc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/apc/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(!user) return diff --git a/code/modules/power/diesel_gen.dm b/code/modules/power/diesel_gen.dm index a709ef45d6f..6f25eefd76a 100644 --- a/code/modules/power/diesel_gen.dm +++ b/code/modules/power/diesel_gen.dm @@ -230,12 +230,12 @@ ..() if (!anchored) return - ui_interact(user) + nano_ui_interact(user) /obj/machinery/power/port_gen/pacman/attack_ai(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/power/port_gen/pacman/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/port_gen/pacman/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(IsBroken()) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index a45ca3098b8..341b7fdaa43 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -174,9 +174,9 @@ if(stat & (BROKEN|NOPOWER) || !anchored) return if(!circ1 || !circ2) //Just incase the middle part of the TEG was not wrenched last. reconnect() - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/power/generator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/generator/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) // this is the data which will be sent to the ui var/vertical = 0 if (dir == NORTH || dir == SOUTH) diff --git a/code/modules/power/hydroelectric.dm b/code/modules/power/hydroelectric.dm index 3ec5182b365..27fc76e1b13 100644 --- a/code/modules/power/hydroelectric.dm +++ b/code/modules/power/hydroelectric.dm @@ -190,7 +190,7 @@ ..() update_icon() -/obj/machinery/power/hydroelectric_control/ui_interact(mob/user, ui_key = "hydroelectric", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) +/obj/machinery/power/hydroelectric_control/nano_ui_interact(mob/user, ui_key = "hydroelectric", datum/nanoui/ui=null, force_open=NANOUI_FOCUS, var/datum/topic_state/state = GLOB.default_state) if(stat & BROKEN) return @@ -230,7 +230,7 @@ malfnumber = malfnumber + 10 /obj/machinery/power/hydroelectric_control/attack_hand(mob/user) - ui_interact(user) + nano_ui_interact(user) /obj/item/paper/hydroworking name = "paper- 'Working the Hydroelectric Generator.'" diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index b6c0d3b37ea..34a43107d21 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -354,9 +354,9 @@ ..() if (!anchored) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/power/port_gen/pacman/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/port_gen/pacman/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(IsBroken()) return diff --git a/code/modules/power/sensors/sensor_monitoring.dm b/code/modules/power/sensors/sensor_monitoring.dm index 325e7a9758b..032317fb5da 100644 --- a/code/modules/power/sensors/sensor_monitoring.dm +++ b/code/modules/power/sensors/sensor_monitoring.dm @@ -49,11 +49,11 @@ if(..()) return - ui_interact(user) + nano_ui_interact(user) // Uses dark magic to operate the NanoUI of this computer. -/obj/machinery/computer/power_monitor/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) - power_monitor.ui_interact(user, ui_key, ui, force_open) +/obj/machinery/computer/power_monitor/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) + power_monitor.nano_ui_interact(user, ui_key, ui, force_open) // Verifies if any warnings were registered by connected sensors. diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index aa283efbfde..ec94599cf35 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -258,7 +258,7 @@ add_fingerprint(user) if(!check_user(user)) //To try and make this more guild only return - ui_interact(user) + nano_ui_interact(user) /obj/machinery/power/smes/proc/check_user(mob/user) if(user.stats?.getPerk(PERK_HANDYMAN) || user.stat_check(STAT_MEC, skill_check)) @@ -328,7 +328,7 @@ return tool_type || 1 -/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/smes/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(stat & BROKEN) return diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 1877a406040..abcb1f39672 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -302,11 +302,11 @@ if(Adjacent(user)) return attack_hand(user) else - ui_interact(user) + nano_ui_interact(user) return /obj/machinery/power/supermatter/attack_ai(mob/user as mob) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/power/supermatter/attack_hand(mob/user as mob) user.visible_message("\The [user] reaches out and touches \the [src], inducing a resonance... \his body starts to glow and bursts into flames before flashing into ash.",\ @@ -316,7 +316,7 @@ Consume(user) // This is purely informational UI that may be accessed by AIs or robots -/obj/machinery/power/supermatter/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/supermatter/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["integrity_percentage"] = round(get_integrity()) diff --git a/code/modules/projectiles/gun_hud_actions.dm b/code/modules/projectiles/gun_hud_actions.dm index cf3679968ee..f4b47f0fc5f 100644 --- a/code/modules/projectiles/gun_hud_actions.dm +++ b/code/modules/projectiles/gun_hud_actions.dm @@ -53,9 +53,9 @@ if("safety") toggle_safety(user) if("Weapon Info") - ui_interact(user) + nano_ui_interact(user) -/obj/item/gun/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) +/obj/item/gun/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, state = GLOB.default_state) var/list/data = ui_data(user) ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) diff --git a/code/modules/reagents/machinery/centrifuge.dm b/code/modules/reagents/machinery/centrifuge.dm index 90a547a0858..7a93ec3f0c9 100644 --- a/code/modules/reagents/machinery/centrifuge.dm +++ b/code/modules/reagents/machinery/centrifuge.dm @@ -133,9 +133,9 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/centrifuge/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/centrifuge/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found @@ -310,9 +310,9 @@ if(loc != user && ..()) return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/item/device/makeshift_centrifuge/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/item/device/makeshift_centrifuge/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found diff --git a/code/modules/reagents/machinery/chem_dispenser.dm b/code/modules/reagents/machinery/chem_dispenser.dm index e6f88da0a9d..630875a4e5d 100644 --- a/code/modules/reagents/machinery/chem_dispenser.dm +++ b/code/modules/reagents/machinery/chem_dispenser.dm @@ -142,7 +142,7 @@ return data -/obj/machinery/chemical_dispenser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/chemical_dispenser/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found @@ -243,7 +243,7 @@ if(!user.stats?.getPerk(PERK_MEDICAL_EXPERT) && !usr.stat_check(STAT_BIO, STAT_LEVEL_BASIC) && !simple_machinery && !usr.stat_check(STAT_COG, 30)) //Are we missing the perk AND to low on bio? Needs 15 bio so 30 to bypass to_chat(usr, SPAN_WARNING("Your biological understanding isn't enough to use this.")) return - ui_interact(user) + nano_ui_interact(user) /obj/machinery/chemical_dispenser/soda icon_state = "soda_dispenser" diff --git a/code/modules/reagents/machinery/chem_heater.dm b/code/modules/reagents/machinery/chem_heater.dm index 96235df70c6..82b75a613df 100644 --- a/code/modules/reagents/machinery/chem_heater.dm +++ b/code/modules/reagents/machinery/chem_heater.dm @@ -109,9 +109,9 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/chem_heater/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found diff --git a/code/modules/reagents/machinery/electrolyzer.dm b/code/modules/reagents/machinery/electrolyzer.dm index 51220a507d0..77f0adf12e2 100644 --- a/code/modules/reagents/machinery/electrolyzer.dm +++ b/code/modules/reagents/machinery/electrolyzer.dm @@ -153,9 +153,9 @@ return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/electrolyzer/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/electrolyzer/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found @@ -291,7 +291,7 @@ /obj/item/device/makeshift_electrolyser/attack_self(mob/user as mob) user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) add_fingerprint(user) /obj/item/device/makeshift_electrolyser/MouseDrop(over_object) @@ -320,7 +320,7 @@ return return ..() -/obj/item/device/makeshift_electrolyser/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/item/device/makeshift_electrolyser/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = ui_data() // update the ui if it exists, returns null if no ui is passed/found @@ -351,7 +351,7 @@ if(loc != user && ..()) return TRUE user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/item/device/makeshift_electrolyser/Topic(href, href_list) if(..()) diff --git a/code/modules/reagents/machinery/grinder.dm b/code/modules/reagents/machinery/grinder.dm index 93a8f61bbd6..a05d0489824 100755 --- a/code/modules/reagents/machinery/grinder.dm +++ b/code/modules/reagents/machinery/grinder.dm @@ -56,7 +56,7 @@ return //Useability tweak for borgs if (istype(I,/obj/item/gripper)) - ui_interact(user) + nano_ui_interact(user) return return insert(I, user) @@ -114,12 +114,12 @@ return user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/reagentgrinder/on_deconstruction() eject() -/obj/machinery/reagentgrinder/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/reagentgrinder/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(!nano_template) return diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index c12a474456b..87f85076172 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -387,10 +387,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/rdconsole/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) // Here we go again +/obj/machinery/computer/rdconsole/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null) // Here we go again if((screen == SCREEN_PROTO && !linked_lathe) || (screen == SCREEN_IMPRINTER && !linked_imprinter)) screen = SCREEN_MAIN // Kick us from protolathe or imprinter screen if they were destroyed diff --git a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm index 3a7421e8fe1..7531a92e494 100755 --- a/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm +++ b/code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm @@ -62,7 +62,7 @@ coolant_reagents_purity["adminordrazine"] = 2 /obj/machinery/radiocarbon_spectrometer/attack_hand(var/mob/user as mob) - ui_interact(user) + nano_ui_interact(user) /obj/machinery/radiocarbon_spectrometer/attackby(var/obj/I as obj, var/mob/user as mob) if(scanning) @@ -119,7 +119,7 @@ if(total_purity && fresh_coolant) coolant_purity = total_purity / fresh_coolant -/obj/machinery/radiocarbon_spectrometer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/radiocarbon_spectrometer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) if(user.stat) return diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 4954e779ab3..1189f610bbc 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -31,9 +31,9 @@ return user.set_machine(src) - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/keycard_auth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/keycard_auth/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/decl/security_state/security_state = decls_repository.get_decl(GLOB.maps_data.security_state) diff --git a/code/modules/shield_generators/shield_generator.dm b/code/modules/shield_generators/shield_generator.dm index 2f352bae4b5..970b33905a4 100644 --- a/code/modules/shield_generators/shield_generator.dm +++ b/code/modules/shield_generators/shield_generator.dm @@ -335,7 +335,7 @@ S.fail(1) -/obj/machinery/power/shield_generator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/power/shield_generator/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data["running"] = running @@ -388,7 +388,7 @@ /obj/machinery/power/shield_generator/attack_hand(var/mob/user) - ui_interact(user) + nano_ui_interact(user) if(panel_open) wires.Interact(user) @@ -468,7 +468,7 @@ log_event(EVENT_RECONFIGURED, src) . = 1 - ui_interact(usr) + nano_ui_interact(usr) /obj/machinery/power/shield_generator/proc/field_integrity() if(max_energy) diff --git a/code/modules/shuttles/escape_pods.dm b/code/modules/shuttles/escape_pods.dm index 67abf05c75b..e4d8d75d4d1 100644 --- a/code/modules/shuttles/escape_pods.dm +++ b/code/modules/shuttles/escape_pods.dm @@ -48,7 +48,7 @@ var/list/escape_pods_by_name = list() var/datum/shuttle/autodock/ferry/escape_pod/pod progtype = /datum/computer/file/embedded_program/docking/simple/escape_pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( @@ -85,7 +85,7 @@ var/list/escape_pods_by_name = list() name = "escape pod berth controller" progtype = /datum/computer/file/embedded_program/docking/simple/escape_pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/armed = null diff --git a/code/modules/shuttles/shuttle_console.dm b/code/modules/shuttles/shuttle_console.dm index 7c79aaf6b0e..1e18cb4dd2e 100644 --- a/code/modules/shuttles/shuttle_console.dm +++ b/code/modules/shuttles/shuttle_console.dm @@ -18,7 +18,7 @@ to_chat(user, "Access Denied.") return 1 - ui_interact(user) + nano_ui_interact(user) /obj/machinery/computer/shuttle_control/proc/get_ui_data(var/datum/shuttle/autodock/shuttle) var/shuttle_state @@ -72,7 +72,7 @@ shuttle.cancel_launch(src) return TOPIC_REFRESH -/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/shuttle_control/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/datum/shuttle/autodock/shuttle = SSshuttle.shuttles[shuttle_tag] if (!istype(shuttle)) to_chat(user, "Unable to establish link with the shuttle.") diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm index e657ae4e71b..9d32c101d47 100644 --- a/code/modules/shuttles/shuttle_emergency.dm +++ b/code/modules/shuttles/shuttle_emergency.dm @@ -177,7 +177,7 @@ read_authorization(W) ..() -/obj/machinery/computer/shuttle_control/emergency/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/shuttle_control/emergency/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/datum/shuttle/autodock/ferry/emergency/shuttle = SSshuttle.shuttles[shuttle_tag] if (!istype(shuttle)) diff --git a/code/modules/surgery/autodoc.dm b/code/modules/surgery/autodoc.dm index 44a4645dac2..a5710f7d929 100644 --- a/code/modules/surgery/autodoc.dm +++ b/code/modules/surgery/autodoc.dm @@ -198,7 +198,7 @@ /datum/autodoc/proc/fail() current_step++ -/datum/autodoc/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 2, var/datum/topic_state/state) +/datum/autodoc/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 2, var/datum/topic_state/state) if(!patient) if(ui) ui.close() diff --git a/code/modules/surgery/organic.dm b/code/modules/surgery/organic.dm index 01d67978523..e399a525751 100644 --- a/code/modules/surgery/organic.dm +++ b/code/modules/surgery/organic.dm @@ -74,7 +74,7 @@ SPAN_NOTICE("You keep the incision open on [organ.get_surgery_name()] with \the [tool].") ) organ.open = 2 - organ.ui_interact(user) + organ.nano_ui_interact(user) /datum/surgery_step/retract_skin/fail_step(mob/living/user, obj/item/organ/external/organ, obj/item/tool) user.visible_message( diff --git a/code/modules/surgery/robotic.dm b/code/modules/surgery/robotic.dm index bf08d04aac8..2c93515cdb4 100644 --- a/code/modules/surgery/robotic.dm +++ b/code/modules/surgery/robotic.dm @@ -38,7 +38,7 @@ ) organ.open = !organ.open organ.diagnosed = FALSE - organ.ui_interact(user) + organ.nano_ui_interact(user) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 687a30a6501..d337e23a840 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -194,7 +194,7 @@ proc/do_surgery(mob/living/carbon/M, mob/living/user, obj/item/tool) if(!do_old_surgery(M, user, tool)) if(affected && affected.open && tool && tool.tool_qualities) // Open or update surgery UI - affected.ui_interact(user) + affected.nano_ui_interact(user) to_chat(user, SPAN_WARNING("You can't see any useful way to use [tool] on [M].")) return 1 //Prevents attacking the patient when trying to do surgery @@ -207,7 +207,7 @@ proc/do_surgery(mob/living/carbon/M, mob/living/user, obj/item/tool) /obj/item/organ/external/do_surgery(mob/living/user, obj/item/tool) if(!tool) if(is_open()) - ui_interact(user) + nano_ui_interact(user) return TRUE return FALSE diff --git a/code/modules/surgery/surgery_ui.dm b/code/modules/surgery/surgery_ui.dm index c1587e9978a..3cf3dcf2879 100644 --- a/code/modules/surgery/surgery_ui.dm +++ b/code/modules/surgery/surgery_ui.dm @@ -8,7 +8,7 @@ return ..() -/obj/item/organ/external/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/item/organ/external/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) if(is_open() && !diagnosed) try_autodiagnose(user) diff --git a/code/modules/synthesized_instruments/echo_editor.dm b/code/modules/synthesized_instruments/echo_editor.dm index 8a1432b3971..be7ea4a8bd9 100644 --- a/code/modules/synthesized_instruments/echo_editor.dm +++ b/code/modules/synthesized_instruments/echo_editor.dm @@ -10,7 +10,7 @@ src.player = player -/datum/nano_module/echo_editor/ui_interact(mob/user, ui_key = "echo_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/echo_editor/nano_ui_interact(mob/user, ui_key = "echo_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/list/data = list() data["echo_params"] = list() for (var/i=1 to 18) diff --git a/code/modules/synthesized_instruments/env_editor.dm b/code/modules/synthesized_instruments/env_editor.dm index a4fd2571acb..b1954509f66 100644 --- a/code/modules/synthesized_instruments/env_editor.dm +++ b/code/modules/synthesized_instruments/env_editor.dm @@ -9,7 +9,7 @@ src.player = player -/datum/nano_module/env_editor/ui_interact(mob/user, ui_key = "env_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/env_editor/nano_ui_interact(mob/user, ui_key = "env_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/list/data = list() data["env_params"] = list() for (var/i=1 to 23) diff --git a/code/modules/synthesized_instruments/real_instruments.dm b/code/modules/synthesized_instruments/real_instruments.dm index ddb6a0b4f3d..247143b0b20 100644 --- a/code/modules/synthesized_instruments/real_instruments.dm +++ b/code/modules/synthesized_instruments/real_instruments.dm @@ -72,12 +72,12 @@ if ("show_song_editor") if (!src.song_editor) src.song_editor = new (host = src.owner, song = src.player.song) - src.song_editor.ui_interact(usr) + src.song_editor.nano_ui_interact(usr) if ("show_usage") if (!src.usage_info) src.usage_info = new (owner, src.player) - src.usage_info.ui_interact(usr) + src.usage_info.nano_ui_interact(usr) if ("volume") src.player.volume = min(max(min(player.volume+text2num(value), 100), 0), player.max_volume) if ("transposition") @@ -123,14 +123,14 @@ if (GLOB.musical_config.env_settings_available) if (!src.env_editor) src.env_editor = new (src.player) - src.env_editor.ui_interact(usr) + src.env_editor.nano_ui_interact(usr) else to_chat(usr, "Virtual environment is disabled") if ("show_echo_editor") if (!src.echo_editor) src.echo_editor = new (src.player) - src.echo_editor.ui_interact(usr) + src.echo_editor.nano_ui_interact(usr) if ("select_env") if (value in -1 to 26) @@ -235,10 +235,10 @@ /obj/structure/synthesized_instrument/interact(mob/user) // CONDITIONS ..(user) that shit in subclasses - src.ui_interact(user) + src.nano_ui_interact(user) -/obj/structure/synthesized_instrument/ui_interact(mob/user, ui_key = "instrument", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/structure/synthesized_instrument/nano_ui_interact(mob/user, ui_key = "instrument", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) real_instrument.ui_call(user,ui_key,ui,force_open) @@ -287,10 +287,10 @@ /obj/item/device/synthesized_instrument/interact(mob/user) // CONDITIONS ..(user) that shit in subclasses - src.ui_interact(user) + src.nano_ui_interact(user) -/obj/item/device/synthesized_instrument/ui_interact(mob/user, ui_key = "instrument", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/item/device/synthesized_instrument/nano_ui_interact(mob/user, ui_key = "instrument", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) real_instrument.ui_call(user,ui_key,ui,force_open) diff --git a/code/modules/synthesized_instruments/song_editor.dm b/code/modules/synthesized_instruments/song_editor.dm index 6b8e232c3af..2f8d2a2bf98 100644 --- a/code/modules/synthesized_instruments/song_editor.dm +++ b/code/modules/synthesized_instruments/song_editor.dm @@ -26,7 +26,7 @@ min(GLOB.musical_config.song_editor_lines_per_page * page_num, src.song.lines.len)) -/datum/nano_module/song_editor/ui_interact(mob/user, ui_key = "song_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/song_editor/nano_ui_interact(mob/user, ui_key = "song_editor", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/list/data = list() var/current_page = src.current_page() diff --git a/code/modules/synthesized_instruments/usage_info.dm b/code/modules/synthesized_instruments/usage_info.dm index 61d0140b918..a684a267e0a 100644 --- a/code/modules/synthesized_instruments/usage_info.dm +++ b/code/modules/synthesized_instruments/usage_info.dm @@ -8,7 +8,7 @@ src.player = player //This will let you easily monitor when you're going overboard with tempo and sound duration, generally if the bars fill up it is BAD -/datum/nano_module/usage_info/ui_interact(mob/user, ui_key = "usage_info", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/datum/nano_module/usage_info/nano_ui_interact(mob/user, ui_key = "usage_info", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/global/list/data = list() data.Cut() data["channels_left"] = GLOB.sound_channels.available_channels.stack.len diff --git a/code/modules/telesci/telesci_computer.dm b/code/modules/telesci/telesci_computer.dm index e239d145fac..efaf6e7eec3 100644 --- a/code/modules/telesci/telesci_computer.dm +++ b/code/modules/telesci/telesci_computer.dm @@ -341,9 +341,9 @@ /obj/machinery/computer/telesci_console/attack_hand(mob/user) if(..()) return TRUE - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/telesci_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) +/obj/machinery/computer/telesci_console/nano_ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = NANOUI_FOCUS) var/list/data = form_data() ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open) if(!ui) @@ -545,7 +545,7 @@ addLog("Closing bluespace tunnel by user request.") closePortal() - ui_interact(user) + nano_ui_interact(user) return FALSE /obj/machinery/computer/telesci_console/Destroy() diff --git a/code/modules/virus2/centrifuge.dm b/code/modules/virus2/centrifuge.dm index b318d5bf086..f113cfe8a70 100644 --- a/code/modules/virus2/centrifuge.dm +++ b/code/modules/virus2/centrifuge.dm @@ -34,9 +34,9 @@ /obj/machinery/computer/centrifuge/attack_hand(var/mob/user as mob) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/centrifuge/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/centrifuge/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/code/modules/virus2/diseasesplicer.dm b/code/modules/virus2/diseasesplicer.dm index 99c7669ad83..5d6bc376284 100644 --- a/code/modules/virus2/diseasesplicer.dm +++ b/code/modules/virus2/diseasesplicer.dm @@ -37,9 +37,9 @@ /obj/machinery/computer/diseasesplicer/attack_hand(mob/user) if(..()) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/diseasesplicer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/diseasesplicer/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/code/modules/virus2/dishincubator.dm b/code/modules/virus2/dishincubator.dm index 3f42f429fd8..08bfd5d6fe2 100644 --- a/code/modules/virus2/dishincubator.dm +++ b/code/modules/virus2/dishincubator.dm @@ -48,9 +48,9 @@ /obj/machinery/disease2/incubator/attack_hand(mob/user as mob) if(stat & (NOPOWER|BROKEN)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/disease2/incubator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/disease2/incubator/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/code/modules/virus2/isolator.dm b/code/modules/virus2/isolator.dm index 149f8f95d6a..bfede2c9c13 100644 --- a/code/modules/virus2/isolator.dm +++ b/code/modules/virus2/isolator.dm @@ -47,9 +47,9 @@ /obj/machinery/disease2/isolator/attack_hand(mob/user as mob) if(stat & (NOPOWER|BROKEN)) return - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/disease2/isolator/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/disease2/isolator/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) user.set_machine(src) var/data[0] diff --git a/oldcode/shuttles_old/old_escape_pods.dm b/oldcode/shuttles_old/old_escape_pods.dm index f10ee7119ae..ada1b029599 100644 --- a/oldcode/shuttles_old/old_escape_pods.dm +++ b/oldcode/shuttles_old/old_escape_pods.dm @@ -37,7 +37,7 @@ name = "escape pod controller" var/datum/shuttle/ferry/escape_pod/pod -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] data = list( @@ -84,7 +84,7 @@ docking_program = new/datum/computer/file/embedded_program/docking/simple/escape_pod(src) program = docking_program -/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/embedded_controller/radio/simple_docking_controller/escape_pod_berth/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/armed = null diff --git a/oldcode/shuttles_old/old_shuttle_console.dm b/oldcode/shuttles_old/old_shuttle_console.dm index 8605c81e7f2..e8c42e9b482 100644 --- a/oldcode/shuttles_old/old_shuttle_console.dm +++ b/oldcode/shuttles_old/old_shuttle_console.dm @@ -17,9 +17,9 @@ user << "\red Access Denied." return 1 - ui_interact(user) + nano_ui_interact(user) -/obj/machinery/computer/shuttle_control/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) +/obj/machinery/computer/shuttle_control/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = NANOUI_FOCUS) var/data[0] var/datum/shuttle/ferry/shuttle = shuttle_controller.shuttles[shuttle_tag] if (!istype(shuttle))