mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 21:18:37 +01:00
Administrator Cherrypick (#27405)
* Admin Verb Datums MkIII | Now with functional command bar (#82511) * Modular stuffs * Put some admin jump verbs back into the context menu | sorts area jump list again (#82647) ## About The Pull Request See title. ## Why It's Good For The Game Some admins wanted all the jump verbs back, aswell as making them not AGhost you. Also make the Jump To Area verb use a sorted list again * Hey what if admins were allowed to use the player panel (#82682) Re-adds the player panel verb to the verb panel. * Controller Overview UI (#82739) * Fixes a minor spelling mistake on the admin panel/verb list (#82747) ## About The Pull Request Corrects `inisimin` to `invisimin`. This addresses #82728, but only fixes one of the two issues mentioned ## Why It's Good For The Game -1 spelling mistake ## Changelog 🆑 spellcheck: 'inisimin' verb corrected to 'invisimin' /🆑 * Player Panel-age (#82757) * Admin Forced Mob Rename and Preference Update (#82715) --------- Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com> Co-authored-by: chel <64568243+iliyaxox@users.noreply.github.com>
This commit is contained in:
SpaceLoveSs13
co-authored by
Zephyr
Useroth
chel
Zephyr
Useroth
chel
parent
8ecd4bf5b1
commit
a9ff046352
@@ -1,114 +1,66 @@
|
||||
/client/proc/jumptoarea(area/A in get_sorted_areas())
|
||||
set name = "Jump to Area"
|
||||
set desc = "Area to jump to"
|
||||
set category = "Admin.Game"
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
ADMIN_VERB(jump_to_area, R_ADMIN, "Jump To Area", "Jumps to the specified area.", ADMIN_CATEGORY_GAME, area/target in get_sorted_areas())
|
||||
var/turf/drop_location
|
||||
top_level:
|
||||
for(var/list/zlevel_turfs as anything in target.get_zlevel_turf_lists())
|
||||
for(var/turf/area_turf as anything in zlevel_turfs)
|
||||
if(area_turf.density)
|
||||
continue
|
||||
drop_location = area_turf
|
||||
break top_level
|
||||
|
||||
if(isnull(drop_location))
|
||||
to_chat(user, span_warning("No valid drop location found in the area!"))
|
||||
return
|
||||
|
||||
if(!A)
|
||||
return
|
||||
user.mob.abstract_move(drop_location)
|
||||
log_admin("[key_name(user)] jumped to [AREACOORD(drop_location)]")
|
||||
message_admins("[key_name_admin(user)] jumped to [AREACOORD(drop_location)]")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Area")
|
||||
|
||||
var/list/turfs = list()
|
||||
for (var/list/zlevel_turfs as anything in A.get_zlevel_turf_lists())
|
||||
for (var/turf/area_turf as anything in zlevel_turfs)
|
||||
if(!area_turf.density)
|
||||
turfs.Add(area_turf)
|
||||
|
||||
if(length(turfs))
|
||||
var/turf/T = pick(turfs)
|
||||
usr.forceMove(T)
|
||||
log_admin("[key_name(usr)] jumped to [AREACOORD(T)]")
|
||||
message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Area")
|
||||
else
|
||||
to_chat(src, "Nowhere to jump to!", confidential = TRUE)
|
||||
return
|
||||
|
||||
|
||||
/client/proc/jumptoturf(turf/T in world)
|
||||
set name = "Jump to Turf"
|
||||
set category = "Admin.Game"
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
|
||||
log_admin("[key_name(usr)] jumped to [AREACOORD(T)]")
|
||||
message_admins("[key_name_admin(usr)] jumped to [AREACOORD(T)]")
|
||||
usr.forceMove(T)
|
||||
ADMIN_VERB_AND_CONTEXT_MENU(jump_to_turf, R_ADMIN, "Jump To Turf", "Jump to any turf in the game. This will lag your client.", ADMIN_CATEGORY_GAME, turf/locale in world)
|
||||
log_admin("[key_name(user)] jumped to [AREACOORD(locale)]")
|
||||
message_admins("[key_name_admin(user)] jumped to [AREACOORD(locale)]")
|
||||
user.mob.abstract_move(locale)
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Turf")
|
||||
return
|
||||
|
||||
/client/proc/jumptomob(mob/M in GLOB.mob_list)
|
||||
set category = "Admin.Game"
|
||||
set name = "Jump to Mob"
|
||||
ADMIN_VERB_AND_CONTEXT_MENU(jump_to_mob, R_ADMIN, "Jump To Mob", "Jump to any mob in the game.", ADMIN_CATEGORY_GAME, mob/target in world)
|
||||
user.mob.abstract_move(target.loc)
|
||||
log_admin("[key_name(user)] jumped to [key_name(target)]")
|
||||
message_admins("[key_name_admin(user)] jumped to [ADMIN_LOOKUPFLW(target)] at [AREACOORD(target)]")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Mob")
|
||||
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
ADMIN_VERB(jump_to_coord, R_ADMIN, "Jump To Coordinate", "Jump to a specific coordinate in the game world.", ADMIN_CATEGORY_GAME, cx as num, cy as num, cz as num)
|
||||
var/turf/where_we_droppin = locate(cx, cy, cz)
|
||||
if(isnull(where_we_droppin))
|
||||
to_chat(user, span_warning("Invalid coordinates."))
|
||||
return
|
||||
|
||||
log_admin("[key_name(usr)] jumped to [key_name(M)]")
|
||||
message_admins("[key_name_admin(usr)] jumped to [ADMIN_LOOKUPFLW(M)] at [AREACOORD(M)]")
|
||||
if(src.mob)
|
||||
var/mob/A = src.mob
|
||||
var/turf/T = get_turf(M)
|
||||
if(T && isturf(T))
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Mob")
|
||||
A.forceMove(M.loc)
|
||||
else
|
||||
to_chat(A, "This mob is not located in the game world.", confidential = TRUE)
|
||||
user.mob.abstract_move(where_we_droppin)
|
||||
message_admins("[key_name_admin(user)] jumped to coordinates [cx], [cy], [cz]")
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Coordiate")
|
||||
|
||||
/client/proc/jumptocoord(tx as num, ty as num, tz as num)
|
||||
set category = "Admin.Game"
|
||||
set name = "Jump to Coordinate"
|
||||
|
||||
if (!holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
|
||||
if(src.mob)
|
||||
var/mob/A = src.mob
|
||||
var/turf/T = locate(tx,ty,tz)
|
||||
A.forceMove(T)
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Coordiate")
|
||||
message_admins("[key_name_admin(usr)] jumped to coordinates [tx], [ty], [tz]")
|
||||
|
||||
/client/proc/jumptokey()
|
||||
set category = "Admin.Game"
|
||||
set name = "Jump to Key"
|
||||
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
ADMIN_VERB(jump_to_key, R_ADMIN, "Jump To Key", "Jump to a specific player.", ADMIN_CATEGORY_GAME)
|
||||
if(!isobserver(user.mob))
|
||||
SSadmin_verbs.dynamic_invoke_verb(user, /datum/admin_verb/admin_ghost)
|
||||
|
||||
var/list/keys = list()
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
keys += M.client
|
||||
var/client/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sort_key(keys)
|
||||
var/client/selection = input(user, "Please, select a player!", "Admin Jumping") as null|anything in sort_key(keys)
|
||||
if(!selection)
|
||||
to_chat(src, "No keys found.", confidential = TRUE)
|
||||
to_chat(user, "No keys found.", confidential = TRUE)
|
||||
return
|
||||
var/mob/M = selection.mob
|
||||
log_admin("[key_name(usr)] jumped to [key_name(M)]")
|
||||
message_admins("[key_name_admin(usr)] jumped to [ADMIN_LOOKUPFLW(M)]")
|
||||
|
||||
usr.forceMove(M.loc)
|
||||
|
||||
log_admin("[key_name(user)] jumped to [key_name(M)]")
|
||||
message_admins("[key_name_admin(user)] jumped to [ADMIN_LOOKUPFLW(M)]")
|
||||
user.mob.abstract_move(M.loc)
|
||||
BLACKBOX_LOG_ADMIN_VERB("Jump To Key")
|
||||
|
||||
/client/proc/Getmob(mob/M in GLOB.mob_list - GLOB.dummy_mob_list)
|
||||
set category = "Admin.Game"
|
||||
set name = "Get Mob"
|
||||
set desc = "Mob to teleport"
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
|
||||
var/atom/loc = get_turf(usr)
|
||||
M.admin_teleport(loc)
|
||||
ADMIN_VERB_AND_CONTEXT_MENU(get_mob, R_ADMIN, "Get Mob", "Teleport a mob to your location.", ADMIN_CATEGORY_GAME, mob/target in world)
|
||||
var/atom/loc = get_turf(user.mob)
|
||||
target.admin_teleport(loc)
|
||||
BLACKBOX_LOG_ADMIN_VERB("Get Mob")
|
||||
|
||||
|
||||
/// Proc to hook user-enacted teleporting behavior and keep logging of the event.
|
||||
/atom/movable/proc/admin_teleport(atom/new_location)
|
||||
if(isnull(new_location))
|
||||
@@ -126,56 +78,41 @@
|
||||
admin_ticket_log(src, msg)
|
||||
return ..()
|
||||
|
||||
|
||||
/client/proc/Getkey()
|
||||
set category = "Admin.Game"
|
||||
set name = "Get Key"
|
||||
set desc = "Key to teleport"
|
||||
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
|
||||
ADMIN_VERB(get_key, R_ADMIN, "Get Key", "Teleport the player with the provided key to you.", ADMIN_CATEGORY_GAME)
|
||||
var/list/keys = list()
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
keys += M.client
|
||||
var/client/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sort_key(keys)
|
||||
var/client/selection = input(user, "Please, select a player!", "Admin Jumping") as null|anything in sort_key(keys)
|
||||
if(!selection)
|
||||
return
|
||||
var/mob/M = selection.mob
|
||||
|
||||
if(!M)
|
||||
return
|
||||
log_admin("[key_name(usr)] teleported [key_name(M)]")
|
||||
var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(M)]"
|
||||
log_admin("[key_name(user)] teleported [key_name(M)]")
|
||||
var/msg = "[key_name_admin(user)] teleported [ADMIN_LOOKUPFLW(M)]"
|
||||
message_admins(msg)
|
||||
admin_ticket_log(M, msg)
|
||||
if(M)
|
||||
M.forceMove(get_turf(usr))
|
||||
usr.forceMove(M.loc)
|
||||
M.forceMove(get_turf(user))
|
||||
BLACKBOX_LOG_ADMIN_VERB("Get Key")
|
||||
|
||||
/client/proc/sendmob(mob/jumper in sort_mobs())
|
||||
set category = "Admin.Game"
|
||||
set name = "Send Mob"
|
||||
if(!src.holder)
|
||||
to_chat(src, "Only administrators may use this command.", confidential = TRUE)
|
||||
return
|
||||
ADMIN_VERB_AND_CONTEXT_MENU(send_mob, R_ADMIN, "Send Mob", "Teleport the specified mob to an area of your choosing.", ADMIN_CATEGORY_GAME, mob/jumper)
|
||||
var/list/sorted_areas = get_sorted_areas()
|
||||
if(!length(sorted_areas))
|
||||
to_chat(src, "No areas found.", confidential = TRUE)
|
||||
to_chat(user, "No areas found.", confidential = TRUE)
|
||||
return
|
||||
var/area/target_area = tgui_input_list(src, "Pick an area", "Send Mob", sorted_areas)
|
||||
var/area/target_area = tgui_input_list(user, "Pick an area", "Send Mob", sorted_areas)
|
||||
if(isnull(target_area))
|
||||
return
|
||||
if(!istype(target_area))
|
||||
return
|
||||
var/list/turfs = get_area_turfs(target_area)
|
||||
if(length(turfs) && jumper.forceMove(pick(turfs)))
|
||||
log_admin("[key_name(usr)] teleported [key_name(jumper)] to [AREACOORD(jumper)]")
|
||||
var/msg = "[key_name_admin(usr)] teleported [ADMIN_LOOKUPFLW(jumper)] to [AREACOORD(jumper)]"
|
||||
log_admin("[key_name(user)] teleported [key_name(jumper)] to [AREACOORD(jumper)]")
|
||||
var/msg = "[key_name_admin(user)] teleported [ADMIN_LOOKUPFLW(jumper)] to [AREACOORD(jumper)]"
|
||||
message_admins(msg)
|
||||
admin_ticket_log(jumper, msg)
|
||||
else
|
||||
to_chat(src, "Failed to move mob to a valid location.", confidential = TRUE)
|
||||
to_chat(user, "Failed to move mob to a valid location.", confidential = TRUE)
|
||||
BLACKBOX_LOG_ADMIN_VERB("Send Mob")
|
||||
|
||||
Reference in New Issue
Block a user