From 41c05861540439947299d5aa9d553645ff9e072b Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sun, 23 Jun 2019 06:28:37 +0200 Subject: [PATCH 1/2] Ports in "makes the abductor console use radials" --- .../antagonists/abductor/machinery/console.dm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index a14b667069..3e4984b554 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -126,8 +126,20 @@ if(vest) vest.flip_mode() -/obj/machinery/abductor/console/proc/SelectDisguise(remote = 0) - var/entry_name = input( "Choose Disguise", "Disguise") as null|anything in disguises +/obj/machinery/abductor/console/proc/SelectDisguise(remote = FALSE) +var/list/disguises2 = list() + for(var/name in disguises) + var/datum/icon_snapshot/snap = disguises[name] + var/image/dummy = image(snap.icon, src, snap.icon_state) + dummy.overlays = snap.overlays + disguises2[name] = dummy + + var/entry_name + if(remote) + entry_name = show_radial_menu(usr, camera.eyeobj, disguises2) + else + entry_name = show_radial_menu(usr, src, disguises2) + var/datum/icon_snapshot/chosen = disguises[entry_name] if(chosen && vest && (remote || in_range(usr,src))) vest.SetDisguise(chosen) From d1008122daccf80dcbe1dddd28e6ea2989586b29 Mon Sep 17 00:00:00 2001 From: Ghommie Date: Sun, 23 Jun 2019 06:33:27 +0200 Subject: [PATCH 2/2] indention bested me. --- code/modules/antagonists/abductor/machinery/console.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 3e4984b554..52bda50b86 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -127,7 +127,7 @@ vest.flip_mode() /obj/machinery/abductor/console/proc/SelectDisguise(remote = FALSE) -var/list/disguises2 = list() + var/list/disguises2 = list() for(var/name in disguises) var/datum/icon_snapshot/snap = disguises[name] var/image/dummy = image(snap.icon, src, snap.icon_state)