Skip to content

Commit

Permalink
legit does nothing
Browse files Browse the repository at this point in the history
Renames all ui_interact with nano_ui_interact
  • Loading branch information
Trilbyspaceclone committed Feb 16, 2022
1 parent a1939dd commit 188fe49
Show file tree
Hide file tree
Showing 199 changed files with 399 additions and 399 deletions.
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/binary_devices/pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/omni_devices/filter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/omni_devices/mixer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion code/ATMOSPHERICS/components/omni_devices/omni_base.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
return

src.add_fingerprint(usr)
ui_interact(user)
nano_ui_interact(user)
return

/obj/machinery/atmospherics/omni/proc/build_icons()
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/cold_sink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions code/ATMOSPHERICS/components/unary/heat_source.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/nanoui.dm
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions code/datums/craft/menu.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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())
Expand Down
12 changes: 6 additions & 6 deletions code/game/dna/dna_modifier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -287,27 +287,27 @@

/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")
* @param ui /datum/nanoui This parameter is passed by the nanoui process() proc when updating an open ui
*
* @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
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/Sleeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 8 additions & 8 deletions code/game/machinery/alarm.dm
Original file line number Diff line number Diff line change
Expand Up @@ -402,20 +402,20 @@
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) )

if(AALARM_MODE_PANIC, AALARM_MODE_CYCLE)
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") )

Expand Down Expand Up @@ -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)
. = ..()
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/atmoalter/canister.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/atmoalter/pump.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/atmoalter/scrubber.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/autodoc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/autodoc_excelsior.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/autolathe/artist_bench.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/autolathe/autolathe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -250,15 +250,15 @@
return

user.set_machine(src)
ui_interact(user)
nano_ui_interact(user)


/obj/machinery/autolathe/attack_hand(mob/user)
if(..())
return TRUE

user.set_machine(src)
ui_interact(user)
nano_ui_interact(user)
wires.Interact(user)

/obj/machinery/autolathe/Topic(href, href_list)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/autolathe/fabricators.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/autolathe/matterforge.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(..())
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/autolathe/mechfab.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

return design_files

/obj/machinery/autolathe/mechfab/ui_interact()
/obj/machinery/autolathe/mechfab/nano_ui_interact()
if(!categories)
update_categories()
..()
Expand Down
Loading

0 comments on commit 188fe49

Please sign in to comment.