From 7c2698cc7d0561cb9ab28a85cf985877a24985fa Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 13 May 2020 16:56:17 -0400 Subject: [PATCH] Fix mounted RCD with radial menu --- code/game/objects/items/weapons/RCD_vr.dm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RCD_vr.dm b/code/game/objects/items/weapons/RCD_vr.dm index f4089e9b9c..65786bc7bc 100644 --- a/code/game/objects/items/weapons/RCD_vr.dm +++ b/code/game/objects/items/weapons/RCD_vr.dm @@ -90,6 +90,22 @@ return FALSE return TRUE +// Mounted one is more complex +/obj/item/weapon/rcd/electric/mounted/rig/check_menu(mob/living/user) + if(!istype(user)) + world.log << "One" + return FALSE + if(user.incapacitated()) + world.log << "Two" + return FALSE + + var/obj/item/rig_module/device/D = loc + if(!istype(D) || !D?.holder?.wearer == user) + world.log << "Three" + return FALSE + + return TRUE + /obj/item/weapon/rcd/attack_self(mob/living/user) ..() var/list/choices = list( @@ -118,7 +134,7 @@ "Change Window Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "windowtype") ) */ - var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE) + var/choice = show_radial_menu(user, user, choices, custom_check = CALLBACK(src, .proc/check_menu, user), tooltips = TRUE) if(!check_menu(user)) return switch(choice)