refactors attack_hand, attackby, attack_self (#5120)

Co-authored-by: silicons <no@you.cat>
This commit is contained in:
silicons
2023-03-11 17:15:58 +01:00
committed by GitHub
co-authored by silicons
parent 0851fcc7cb
commit 455ec82c4e
681 changed files with 2524 additions and 1145 deletions
@@ -70,7 +70,7 @@
ui.open()
ui.set_auto_update(1)
/obj/machinery/ntnet_relay/attack_hand(var/mob/living/user)
/obj/machinery/ntnet_relay/attack_hand(mob/user, list/params)
nano_ui_interact(user)
/obj/machinery/ntnet_relay/Topic(href, href_list)
@@ -109,13 +109,16 @@
/obj/item/modular_computer/attack_ai(mob/user)
return attack_self(user)
/obj/item/modular_computer/attack_hand(mob/user)
/obj/item/modular_computer/attack_hand(mob/user, list/params)
if(anchored)
return attack_self(user)
return ..()
/// On-click handling. Turns on the computer if it's off and opens the GUI.
/obj/item/modular_computer/attack_self(mob/user)
. = ..()
if(.)
return
if(enabled && screen_on)
nano_ui_interact(user)
else if(!enabled && screen_on)
@@ -214,7 +214,7 @@
return 1
return 0
/obj/machinery/lapvend/attack_hand(var/mob/user)
/obj/machinery/lapvend/attack_hand(mob/user, list/params)
nano_ui_interact(user)
/obj/machinery/lapvend/nano_ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)