mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-07-18 11:44:05 +01:00
[MIRROR] fix wrong table usage for admin syncs (#12401)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
901c9e347b
commit
b5bc8fb612
@@ -15,21 +15,25 @@
|
||||
tgui_alert_async(usr, "Admin jumping disabled")
|
||||
return
|
||||
|
||||
var/area/A
|
||||
var/area/target_area
|
||||
|
||||
if(areaname)
|
||||
A = return_sorted_areas()[areaname]
|
||||
target_area = return_sorted_areas()[areaname]
|
||||
else
|
||||
A = return_sorted_areas()[tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())]
|
||||
target_area = return_sorted_areas()[tgui_input_list(src, "Pick an area:", "Jump to Area", return_sorted_areas())]
|
||||
|
||||
if(!A)
|
||||
if(!target_area)
|
||||
return
|
||||
|
||||
usr.on_mob_jump()
|
||||
usr.reset_perspective(usr)
|
||||
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)
|
||||
mob.on_mob_jump()
|
||||
mob.reset_perspective(mob)
|
||||
var/turf/target = pick(get_area_turfs(target_area))
|
||||
if(!target)
|
||||
to_chat(src, span_warning("Selected area [target_area] has no turfs!"))
|
||||
return
|
||||
mob.forceMove(target)
|
||||
log_admin("[key_name(src)] jumped to [target_area]")
|
||||
message_admins("[key_name_admin(src)] jumped to [target_area]")
|
||||
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)
|
||||
@@ -39,7 +43,7 @@
|
||||
return
|
||||
if(CONFIG_GET(flag/allow_admin_jump))
|
||||
log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
|
||||
message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1)
|
||||
message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
|
||||
usr.on_mob_jump()
|
||||
usr.reset_perspective(usr)
|
||||
usr.forceMove(T)
|
||||
|
||||
Reference in New Issue
Block a user