Fix a handful of ghost/admin verbs

This commit is contained in:
Chompstation Bot
2021-07-07 18:39:12 +00:00
parent 7e10238662
commit b22cc8df95
3 changed files with 2008 additions and 19 deletions

View File

@@ -1570,9 +1570,16 @@
var/mob/M = locate(href_list["sendmob"]) var/mob/M = locate(href_list["sendmob"])
if(!M) if(!M)
return return
var/area/A = tgui_input_list(usr, "Pick an area:", "Send Mob", return_sorted_areas())
var/list/areachoices = return_sorted_areas()
var/choice = tgui_input_list(usr, "Pick an area:", "Send Mob", areachoices)
if(!choice)
return
var/area/A = areachoices[choice]
if(!A) if(!A)
return return
M.on_mob_jump() M.on_mob_jump()
M.forceMove(pick(get_area_turfs(A))) M.forceMove(pick(get_area_turfs(A)))
var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]" var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]"

View File

@@ -4,25 +4,32 @@
/mob/observer/dead/on_mob_jump() /mob/observer/dead/on_mob_jump()
following = null following = null
/client/proc/Jump() /client/proc/Jump(areaname as null|anything in return_sorted_areas())
set name = "Jump to Area" set name = "Jump to Area"
set desc = "Area to jump to" set desc = "Area to jump to"
set category = "Admin" set category = "Admin"
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
return return
if(config.allow_admin_jump) if(!config.allow_admin_jump)
var/area/A = tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())
if(!A)
return
usr.on_mob_jump()
usr.forceMove(pick(get_area_turfs(A)))
log_admin("[key_name(usr)] jumped to [A]")
message_admins("[key_name_admin(usr)] jumped to [A]", 1)
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
else
tgui_alert_async(usr, "Admin jumping disabled") tgui_alert_async(usr, "Admin jumping disabled")
return
var/area/A
if(areaname)
A = return_sorted_areas()[areaname]
else
A = tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())
if(!A)
return
usr.on_mob_jump()
usr.forceMove(pick(get_area_turfs(A)))
log_admin("[key_name(usr)] jumped to [A]")
message_admins("[key_name_admin(usr)] jumped to [A]", 1)
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(var/turf/T in world) /client/proc/jumptoturf(var/turf/T in world)
set name = "Jump to Turf" set name = "Jump to Turf"
@@ -40,7 +47,7 @@
return return
/// Verb wrapper around do_jumptomob() /// Verb wrapper around do_jumptomob()
/client/proc/jumptomob() /client/proc/jumptomob(mob as null|anything in mob_list)
set category = "Admin" set category = "Admin"
set name = "Jump to Mob" set name = "Jump to Mob"
set popup_menu = FALSE //VOREStation Edit - Declutter. set popup_menu = FALSE //VOREStation Edit - Declutter.
@@ -48,16 +55,16 @@
if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT)) if(!check_rights(R_ADMIN|R_MOD|R_DEBUG|R_EVENT))
return return
var/mob/M = tgui_input_list(usr, "Pick a mob:", "Jump to Mob", mob_list) do_jumptomob(mob)
if(!M) // Cancelled
return
do_jumptomob(M)
/// Performs the jumps /// Performs the jumps, also called from admin Topic() for JMP links
/client/proc/do_jumptomob(var/mob/M) /client/proc/do_jumptomob(var/mob/M)
if(!config.allow_admin_jump) if(!config.allow_admin_jump)
tgui_alert_async(usr, "Admin jumping disabled") tgui_alert_async(usr, "Admin jumping disabled")
return return
if(!M)
M = tgui_input_list(usr, "Pick a mob:", "Jump to Mob", mob_list)
if(!M) if(!M)
return return

File diff suppressed because it is too large Load Diff