mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 05:00:55 +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:
co-authored by
Zephyr
Useroth
chel
parent
8ecd4bf5b1
commit
a9ff046352
+30
-96
@@ -171,8 +171,7 @@
|
||||
to_chat(usr, "[shuttle_console] was [shuttle_console.admin_controlled ? "locked" : "unlocked"].", confidential = TRUE)
|
||||
|
||||
else if(href_list["delay_round_end"])
|
||||
// Permissions are checked in delay_round_end
|
||||
delay_round_end()
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/delay_round_end)
|
||||
|
||||
else if(href_list["undelay_round_end"])
|
||||
if(!check_rights(R_SERVER))
|
||||
@@ -767,21 +766,10 @@
|
||||
our_mob.AIize(our_mob.client, move)
|
||||
|
||||
else if(href_list["makerobot"])
|
||||
if(!check_rights(R_SPAWN))
|
||||
return
|
||||
|
||||
var/mob/our_mob = locate(href_list["makerobot"])
|
||||
if(!istype(our_mob))
|
||||
return
|
||||
if(iscyborg(our_mob))
|
||||
to_chat(usr, "That's already a cyborg.", confidential = TRUE)
|
||||
return
|
||||
|
||||
usr.client.cmd_admin_robotize(our_mob)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/cmd_admin_robotize, locate(href_list["makerobot"]))
|
||||
|
||||
else if(href_list["adminplayeropts"])
|
||||
var/mob/M = locate(href_list["adminplayeropts"])
|
||||
show_player_panel(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/show_player_panel, locate(href_list["adminplayeropts"]))
|
||||
|
||||
else if(href_list["ppbyckey"])
|
||||
var/target_ckey = href_list["ppbyckey"]
|
||||
@@ -796,7 +784,7 @@
|
||||
return
|
||||
|
||||
to_chat(usr, span_notice("Jumping to [target_ckey]'s new mob: [target_mob]!"))
|
||||
show_player_panel(target_mob)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/show_player_panel, target_mob)
|
||||
|
||||
else if(href_list["adminplayerobservefollow"])
|
||||
if(!isobserver(usr) && !check_rights(R_ADMIN))
|
||||
@@ -813,20 +801,13 @@
|
||||
AM.forceMove(get_turf(usr))
|
||||
|
||||
else if(href_list["adminplayerobservecoodjump"])
|
||||
if(!isobserver(usr) && !check_rights(R_ADMIN))
|
||||
return
|
||||
if(isnewplayer(usr))
|
||||
return
|
||||
|
||||
var/x = text2num(href_list["X"])
|
||||
var/y = text2num(href_list["Y"])
|
||||
var/z = text2num(href_list["Z"])
|
||||
|
||||
var/client/C = usr.client
|
||||
if(!isobserver(usr))
|
||||
C.admin_ghost()
|
||||
sleep(0.2 SECONDS)
|
||||
C.jumptocoord(x,y,z)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(
|
||||
usr,
|
||||
/datum/admin_verb/jump_to_coord,
|
||||
text2num(href_list["X"]),
|
||||
text2num(href_list["Y"]),
|
||||
text2num(href_list["Z"]),
|
||||
)
|
||||
|
||||
else if(href_list["adminchecklaws"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1026,15 +1007,7 @@
|
||||
give_admin_popup(target, owner, message)
|
||||
|
||||
else if(href_list["adminsmite"])
|
||||
if(!check_rights(R_ADMIN|R_FUN))
|
||||
return
|
||||
|
||||
var/mob/living/carbon/human/H = locate(href_list["adminsmite"]) in GLOB.mob_list
|
||||
if(!H || !istype(H))
|
||||
to_chat(usr, "This can only be used on instances of type /mob/living/carbon/human", confidential = TRUE)
|
||||
return
|
||||
|
||||
usr.client.smite(H)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/admin_smite, locate(href_list["adminsmite"]))
|
||||
|
||||
else if(href_list["CentComReply"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1063,42 +1036,21 @@
|
||||
var/obj/item/station_charter/charter = locate(href_list["reject_custom_name"])
|
||||
if(istype(charter))
|
||||
charter.reject_proposed(usr)
|
||||
else if(href_list["jumpto"])
|
||||
if(!isobserver(usr) && !check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/mob/M = locate(href_list["jumpto"])
|
||||
usr.client.jumptomob(M)
|
||||
else if(href_list["jumpto"])
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/jump_to_mob, locate(href_list["jumpto"]))
|
||||
|
||||
else if(href_list["getmob"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
if(tgui_alert(usr, "Confirm?", "Message", list("Yes", "No")) != "Yes")
|
||||
return
|
||||
var/mob/M = locate(href_list["getmob"])
|
||||
usr.client.Getmob(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/get_mob, locate(href_list["getmob"]))
|
||||
|
||||
else if(href_list["sendmob"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/mob/M = locate(href_list["sendmob"])
|
||||
usr.client.sendmob(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/send_mob, locate(href_list["sendmob"]))
|
||||
|
||||
else if(href_list["narrateto"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/mob/M = locate(href_list["narrateto"])
|
||||
usr.client.cmd_admin_direct_narrate(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/cmd_admin_direct_narrate, locate(href_list["narrateto"]))
|
||||
|
||||
else if(href_list["subtlemessage"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/mob/M = locate(href_list["subtlemessage"])
|
||||
usr.client.cmd_admin_subtle_message(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/cmd_admin_subtle_message, locate(href_list["subtlemessage"]))
|
||||
|
||||
else if(href_list["playsoundto"])
|
||||
if(!check_rights(R_SOUND))
|
||||
@@ -1107,7 +1059,7 @@
|
||||
var/mob/M = locate(href_list["playsoundto"])
|
||||
var/S = input("", "Select a sound file",) as null|sound
|
||||
if(S)
|
||||
usr.client.play_direct_mob_sound(S, M)
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr.client, /datum/admin_verb/play_direct_mob_sound, S, M)
|
||||
|
||||
else if(href_list["individuallog"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1146,7 +1098,8 @@
|
||||
else
|
||||
D.traitor_panel()
|
||||
else
|
||||
show_traitor_panel(M)
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/show_traitor_panel, M)
|
||||
return
|
||||
|
||||
else if(href_list["skill"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1166,17 +1119,11 @@
|
||||
else
|
||||
to_chat(usr, "This can only be used on instances of type /mob and /mind", confidential = TRUE)
|
||||
return
|
||||
show_skill_panel(target_mind)
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/show_skill_panel, target_mind)
|
||||
return
|
||||
|
||||
else if(href_list["borgpanel"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
|
||||
var/mob/M = locate(href_list["borgpanel"])
|
||||
if(!iscyborg(M))
|
||||
to_chat(usr, "This can only be used on cyborgs", confidential = TRUE)
|
||||
else
|
||||
open_borgopanel(M)
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/borg_panel, locate(href_list["borgpanel"]))
|
||||
|
||||
else if(href_list["initmind"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1348,9 +1295,7 @@
|
||||
return
|
||||
|
||||
else if(href_list["check_antagonist"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
usr.client.check_antagonists()
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/check_antagonists)
|
||||
|
||||
else if(href_list["kick_all_from_lobby"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1420,7 +1365,7 @@
|
||||
log_admin("[key_name(usr)] turned a Lag Switch measure at index ([switch_index]) [LAZYACCESS(SSlag_switch.measures, switch_index) ? "ON" : "OFF"]")
|
||||
message_admins("[key_name_admin(usr)] turned a Lag Switch measure [LAZYACCESS(SSlag_switch.measures, switch_index) ? "ON" : "OFF"]")
|
||||
|
||||
src.show_lag_switch_panel()
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/lag_switch_panel)
|
||||
|
||||
else if(href_list["change_lag_switch_option"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1449,7 +1394,7 @@
|
||||
log_admin("[key_name(usr)] set the Lag Switch slowmode cooldown to [new_num] seconds.")
|
||||
message_admins("[key_name_admin(usr)] set the Lag Switch slowmode cooldown to [new_num] seconds.")
|
||||
|
||||
src.show_lag_switch_panel()
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/lag_switch_panel)
|
||||
|
||||
else if(href_list["viewruntime"])
|
||||
var/datum/error_viewer/error_viewer = locate(href_list["viewruntime"])
|
||||
@@ -1565,13 +1510,7 @@
|
||||
toggle_id_ctf(usr, CTF_GHOST_CTF_GAME_ID)
|
||||
|
||||
else if(href_list["rebootworld"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
var/confirm = tgui_alert(usr,"Are you sure you want to reboot the server?", "Confirm Reboot", list("Yes", "No"))
|
||||
if(confirm == "No")
|
||||
return
|
||||
if(confirm == "Yes")
|
||||
restart()
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/restart)
|
||||
|
||||
else if(href_list["check_teams"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1790,9 +1729,7 @@
|
||||
return remove_tagged_datum(datum_to_remove)
|
||||
|
||||
else if(href_list["show_tags"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
return
|
||||
return display_tags()
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/display_tags)
|
||||
|
||||
else if(href_list["mark_datum"])
|
||||
if(!check_rights(R_ADMIN))
|
||||
@@ -1848,7 +1785,4 @@
|
||||
web_sound(usr, link_url, credit)
|
||||
|
||||
else if(href_list["debug_z_levels"])
|
||||
if(!check_rights(R_DEBUG))
|
||||
return
|
||||
|
||||
owner.debug_z_levels()
|
||||
return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/debug_z_levels)
|
||||
|
||||
Reference in New Issue
Block a user