mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 20:45:28 +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:
@@ -1,10 +1,7 @@
|
||||
/// An admin verb to view all circuits, plus useful information
|
||||
/datum/admins/proc/view_all_circuits()
|
||||
set category = "Admin.Game"
|
||||
set name = "View All Circuits"
|
||||
|
||||
ADMIN_VERB(view_all_circuits, R_ADMIN, "View All Circuits", "List all circuits in the game.", ADMIN_CATEGORY_GAME)
|
||||
var/static/datum/circuit_admin_panel/circuit_admin_panel = new
|
||||
circuit_admin_panel.ui_interact(usr)
|
||||
circuit_admin_panel.ui_interact(user.mob)
|
||||
|
||||
/datum/circuit_admin_panel
|
||||
|
||||
@@ -66,9 +63,10 @@
|
||||
usr.client?.debug_variables(circuit)
|
||||
if ("open_circuit")
|
||||
circuit.ui_interact(usr)
|
||||
|
||||
if ("open_player_panel")
|
||||
var/datum/mind/inserter = circuit.inserter_mind?.resolve()
|
||||
usr.client?.holder?.show_player_panel(inserter?.current)
|
||||
SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/show_player_panel, inserter?.current)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -220,30 +220,24 @@ GLOBAL_LIST_INIT(circuit_dupe_whitelisted_types, list(
|
||||
rel_x = component_data["rel_x"]
|
||||
rel_y = component_data["rel_y"]
|
||||
|
||||
/client/proc/load_circuit()
|
||||
set name = "Load Circuit"
|
||||
set category = "Admin.Fun"
|
||||
|
||||
if(!check_rights(R_VAREDIT))
|
||||
return
|
||||
|
||||
ADMIN_VERB(load_circuit, R_VAREDIT, "Load Circuit", "Loads a circuit from a file or direct input.", ADMIN_CATEGORY_FUN)
|
||||
var/list/errors = list()
|
||||
|
||||
var/option = alert(usr, "Load by file or direct input?", "Load by file or string", "File", "Direct Input")
|
||||
var/option = alert(user, "Load by file or direct input?", "Load by file or string", "File", "Direct Input")
|
||||
var/txt
|
||||
switch(option)
|
||||
if("File")
|
||||
txt = file2text(input(usr, "Input File") as null|file)
|
||||
txt = file2text(input(user, "Input File") as null|file)
|
||||
if("Direct Input")
|
||||
txt = input(usr, "Input JSON", "Input JSON") as text|null
|
||||
txt = input(user, "Input JSON", "Input JSON") as text|null
|
||||
|
||||
if(!txt)
|
||||
return
|
||||
|
||||
var/obj/item/integrated_circuit/loaded/circuit = new(mob.drop_location())
|
||||
var/obj/item/integrated_circuit/loaded/circuit = new(user.mob.drop_location())
|
||||
circuit.load_circuit_data(txt, errors)
|
||||
|
||||
if(length(errors))
|
||||
to_chat(src, span_warning("The following errors were found whilst compiling the circuit data:"))
|
||||
to_chat(user, span_warning("The following errors were found whilst compiling the circuit data:"))
|
||||
for(var/error in errors)
|
||||
to_chat(src, span_warning(error))
|
||||
to_chat(user, span_warning(error))
|
||||
|
||||
Reference in New Issue
Block a user