cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7840 from VOREStation/aro-rigrcd

Browse Source 
Fix mounted RCD with radial menu
This commit is contained in:
Aronai Sieyes
2020-05-13 17:14:06 -04:00
committed by GitHub
parent e34081ccf8 7c2698cc7d
commit 483f1bb62c
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/game/objects/items/weapons/RCD_vr.dm
View File

@@ -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)