From e277e05e467b17ac22a56b73f90b98671b7d7c76 Mon Sep 17 00:00:00 2001 From: Adrer Date: Sun, 25 Oct 2020 14:04:36 +0100 Subject: [PATCH 1/4] Allow mass drivers and mass driver buttons to be linked again --- code/game/machinery/buttons.dm | 14 +++++++++++++- code/game/machinery/mass_driver.dm | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 035739ba90f..2a35561bfdc 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -84,11 +84,23 @@ /obj/machinery/driver_button/multitool_menu(var/mob/user, var/obj/item/multitool/P) return {" "} +/obj/machinery/driver_button/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) + if("set_id" in href_list) + var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN) + if(!newid) + return + + id_tag = newid + + return TRUE + + return ..() + /obj/machinery/driver_button/attack_hand(mob/user as mob) add_fingerprint(usr) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index fc6e61be76d..cbf63965177 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -37,9 +37,21 @@ /obj/machinery/mass_driver/multitool_menu(var/mob/user, var/obj/item/multitool/P) return {" "} +/obj/machinery/mass_driver/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) + if("set_id" in href_list) + var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN) + if(!newid) + return + + id_tag = newid + + return TRUE + + return ..() + /obj/machinery/mass_driver/proc/drive(amount) if(stat & (BROKEN|NOPOWER)) return From 186d9781b20a0f8cbc17abf49d9e519f0df6f132 Mon Sep 17 00:00:00 2001 From: Adrer Date: Sun, 25 Oct 2020 14:50:59 +0100 Subject: [PATCH 2/4] Apply suggestions from code review User instead of usr Src when implied removed Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> --- code/game/machinery/buttons.dm | 2 +- code/game/machinery/mass_driver.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 2a35561bfdc..965f4a01e4a 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -91,7 +91,7 @@ /obj/machinery/driver_button/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) if("set_id" in href_list) - var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN) + var/newid = copytext(reject_bad_text(input(user, "Specify the new ID tag for this machine", name, id_tag) as null|text), 1, MAX_MESSAGE_LEN) if(!newid) return diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index cbf63965177..9641b8d719d 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -42,7 +42,7 @@ /obj/machinery/mass_driver/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) if("set_id" in href_list) - var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID tag for this machine", src, src.id_tag) as null|text), 1, MAX_MESSAGE_LEN) + var/newid = copytext(reject_bad_text(input(user, "Specify the new ID tag for this machine", name, id_tag) as null|text), 1, MAX_MESSAGE_LEN) if(!newid) return From 4488dc5af02abb1ceaf4f14233c316a36024e390 Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 26 Oct 2020 13:01:52 +0100 Subject: [PATCH 3/4] Remove unneeded proc from buttons.dm --- code/game/machinery/buttons.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 965f4a01e4a..9d7b73b2bcc 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -89,18 +89,6 @@
  • Logic ID Tag: [format_tag("Logic ID Tag", "logic_id_tag")]
    • "} -/obj/machinery/driver_button/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - if("set_id" in href_list) - var/newid = copytext(reject_bad_text(input(user, "Specify the new ID tag for this machine", name, id_tag) as null|text), 1, MAX_MESSAGE_LEN) - if(!newid) - return - - id_tag = newid - - return TRUE - - return ..() - /obj/machinery/driver_button/attack_hand(mob/user as mob) add_fingerprint(usr) From a9d66785277d4039d64088539fa8e546f6a68806 Mon Sep 17 00:00:00 2001 From: Adrer Date: Mon, 26 Oct 2020 13:02:21 +0100 Subject: [PATCH 4/4] Remove unneeded proc from mass_driver.dm --- code/game/machinery/mass_driver.dm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 9641b8d719d..c8a220ca3f2 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -40,18 +40,6 @@
  • [format_tag("ID Tag","id_tag","set_id")]
    • "} -/obj/machinery/mass_driver/multitool_topic(var/mob/user, var/list/href_list, var/obj/O) - if("set_id" in href_list) - var/newid = copytext(reject_bad_text(input(user, "Specify the new ID tag for this machine", name, id_tag) as null|text), 1, MAX_MESSAGE_LEN) - if(!newid) - return - - id_tag = newid - - return TRUE - - return ..() - /obj/machinery/mass_driver/proc/drive(amount) if(stat & (BROKEN|NOPOWER)) return