diff --git a/code/modules/admin/admin_verbs_vr.dm b/code/modules/admin/admin_verbs_vr.dm index 9255f6abe8..6d92fde40b 100644 --- a/code/modules/admin/admin_verbs_vr.dm +++ b/code/modules/admin/admin_verbs_vr.dm @@ -4,8 +4,9 @@ set desc = "Makes something orbit around something else." set popup_menu = FALSE - if(!holder) return - + if(!check_rights(R_FUN)) + return + var/center var/atom/movable/orbiter var/input diff --git a/code/modules/admin/verbs/adminjump.dm b/code/modules/admin/verbs/adminjump.dm index 95442b0f82..8a5d0ae68b 100644 --- a/code/modules/admin/verbs/adminjump.dm +++ b/code/modules/admin/verbs/adminjump.dm @@ -124,15 +124,17 @@ else tgui_alert_async(usr, "Admin jumping disabled") -/client/proc/Getmob() +/client/proc/Getmob(mob/living/M as mob) //VOREStation Edit set category = "Admin" set name = "Get Mob" set desc = "Mob to teleport" + set popup_menu = TRUE //VOREStation Edit if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) return if(config.allow_admin_jump) - var/mob/M = tgui_input_list(usr, "Pick a mob:", "Get Mob", mob_list) + if(!M) //VOREStation Edit + M = tgui_input_list(usr, "Pick a mob:", "Get Mob", mob_list) //VOREStation Edit if(!M) return log_admin("[key_name(usr)] jumped [key_name(M)] to them")