"} + span_bold("Rudimentary transformation:") + span_normal("
These transformations only create a new mob type and copy stuff over. They do not take into account MMIs and similar mob-specific things. The buttons in 'Transformations' are preferred, when possible.") + {"
- Observer | - \[ Xenos: Larva - Drone - Hunter - Sentinel - Queen \] | - \[ Crew: Human - Unathi - Tajaran - Skrell \] | \[ - Nymph - Diona \] | - \[ slime: Baby, - Adult \] - Monkey | - Cyborg | - Cat | - Runtime | - Corgi | - Ian | - Crab | - Coffee | - \[ Construct: Armoured , - Builder , - Wraith \] - Shade + Observer | + \[ Xenos: Larva + Drone + Hunter + Sentinel + Queen \] | + \[ Crew: Human + Unathi + Tajaran + Skrell \] | \[ + Nymph + Diona \] | + \[ slime: Baby, + Adult \] + Monkey | + Cyborg | + Cat | + Runtime | + Corgi | + Ian | + Crab | + Coffee | + \[ Construct: Armoured , + Builder , + Wraith \] + Shade
"} body += {"
"} + span_bold("Other actions:") + {"
- Forcesay + Forcesay "} - if (M.client) + if (player.client) body += {" | - Thunderdome 1 | - Thunderdome 2 | - Thunderdome Admin | - Thunderdome Observer | + Thunderdome 1 | + Thunderdome 2 | + Thunderdome Admin | + Thunderdome Observer | "} // language toggles body += "
" + span_bold("Languages:") + "
" @@ -233,17 +226,17 @@ GLOBAL_VAR_INIT(floorIsLava, 0) if(!(L.flags & INNATE)) if(!f) body += " | " else f = 0 - if(L in M.languages) + if(L in player.languages) k = span_green(k) - body += "[k]" + body += "[k]" else k = span_red(k) - body += "[k]" + body += "[k]" body += {"
"} - var/datum/browser/popup = new(owner, "adminplayeropts", "Edit Player", 550, 515) - popup.add_head_content("
Refresh
" + if(LAZYLEN(tagged_datums)) + for(var/datum/iter_datum as anything in tagged_datums) + index++ + var/specific_info + + if(isnull(iter_datum)) + dat += "\t[index]: Null reference - Check runtime logs!" + stack_trace("Null datum found in tagged datum menu! User: [user]") + continue + else if(iscarbon(iter_datum)) + var/mob/living/carbon/resolved_carbon = iter_datum + specific_info = "[TAG_CARBON_HEALTH(resolved_carbon)] | [AREACOORD(resolved_carbon)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(isliving(iter_datum)) + var/mob/living/resolved_living = iter_datum + specific_info = "[TAG_SIMPLE_HEALTH(resolved_living)] | [AREACOORD(resolved_living)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(ismob(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_PP(iter_datum)] [ADMIN_FLW(iter_datum)]" + else if(ismovable(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_FLW(iter_datum)]" + else if(isatom(iter_datum)) + var/atom/resolved_atom = iter_datum // needed for ADMIN_JMP + specific_info = "[AREACOORD(resolved_atom)] [ADMIN_JMP(resolved_atom)]" + else if(istype(iter_datum, /datum/controller/subsystem)) + var/datum/controller/subsystem/resolved_subsystem = iter_datum + specific_info = "[resolved_subsystem.stat_entry()]" + // else, it's just a /datum + + dat += "\t[index]: [iter_datum] | [specific_info] | [ADMIN_VV(iter_datum)] | [TAG_DEL(iter_datum)] | [iter_datum == marked_datum ? "Marked" : TAG_MARK(iter_datum)] " + dat += "\t(" + span_bold(span_normal("[iter_datum.type])")) + else + dat += "No datums tagged :(" + + var/datum/browser/browser = new(user.mob, "tag", "Tag Menu", 800, 480) + browser.set_content(dat.Join("
")) + browser.open() + +#undef TAG_DEL +#undef TAG_MARK +#undef TAG_SIMPLE_HEALTH +#undef TAG_CARBON_HEALTH diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 102ea86368..4e2d1fe2bf 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1245,11 +1245,11 @@ return var/block=text2num(href_list["block"]) usr.client.cmd_admin_toggle_block(H,block) - show_player_panel(H) + SSadmin_verbs.dynamic_invoke_verb(usr.client, /datum/admin_verb/show_player_panel, H) else if(href_list["adminplayeropts"]) var/mob/M = locate(href_list["adminplayeropts"]) - show_player_panel(M) + SSadmin_verbs.dynamic_invoke_verb(usr.client, /datum/admin_verb/show_player_panel, M) else if(href_list["adminplayerobservejump"]) if(!check_rights(R_MOD|R_ADMIN|R_SERVER)) return //VOREStation Edit @@ -1958,7 +1958,7 @@ if(!M.add_language(lang2toggle)) to_chat(usr, span_filter_adminlog("Failed to add language '[lang2toggle]' from \the [M]!")) - show_player_panel(M) + SSadmin_verbs.dynamic_invoke_verb(usr.client, /datum/admin_verb/show_player_panel, M) else if(href_list["cryoplayer"]) if(!check_rights(R_ADMIN|R_EVENT)) return diff --git a/code/modules/admin/verbs/adminfun.dm b/code/modules/admin/verbs/adminfun.dm new file mode 100644 index 0000000000..32e53dffdb --- /dev/null +++ b/code/modules/admin/verbs/adminfun.dm @@ -0,0 +1,75 @@ +ADMIN_VERB(admin_explosion, R_ADMIN|R_FUN, "Explosion", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, atom/orignator as obj|mob|turf) + var/devastation = tgui_input_number(user, "Range of total devastation. -1 to none", text("Input"), min_value=-1) + if(devastation == null) + return + var/heavy = tgui_input_number(user, "Range of heavy impact. -1 to none", text("Input"), min_value=-1) + if(heavy == null) + return + var/light = tgui_input_number(user, "Range of light impact. -1 to none", text("Input"), min_value=-1) + if(light == null) + return + var/flash = tgui_input_number(user, "Range of flash. -1 to none", text("Input"), min_value=-1) + if(flash == null) + return + + if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1)) + if ((devastation > 20) || (heavy > 20) || (light > 20)) + if (tgui_alert(user, "Are you sure you want to do this? It will laaag.", "Confirmation", list("Yes", "No")) != "Yes") + return + + explosion(orignator, devastation, heavy, light, flash) + log_admin("[key_name(user)] created an explosion ([devastation],[heavy],[light],[flash]) at ([orignator.x],[orignator.y],[orignator.z])") + message_admins("[key_name_admin(user)] created an explosion ([devastation],[heavy],[light],[flash]) at ([orignator.x],[orignator.y],[orignator.z])", 1) + feedback_add_details("admin_verb","EXPL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +ADMIN_VERB(admin_emp, R_ADMIN|R_FUN, "EM Pulse", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, atom/orignator as obj|mob|turf) + var/heavy = tgui_input_number(user, "Range of heavy pulse.", text("Input")) + if(heavy == null) + return + var/med = tgui_input_number(user, "Range of medium pulse.", text("Input")) + if(med == null) + return + var/light = tgui_input_number(user, "Range of light pulse.", text("Input")) + if(light == null) + return + var/long = tgui_input_number(user, "Range of long pulse.", text("Input")) + if(long == null) + return + + if (heavy || med || light || long) + empulse(orignator, heavy, med, light, long) + log_admin("[key_name(user)] created an EM Pulse ([heavy],[med],[light],[long]) at ([orignator.x],[orignator.y],[orignator.z])") + message_admins("[key_name_admin(user)] created an EM PUlse ([heavy],[med],[light],[long]) at ([orignator.x],[orignator.y],[orignator.z])", 1) + feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +ADMIN_VERB(gib_them, (R_ADMIN|R_FUN), "Gib", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, mob/victim in mob_list) + var/confirm = tgui_alert(user, "You sure?", "Confirm", list("Yes", "No")) + if(confirm != "Yes") + return + //Due to the delay here its easy for something to have happened to the mob + if(!victim) + return + + log_admin("[key_name(user)] has gibbed [key_name(victim)]") + message_admins("[key_name_admin(user)] has gibbed [key_name_admin(victim)]", 1) + + if(isobserver(victim)) + gibs(victim.loc) + return + + victim.gib() + feedback_add_details("admin_verb","GIB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + +ADMIN_VERB(gib_self, R_HOLDER, "Gibself", "Give yourself the same treatment you give others.", ADMIN_CATEGORY_FUN) + var/confirm = tgui_alert(user, "You sure?", "Confirm", list("Yes", "No")) + if(!confirm) + return + if(confirm == "Yes") + if (isobserver(user.mob)) // so they don't spam gibs everywhere + return + else + user.mob.gib() + + log_admin("[key_name(user)] used gibself.") + message_admins(span_blue("[key_name_admin(user)] used gibself."), 1) + feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/change_appearance.dm b/code/modules/admin/verbs/change_appearance.dm index b796fdba9c..2e191cc1a3 100644 --- a/code/modules/admin/verbs/change_appearance.dm +++ b/code/modules/admin/verbs/change_appearance.dm @@ -9,7 +9,7 @@ if(!H) return log_and_message_admins("is altering the appearance of [H].") - H.change_appearance(APPEARANCE_ALL, usr, check_species_whitelist = 0, state = GLOB.tgui_admin_state) + H.change_appearance(APPEARANCE_ALL, usr, check_species_whitelist = 0, state = ADMIN_STATE(R_FUN)) feedback_add_details("admin_verb","CHAA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/change_human_appearance_self() diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index a90ff5152b..c67c40b6c6 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -304,22 +304,21 @@ log_admin("[key_name(src)] has granted [M.key] full access.") message_admins(span_blue("[key_name_admin(usr)] has granted [M.key] full access."), 1) -/client/proc/cmd_assume_direct_control(var/mob/M in mob_list) - set category = "Admin.Game" - set name = "Assume direct control" - set desc = "Direct intervention" - - if(!check_rights(R_DEBUG|R_ADMIN|R_EVENT)) return +ADMIN_VERB(cmd_assume_direct_control, (R_DEBUG|R_ADMIN|R_EVENT), "Assume Direct Control", "Assume direct control of a mob.", "Admin.Game", mob/M) if(M.ckey) - if(tgui_alert(usr, "This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.","Confirmation",list("Yes","No")) != "Yes") + if(tgui_alert(user, "This mob is being controlled by [M.ckey]. Are you sure you wish to assume control of it? [M.ckey] will be made a ghost.","Confirmation",list("Yes","No")) != "Yes") return - else - var/mob/observer/dead/ghost = new/mob/observer/dead(M,1) - ghost.ckey = M.ckey - message_admins(span_blue("[key_name_admin(usr)] assumed direct control of [M]."), 1) - log_admin("[key_name(usr)] assumed direct control of [M].") - var/mob/adminmob = src.mob - M.ckey = src.ckey + if(!M || QDELETED(M)) + to_chat(user, span_warning("The target mob no longer exists.")) + return + + var/mob/observer/dead/ghost = new/mob/observer/dead(M,1) + ghost.ckey = M.ckey + + message_admins(span_blue("[key_name_admin(user)] assumed direct control of [M]."), 1) + log_admin("[key_name(user)] assumed direct control of [M].") + var/mob/adminmob = user.mob + M.ckey = user.ckey if( isobserver(adminmob) ) qdel(adminmob) feedback_add_details("admin_verb","ADC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/verbs/entity_narrate.dm b/code/modules/admin/verbs/entity_narrate.dm index c8b96ec26b..6b983e64bb 100644 --- a/code/modules/admin/verbs/entity_narrate.dm +++ b/code/modules/admin/verbs/entity_narrate.dm @@ -172,7 +172,7 @@ ADMIN_VERB(narrate_mob_args, R_FUN, "Narrate Entity", "Narrate entities using po /datum/entity_narrate/tgui_state(mob/user) - return GLOB.tgui_admin_state + return ADMIN_STATE(R_FUN) /datum/entity_narrate/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/admin/verbs/fps.dm b/code/modules/admin/verbs/fps.dm index e97bc166fc..cfd840879c 100644 --- a/code/modules/admin/verbs/fps.dm +++ b/code/modules/admin/verbs/fps.dm @@ -1,7 +1,7 @@ ADMIN_VERB_VISIBILITY(set_server_fps, ADMIN_VERB_VISIBLITY_FLAG_MAPPING_DEBUG) ADMIN_VERB(set_server_fps, R_DEBUG, "Set Server FPS", "Sets game speed in frames-per-second. Can potentially break the game", ADMIN_CATEGORY_DEBUG) var/cfg_fps = CONFIG_GET(number/fps) - var/new_fps = round(input(user, "Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps) as num|null) + var/new_fps = round(tgui_input_number(user, "Sets game frames-per-second. Can potentially break the game (default: [cfg_fps])","FPS", world.fps)) if(new_fps <= 0) to_chat(user, span_danger("Error: set_server_fps(): Invalid world.fps value. No changes made."), confidential = TRUE) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index cc46b0ab37..82aedfe622 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -138,7 +138,6 @@ var/list/debug_verbs = list ( ,/client/proc/powerdebug ,/client/proc/count_objects_on_z_level ,/client/proc/count_objects_all - ,/client/proc/cmd_assume_direct_control ,/client/proc/jump_to_dead_group ,/client/proc/startSinglo ,/client/proc/cmd_admin_grantfullaccess diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 67d9614a00..aee7076944 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1,22 +1,20 @@ GLOBAL_VAR_INIT(global_vantag_hud, 0) -/client/proc/cmd_admin_drop_everything(mob/M as mob in mob_list) - set category = null - set name = "Drop Everything" - if(!holder) - return - - var/confirm = tgui_alert(src, "Make [M] drop everything?", "Message", list("Yes", "No")) +ADMIN_VERB(drop_everything, R_ADMIN, "Drop Everything", ADMIN_VERB_NO_DESCRIPTION, ADMIN_CATEGORY_HIDDEN, mob/living/dropee in mob_list) + var/confirm = tgui_alert(src, "Make [dropee] drop everything?", "Message", list("Yes", "No")) if(confirm != "Yes") return - for(var/obj/item/W in M) + for(var/obj/item/W in dropee) if(istype(W, /obj/item/implant/backup) || istype(W, /obj/item/nif)) //There's basically no reason to remove either of these continue - M.drop_from_inventory(W) + dropee.drop_from_inventory(W) - log_admin("[key_name(usr)] made [key_name(M)] drop everything!") - message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1) + dropee.regenerate_icons() + + log_admin("[key_name(user)] made [key_name(dropee)] drop everything!") + var/msg = "[key_name_admin(user)] made [ADMIN_LOOKUPFLW(dropee)] drop everything!" + message_admins(msg) feedback_add_details("admin_verb","DEVR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/cmd_admin_prison(mob/M as mob in mob_list) @@ -715,100 +713,6 @@ ADMIN_VERB(respawn_character, (R_ADMIN|R_REJUVINATE), "Spawn Character", "(Re)Sp to_chat(src, "[job.title]: [job.total_positions]") feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! -/client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world) - set category = "Fun.Do Not" - set name = "Explosion" - - if(!check_rights(R_DEBUG|R_FUN)) return - - var/devastation = tgui_input_number(usr, "Range of total devastation. -1 to none", text("Input"), min_value=-1) - if(devastation == null) return - var/heavy = tgui_input_number(usr, "Range of heavy impact. -1 to none", text("Input"), min_value=-1) - if(heavy == null) return - var/light = tgui_input_number(usr, "Range of light impact. -1 to none", text("Input"), min_value=-1) - if(light == null) return - var/flash = tgui_input_number(usr, "Range of flash. -1 to none", text("Input"), min_value=-1) - if(flash == null) return - - if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1)) - if ((devastation > 20) || (heavy > 20) || (light > 20)) - if (tgui_alert(src, "Are you sure you want to do this? It will laaag.", "Confirmation", list("Yes", "No")) != "Yes") - return - - explosion(O, devastation, heavy, light, flash) - log_admin("[key_name(usr)] created an explosion ([devastation],[heavy],[light],[flash]) at ([O.x],[O.y],[O.z])") - message_admins("[key_name_admin(usr)] created an explosion ([devastation],[heavy],[light],[flash]) at ([O.x],[O.y],[O.z])", 1) - feedback_add_details("admin_verb","EXPL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - return - else - return - -/client/proc/cmd_admin_emp(atom/O as obj|mob|turf in world) - set category = "Fun.Do Not" - set name = "EM Pulse" - - if(!check_rights(R_DEBUG|R_FUN)) return - - var/heavy = tgui_input_number(usr, "Range of heavy pulse.", text("Input")) - if(heavy == null) return - var/med = tgui_input_number(usr, "Range of medium pulse.", text("Input")) - if(med == null) return - var/light = tgui_input_number(usr, "Range of light pulse.", text("Input")) - if(light == null) return - var/long = tgui_input_number(usr, "Range of long pulse.", text("Input")) - if(long == null) return - - if (heavy || med || light || long) - - empulse(O, heavy, med, light, long) - log_admin("[key_name(usr)] created an EM Pulse ([heavy],[med],[light],[long]) at ([O.x],[O.y],[O.z])") - message_admins("[key_name_admin(usr)] created an EM PUlse ([heavy],[med],[light],[long]) at ([O.x],[O.y],[O.z])", 1) - feedback_add_details("admin_verb","EMP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - - return - else - return - -/client/proc/cmd_admin_gib(mob/M as mob in mob_list) - set category = "Fun.Do Not" - set name = "Gib" - - if(!check_rights(R_ADMIN|R_FUN)) return - - var/confirm = tgui_alert(src, "You sure?", "Confirm", list("Yes", "No")) - if(confirm != "Yes") return - //Due to the delay here its easy for something to have happened to the mob - if(!M) return - - log_admin("[key_name(usr)] has gibbed [key_name(M)]") - message_admins("[key_name_admin(usr)] has gibbed [key_name_admin(M)]", 1) - - if(isobserver(M)) - gibs(M.loc) - return - - M.gib() - feedback_add_details("admin_verb","GIB") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - -/client/proc/cmd_admin_gib_self() - set name = "Gibself" - set category = "Fun.Do Not" - - if(!holder) - return - - var/confirm = tgui_alert(src, "You sure?", "Confirm", list("Yes", "No")) - if(!confirm) - return - if(confirm == "Yes") - if (isobserver(mob)) // so they don't spam gibs everywhere - return - else - mob.gib() - - log_admin("[key_name(usr)] used gibself.") - message_admins(span_blue("[key_name_admin(usr)] used gibself."), 1) - feedback_add_details("admin_verb","GIBS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /* /client/proc/cmd_manual_ban() set name = "Manual Ban" diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index c48aaecb42..4aa89f0b13 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -21,7 +21,7 @@ ADMIN_VERB(secrets, R_HOLDER, "Secrets", "Abuse harder than you ever have before is_funmin = check_rights(R_FUN) /datum/secrets_menu/tgui_state(mob/user) - return GLOB.tgui_admin_state// TGUI_ADMIN_STATE(R_NONE) + return ADMIN_STATE(R_HOLDER) /datum/secrets_menu/tgui_close() qdel(src) @@ -368,7 +368,7 @@ ADMIN_VERB(secrets, R_HOLDER, "Secrets", "Abuse harder than you ever have before return //SSblackbox.record_feedback("nested tally", "admin_secrets_fun_used", 1, list("Bomb Cap")) - //var/newBombCap = input(holder,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) as num|null + //var/newBombCap = tgui_input_list(holder,"What would you like the new bomb cap to be. (entered as the light damage range (the 3rd number in common (1,2,3) notation)) Must be above 4)", "New Bomb Cap", GLOB.MAX_EX_LIGHT_RANGE) //if (!CONFIG_SET(number/bombcap, newBombCap)) // return diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm index 4f9c048fe6..55265b27ae 100644 --- a/code/modules/admin/view_variables/admin_delete.dm +++ b/code/modules/admin/view_variables/admin_delete.dm @@ -5,27 +5,25 @@ if(istype(A)) var/turf/T = get_turf(A) if(T) - coords = "at [COORD(T)]" - jmp_coords = "at [ADMIN_COORDJMP(T)]" + var/atom/a_loc = A.loc + var/is_turf = isturf(a_loc) + coords = "[is_turf ? "at" : "from [a_loc] at"] [AREACOORD(T)]" + jmp_coords = "[is_turf ? "at" : "from [a_loc] at"] [ADMIN_VERBOSEJMP(T)]" else jmp_coords = coords = "in nullspace" - if (tgui_alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", list("Yes", "No")) == "Yes") + if (tgui_alert(usr, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", list("Yes", "No")) == "Yes") log_admin("[key_name(usr)] deleted [D] [coords]") message_admins("[key_name_admin(usr)] deleted [D] [jmp_coords]") + //BLACKBOX_LOG_ADMIN_VERB("Delete") feedback_add_details("admin_verb","ADEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! - /*if(isturf(D)) //Polaris doesn't support baseturfs yet. - var/turf/T = D - T.ScrapeAway() - else*/ - vv_update_display(D, "deleted", VV_MSG_DELETED) - - // turfs are special snowflakes that'll explode if qdel'd outside ChangeTurf - if (isturf(D)) + SEND_SIGNAL(D, COMSIG_ADMIN_DELETING, src) + if(isturf(D)) var/turf/T = D + //T.ScrapeAway() T.ChangeTurf(world.turf) else + vv_update_display(D, "deleted", VV_MSG_DELETED) qdel(D) - - if(!QDELETED(D)) - vv_update_display(D, "deleted", "") + if(!QDELETED(D)) + vv_update_display(D, "deleted", "") diff --git a/code/modules/admin/view_variables/color_matrix_editor.dm b/code/modules/admin/view_variables/color_matrix_editor.dm new file mode 100644 index 0000000000..3295ac41d0 --- /dev/null +++ b/code/modules/admin/view_variables/color_matrix_editor.dm @@ -0,0 +1,85 @@ +/datum/color_matrix_editor + var/client/owner + var/datum/weakref/target + var/atom/movable/screen/map_view/proxy_view + var/list/current_color + var/closed + +/datum/color_matrix_editor/New(user, atom/_target = null) + owner = CLIENT_FROM_VAR(user) + if(islist(_target?.color)) + current_color = _target.color + else if(istext(_target?.color)) + current_color = color_hex2color_matrix(_target.color) + else + current_color = COLOR_MATRIX_IDENTITY + + var/mutable_appearance/view = image('icons/testing/colortest.dmi', "colors") + if(_target) + target = WEAKREF(_target) + if(!(_target.appearance_flags & PLANE_MASTER)) + view = image(_target) + + proxy_view = new + proxy_view.generate_view("color_matrix_proxy_[REF(src)]") + + proxy_view.appearance = view + proxy_view.color = current_color + +/datum/color_matrix_editor/Destroy(force) + QDEL_NULL(proxy_view) + return ..() + +/datum/color_matrix_editor/tgui_state(mob/user) + return ADMIN_STATE(R_VAREDIT) + +/datum/color_matrix_editor/tgui_static_data(mob/user) + var/list/data = list() + data["mapRef"] = proxy_view.assigned_map + + return data + +/datum/color_matrix_editor/tgui_data(mob/user) + var/list/data = list() + data["currentColor"] = current_color + + return data + +/datum/color_matrix_editor/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ColorMatrixEditor") + ui.open() + proxy_view.display_to(owner.mob, ui.window) + +/datum/color_matrix_editor/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + if(.) + return + switch(action) + if("transition_color") + current_color = params["color"] + animate(proxy_view, time = 4, color = current_color) + if("confirm") + on_confirm() + SStgui.close_uis(src) + +/datum/color_matrix_editor/tgui_close(mob/user) + . = ..() + closed = TRUE + +/datum/color_matrix_editor/proc/on_confirm() + var/atom/target_atom = target?.resolve() + if(istype(target_atom)) + target_atom.vv_edit_var("color", current_color) + +/datum/color_matrix_editor/proc/wait() + while(!closed) + stoplag(1) + +/client/proc/open_color_matrix_editor(atom/in_atom) + var/datum/color_matrix_editor/editor = new /datum/color_matrix_editor(src, in_atom) + editor.tgui_interact(mob) + editor.wait() + . = editor.current_color + qdel(editor) diff --git a/code/modules/admin/view_variables/debug_variable_appearance.dm b/code/modules/admin/view_variables/debug_variable_appearance.dm new file mode 100644 index 0000000000..dfa590fd43 --- /dev/null +++ b/code/modules/admin/view_variables/debug_variable_appearance.dm @@ -0,0 +1,79 @@ +/// Shows a header name on top when you investigate an appearance/image +/image/vv_get_header() + . = list() + var/icon_name = "[icon || "null"]
" + . += replacetext(icon_name, "icons/obj", "") // shortens the name. We know the path already. + if(icon) + . += icon_state ? "\"[icon_state]\"" : "(icon_state = null)" + +/// Makes nice short vv names for images +/image/debug_variable_value(name, level, datum/owner, sanitize, display_flags) + var/display_name = "[type]" + if("[src]" != "[type]") // If we have a name var, let's use it. + display_name = "[src] [type]" + + var/display_value + var/list/icon_file_name = splittext("[icon]", "/") + if(length(icon_file_name)) + display_value = icon_file_name[length(icon_file_name)] + else + display_value = "null" + + if(icon_state) + display_value = "[display_value]:[icon_state]" + + var/display_ref = get_vv_link_ref() + return "[display_name] ([display_value]) [display_ref]" + +/// Returns the ref string to use when displaying this image in the vv menu of something else +/image/proc/get_vv_link_ref() + return REF(src) + +// It is endlessly annoying to display /appearance directly for stupid byond reasons, so we copy everything we care about into a holder datum +// That we can override procs on and store other vars on and such. +/mutable_appearance/appearance_mirror + // So people can see where it came from + var/appearance_ref + +// arg is actually an appearance, typed as mutable_appearance as closest mirror +/mutable_appearance/appearance_mirror/New(mutable_appearance/appearance_father) + . = ..() // /mutable_appearance/New() copies over all the appearance vars MAs care about by default + appearance_ref = REF(appearance_father) + +// This means if the appearance loses refs before a click it's gone, but that's consistent to other datums so it's fine +// Need to ref the APPEARANCE because we just free on our own, which sorta fucks this operation up you know? +/mutable_appearance/appearance_mirror/get_vv_link_ref() + return appearance_ref + +/mutable_appearance/appearance_mirror/can_vv_get(var_name) + var/static/datum/beloved = new() + if(beloved.vars.Find(var_name)) // If datums have it, get out + return FALSE + // If it is one of the two args on /image, yeet (I am sorry) + if(var_name == NAMEOF(src, realized_overlays)) + return FALSE + if(var_name == NAMEOF(src, realized_underlays)) + return FALSE + // Could make an argument for this but I think they will just confuse people, so yeeet + if(var_name == NAMEOF(src, vis_contents)) + return FALSE + return ..() + +/mutable_appearance/appearance_mirror/vv_get_var(var_name) + // No editing for you + var/value = vars[var_name] + return "
- [items.Join()]
- [items.Join()]
\
+
|
- "} + span_small("<<") + {" - "} + span_small("[dir2text(dir)]") + {" - "} + span_small(">>") + {" - "} - -/mob/living/get_view_variables_header() - return {" - "} + span_bold("[src]") + {" - "} + span_small("
<< [dir2text(dir)] >>") + {" - "} + span_small("
[ckey ? ckey : "No ckey"] / [real_name ? real_name : "No real name"]") + {" -
- "} + span_small("BRUTE:[getBruteLoss()]") + {" - "} + span_small("FIRE:[getFireLoss()]") + {" - "} + span_small("TOXIN:[getToxLoss()]") + {" - "} + span_small("OXY:[getOxyLoss()]") + {" - "} + span_small("CLONE:[getCloneLoss()]") + {" - "} + span_small("BRAIN:[getBrainLoss()]") + {" - "} - -//This entire file needs to be removed eventually -/datum/proc/get_view_variables_options() - return "" - -/mob/get_view_variables_options() - return ..() + {" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - "} - -/mob/living/carbon/human/get_view_variables_options() - return ..() + {" - - - - - - "} - -/obj/get_view_variables_options() - return ..() + {" - - "} - -/turf/get_view_variables_options() - return ..() + {" - - - "} - -/obj/item/pda/get_view_variables_options() - return ..() + {" - - "} - -/datum/proc/get_variables() - . = vars - VV_hidden() - if(!usr || !check_rights(R_ADMIN|R_DEBUG, FALSE)) - . -= VV_secluded() - -/datum/proc/get_variable_value(varname) - return vars[varname] - -/datum/proc/set_variable_value(varname, value) - vars[varname] = value - -/datum/proc/get_initial_variable_value(varname) - return initial(vars[varname]) - -/datum/proc/make_view_variables_variable_entry(var/varname, var/value, var/hide_watch = 0) - return {" - (E) - (C) - (M) - [hide_watch ? "" : "(W)"] - "} - -// No mass editing of clients -/client/make_view_variables_variable_entry(var/varname, var/value, var/hide_watch = 0) - return {" - (E) - (C) - [hide_watch ? "" : "(W)"] - "} - -// These methods are all procs and don't use stored lists to avoid VV exploits - -// The following vars cannot be viewed by anyone -/datum/proc/VV_hidden() - return list() - -// The following vars can only be viewed by R_ADMIN|R_DEBUG -/datum/proc/VV_secluded() - return list() - -/datum/configuration/VV_secluded() - return vars - -// The following vars cannot be edited by anyone -/datum/proc/VV_static() - return list("parent_type") - -/atom/VV_static() - return ..() + list("bound_x", "bound_y", "bound_height", "bound_width", "bounds", "step_x", "step_y", "step_size") - -/client/VV_static() - return ..() + list("holder", "prefs") - -/datum/admins/VV_static() - return vars - -// The following vars require R_DEBUG to edit -/datum/proc/VV_locked() - return list("vars", "cuffed") - -/client/VV_locked() - return list("vars", "mob") - -/mob/VV_locked() - return ..() + list("client") - -// The following vars require R_FUN|R_DEBUG to edit -/datum/proc/VV_icon_edit_lock() - return list() - -/atom/VV_icon_edit_lock() - return ..() + list("icon", "icon_state", "overlays", "underlays") - -// The following vars require R_SPAWN|R_DEBUG to edit -/datum/proc/VV_ckey_edit() - return list() - -/mob/VV_ckey_edit() - return list("key", "ckey") - -/client/VV_ckey_edit() - return list("key", "ckey") - -/datum/proc/may_edit_var(var/user, var/var_to_edit) //User must be a CLIENT that is passed to this. - if(!user) - return FALSE - if(ismob(user)) //Failsafe catch in case someone feeds a mob into us. - var/mob/living = user - user = living.client - if(!(var_to_edit in vars)) - to_chat(user, span_warning("\The [src] does not have a var '[var_to_edit]'")) - return FALSE - if(var_to_edit in VV_static()) - return FALSE - if((var_to_edit in VV_secluded()) && !check_rights_for(user, R_ADMIN|R_DEBUG)) - return FALSE - if((var_to_edit in VV_locked()) && !check_rights_for(user, R_DEBUG)) - return FALSE - if((var_to_edit in VV_ckey_edit()) && !check_rights_for(user, R_SPAWN|R_DEBUG)) - return FALSE - if((var_to_edit in VV_icon_edit_lock()) && !check_rights_for(user, R_FUN|R_DEBUG)) - return FALSE - return TRUE - -/proc/forbidden_varedit_object_types() - return list( - /datum/admins //Admins editing their own admin-power object? Yup, sounds like a good idea. - ) diff --git a/code/modules/admin/view_variables/mark_datum.dm b/code/modules/admin/view_variables/mark_datum.dm new file mode 100644 index 0000000000..d519fedc41 --- /dev/null +++ b/code/modules/admin/view_variables/mark_datum.dm @@ -0,0 +1,17 @@ +/client/proc/mark_datum(datum/D) + if(!holder) + return + if(holder.marked_datum) + holder.UnregisterSignal(holder.marked_datum, COMSIG_PARENT_QDELETING) + vv_update_display(holder.marked_datum, "marked", "") + holder.marked_datum = D + holder.RegisterSignal(holder.marked_datum, COMSIG_PARENT_QDELETING, TYPE_PROC_REF(/datum/admins, handle_marked_del)) + vv_update_display(D, "marked", VV_MSG_MARKED) + +ADMIN_VERB_ONLY_CONTEXT_MENU(mark_datum, R_HOLDER, "Mark Object", datum/target as mob|obj|turf|area in view()) + user.mark_datum(target) + +/datum/admins/proc/handle_marked_del(datum/source) + SIGNAL_HANDLER + UnregisterSignal(marked_datum, COMSIG_PARENT_QDELETING) + marked_datum = null diff --git a/code/modules/admin/view_variables/mass_edit_variables.dm b/code/modules/admin/view_variables/mass_edit_variables.dm index f494f103ed..ff7c4cc928 100644 --- a/code/modules/admin/view_variables/mass_edit_variables.dm +++ b/code/modules/admin/view_variables/mass_edit_variables.dm @@ -1,29 +1,29 @@ -/client/proc/cmd_mass_modify_object_variables(atom/A, var_name) - set category = "Debug" - set name = "Mass Edit Variables" - set desc="(target) Edit all instances of a target item's variables" - - var/method = 0 //0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL items) +/client/proc/cmd_mass_modify_object_variables(datum/target, var_name) + if(tgui_alert(src, "Are you sure you'd like to mass-modify every instance of the [var_name] variable? This can break everything if you do not know what you are doing.", "Slow down, chief!", list("Yes", "No"), 60 SECONDS) != "Yes") + return if(!check_rights(R_VAREDIT)) return - if(A && A.type) - method = vv_subtype_prompt(A.type) + /// if false get only the strict type, get all subtypes too otherwise + var/strict_type = FALSE + if(target?.type) + strict_type = vv_subtype_prompt(target.type) - src.massmodify_variables(A, var_name, method) + massmodify_variables(target, var_name, strict_type) feedback_add_details("admin_verb","MVV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! + //BLACKBOX_LOG_ADMIN_VERB("Mass Edit Variables") -/client/proc/massmodify_variables(datum/O, var_name = "", method = 0) +/client/proc/massmodify_variables(datum/target, var_name = "", strict_type = FALSE) if(!check_rights(R_VAREDIT)) return - if(!istype(O)) + if(!istype(target)) return var/variable = "" if(!var_name) var/list/names = list() - for (var/V in O.vars) + for (var/V in target.vars) names += V names = sortList(names) @@ -32,13 +32,13 @@ else variable = var_name - if(!variable || !O.can_vv_get(variable)) + if(!variable || !target.can_vv_get(variable)) return var/default - var/var_value = O.vars[variable] + var/var_value = target.vars[variable] if(variable in GLOB.VVckey_edit) - to_chat(src, "It's forbidden to mass-modify ckeys. It'll crash everyone's client you dummy.") + to_chat(src, "It's forbidden to mass-modify ckeys. It'll crash everyone's client you dummy.", confidential = TRUE) return if(variable in GLOB.VVlocked) if(!check_rights(R_DEBUG)) @@ -49,18 +49,18 @@ if(variable in GLOB.VVpixelmovement) if(!check_rights(R_DEBUG)) return - var/prompt = tgui_alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", list("ABORT","Continue","ABORT")) + var/prompt = tgui_alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", list("ABORT ", "Continue", " ABORT")) if (prompt != "Continue") return default = vv_get_class(variable, var_value) if(isnull(default)) - to_chat(src, "Unable to determine variable type.") + to_chat(src, "Unable to determine variable type.", confidential = TRUE) else - to_chat(src, "Variable appears to be [uppertext(default)].") + to_chat(src, "Variable appears to be " + span_bold("[uppertext(default)]") + ".", confidential = TRUE) - to_chat(src, "Variable contains: [var_value]") + to_chat(src, "Variable contains: [var_value]", confidential = TRUE) if(default == VV_NUM) var/dir_text = "" @@ -75,7 +75,7 @@ dir_text += "WEST" if(dir_text) - to_chat(src, "If a direction, direction is: [dir_text]") + to_chat(src, "If a direction, direction is: [dir_text]", confidential = TRUE) var/value = vv_get_value(default_class = default) var/new_value = value["value"] @@ -90,16 +90,16 @@ if (value["type"]) class = VV_NEW_TYPE - var/original_name = "[O]" + var/original_name = "[target]" var/rejected = 0 var/accepted = 0 switch(class) if(VV_RESTORE_DEFAULT) - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [items.len] items...") + to_chat(src, "Finding items...", confidential = TRUE) + var/list/items = get_all_of_type(target.type, strict_type) + to_chat(src, "Changing [items.len] items...", confidential = TRUE) for(var/thing in items) if (!thing) continue @@ -111,23 +111,21 @@ CHECK_TICK if(VV_TEXT) - var/list/varsvars = vv_parse_text(O, new_value) + var/list/varsvars = vv_parse_text(target, new_value) var/pre_processing = new_value var/unique - if (varsvars && varsvars.len) - unique = tgui_alert(usr, "Process vars unique to each instance, or same for all?", "Variable Association", list("Unique", "Same")) - if(!unique) - return + if (varsvars?.len) + unique = tgui_alert(src, "Process vars unique to each instance, or same for all?", "Variable Association", list("Unique", "Same")) if(unique == "Unique") unique = TRUE else unique = FALSE for(var/V in varsvars) - new_value = replacetext(new_value,"\[[V]]","[O.vars[V]]") + new_value = replacetext(new_value,"\[[V]]","[target.vars[V]]") - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [items.len] items...") + to_chat(src, "Finding items...", confidential = TRUE) + var/list/items = get_all_of_type(target.type, strict_type) + to_chat(src, "Changing [items.len] items...", confidential = TRUE) for(var/thing in items) if (!thing) continue @@ -145,7 +143,7 @@ if (VV_NEW_TYPE) var/many = tgui_alert(src, "Create only one [value["type"]] and assign each or a new one for each thing", "How Many", list("One", "Many", "Cancel")) - if (!many || many == "Cancel") + if (many == "Cancel") return if (many == "Many") many = TRUE @@ -153,9 +151,9 @@ many = FALSE var/type = value["type"] - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [items.len] items...") + to_chat(src, "Finding items...", confidential = TRUE) + var/list/items = get_all_of_type(target.type, strict_type) + to_chat(src, "Changing [items.len] items...", confidential = TRUE) for(var/thing in items) if (!thing) continue @@ -171,9 +169,9 @@ CHECK_TICK else - to_chat(src, "Finding items...") - var/list/items = get_all_of_type(O.type, method) - to_chat(src, "Changing [items.len] items...") + to_chat(src, "Finding items...", confidential = TRUE) + var/list/items = get_all_of_type(target.type, strict_type) + to_chat(src, "Changing [items.len] items...", confidential = TRUE) for(var/thing in items) if (!thing) continue @@ -187,27 +185,27 @@ var/count = rejected+accepted if (!count) - to_chat(src, "No objects found") + to_chat(src, "No objects found", confidential = TRUE) return if (!accepted) - to_chat(src, "Every object rejected your edit") + to_chat(src, "Every object rejected your edit", confidential = TRUE) return if (rejected) - to_chat(src, "[rejected] out of [count] objects rejected your edit") + to_chat(src, "[rejected] out of [count] objects rejected your edit", confidential = TRUE) - log_world("### MassVarEdit by [src]: [O.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[O.vars[variable]]")]([list2params(value)])") - log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)") - message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [O.vars[variable]] ([accepted] objects modified)") + log_world("### MassVarEdit by [src]: [target.type] (A/R [accepted]/[rejected]) [variable]=[html_encode("[target.vars[variable]]")]([list2params(value)])") + log_admin("[key_name(src)] mass modified [original_name]'s [variable] to [target.vars[variable]] ([accepted] objects modified)") + message_admins("[key_name_admin(src)] mass modified [original_name]'s [variable] to [target.vars[variable]] ([accepted] objects modified)") - -/proc/get_all_of_type(var/T, subtypes = TRUE) +//not using global lists as vv is a debug function and debug functions should rely on as less things as possible. +/proc/get_all_of_type(T, subtypes = TRUE) var/list/typecache = list() typecache[T] = 1 if (subtypes) typecache = typecacheof(typecache) . = list() if (ispath(T, /mob)) - for(var/mob/thing in mob_list) + for(var/mob/thing in world) if (typecache[thing.type]) . += thing CHECK_TICK @@ -219,7 +217,13 @@ CHECK_TICK else if (ispath(T, /obj/machinery)) - for(var/obj/machinery/thing in GLOB.machines) + for(var/obj/machinery/thing in world) + if (typecache[thing.type]) + . += thing + CHECK_TICK + + else if (ispath(T, /obj/item)) + for(var/obj/item/thing in world) if (typecache[thing.type]) . += thing CHECK_TICK diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm index eb840d7ea5..d2021dc47b 100644 --- a/code/modules/admin/view_variables/modify_variables.dm +++ b/code/modules/admin/view_variables/modify_variables.dm @@ -1,10 +1,10 @@ -GLOBAL_LIST_INIT(VVlocked, list("vars", "datum_flags", "client", "mob")) //Requires DEBUG +GLOBAL_LIST_INIT(VVlocked, list("vars", "datum_flags", "client", "mob")) //Requires DEBUG GLOBAL_PROTECT(VVlocked) -GLOBAL_LIST_INIT(VVicon_edit_lock, list("icon", "icon_state", "overlays", "underlays")) //Requires DEBUG or FUN +GLOBAL_LIST_INIT(VVicon_edit_lock, list("icon", "icon_state", "overlays", "underlays")) //Requires DEBUG or FUN GLOBAL_PROTECT(VVicon_edit_lock) -GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN +GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN GLOBAL_PROTECT(VVckey_edit) -GLOBAL_LIST_INIT(VVpixelmovement, list("bound_x", "bound_y", "step_x", "step_y", "step_size", "bound_height", "bound_width", "bounds")) //No editing ever. +GLOBAL_LIST_INIT(VVpixelmovement, list("bound_x", "bound_y", "step_x", "step_y", "step_size", "bound_height", "bound_width", "bounds")) //No editing ever. GLOBAL_PROTECT(VVpixelmovement) /client/proc/vv_parse_text(O, new_var) @@ -17,14 +17,14 @@ GLOBAL_PROTECT(VVpixelmovement) //FALSE = no subtypes, strict exact type pathing (or the type doesn't have subtypes) //TRUE = Yes subtypes //NULL = User cancelled at the prompt or invalid type given -/client/proc/vv_subtype_prompt(var/type) +/client/proc/vv_subtype_prompt(type) if (!ispath(type)) return var/list/subtypes = subtypesof(type) if (!subtypes || !subtypes.len) return FALSE - if (subtypes && subtypes.len) - switch(tgui_alert(usr, "Strict object type detection?", "Type detection", list("Strictly this type", "This type and subtypes", "Cancel"))) + if (subtypes?.len) + switch(tgui_alert(usr,"Strict object type detection?", "Type detection", list("Strictly this type","This type and subtypes", "Cancel"))) if("Strictly this type") return FALSE if("This type and subtypes") @@ -46,25 +46,25 @@ GLOBAL_PROTECT(VVpixelmovement) var/things = get_all_of_type(type, subtypes) var/i = 0 - for(var/datum/D as anything in things) + for(var/thing in things) + var/datum/D = thing i++ //try one of 3 methods to shorten the type text: - // fancy type, - // fancy type with the base type removed from the begaining, - // the type with the base type removed from the begaining + // fancy type, + // fancy type with the base type removed from the begaining, + // the type with the base type removed from the begaining var/fancytype = types[D.type] if (findtext(fancytype, types[type])) - fancytype = copytext(fancytype, length(types[type])+1) - var/shorttype = copytext("[D.type]", length("[type]")+1) - if (length(shorttype) > length(fancytype)) + fancytype = copytext(fancytype, length(types[type]) + 1) + var/shorttype = copytext("[D.type]", length("[type]") + 1) + if (length_char(shorttype) > length_char(fancytype)) shorttype = fancytype if (!length(shorttype)) shorttype = "/" - .["[D]([shorttype])\ref[D]#[i]"] = D + .["[D]([shorttype])[REF(D)]#[i]"] = D /client/proc/mod_list_add_ass(atom/O) //hehe - var/list/L = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT)) var/class = L["class"] if (!class) @@ -94,15 +94,14 @@ GLOBAL_PROTECT(VVpixelmovement) if (O) L = L.Copy() - L += var_value + L += list(var_value) //var_value could be a list - if(IS_VALID_ASSOC_KEY(var_value)) - switch(tgui_alert(usr, "Would you like to associate a value with the list entry?","List VV",list("Yes","No"))) - if("Yes") - L[var_value] = mod_list_add_ass(O) //hehe + switch(tgui_alert(usr,"Would you like to associate a value with the list entry?",,list("Yes","No"))) + if("Yes") + L[var_value] = mod_list_add_ass(O) //hehe if (O) if (O.vv_edit_var(objectvar, L) == FALSE) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: ADDED=[var_value]") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]") @@ -112,27 +111,26 @@ GLOBAL_PROTECT(VVpixelmovement) if(!check_rights(R_VAREDIT)) return if(!istype(L, /list)) - to_chat(src, "Not a List.") + to_chat(src, "Not a List.", confidential = TRUE) return if(L.len > 1000) - var/confirm = tgui_alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Long List!", list("Warning", "Continue", "Abort")) + var/confirm = tgui_alert(usr, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", list("Continue", "Abort")) if(confirm != "Continue") return - - + var/is_normal_list = IS_NORMAL_LIST(L) var/list/names = list() for (var/i in 1 to L.len) var/key = L[i] var/value - if (IS_NORMAL_LIST(L) && !isnum(key)) + if (is_normal_list && !isnum(key)) value = L[key] if (value == null) value = "null" names["#[i] [key] = [value]"] = i if (!index) - var/variable = tgui_input_list(usr, "Which var?","Var", names + "(ADD VAR)" + "(CLEAR NULLS)" + "(CLEAR DUPES)" + "(SHUFFLE)") + var/variable = tgui_input_list(usr, "Which var?", "Var", names + "(ADD VAR)" + "(CLEAR NULLS)" + "(CLEAR DUPES)" + "(SHUFFLE)") if(variable == null) return @@ -143,9 +141,9 @@ GLOBAL_PROTECT(VVpixelmovement) if(variable == "(CLEAR NULLS)") L = L.Copy() - listclearnulls(L) + list_clear_nulls(L) if (!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR NULLS") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR NULLS") @@ -155,7 +153,7 @@ GLOBAL_PROTECT(VVpixelmovement) if(variable == "(CLEAR DUPES)") L = uniqueList(L) if (!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [O.type] [objectvar]: CLEAR DUPES") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: CLEAR DUPES") @@ -165,7 +163,7 @@ GLOBAL_PROTECT(VVpixelmovement) if(variable == "(SHUFFLE)") L = shuffle(L) if (!O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [O.type] [objectvar]: SHUFFLE") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: SHUFFLE") @@ -179,32 +177,32 @@ GLOBAL_PROTECT(VVpixelmovement) if (index == null) return var/assoc = 0 - if(IS_VALID_ASSOC_KEY(L[index])) - var/prompt = tgui_alert(src, "Do you want to edit the key or its assigned value?", "Associated List", list("Key", "Assigned Value", "Cancel")) - if (!prompt || prompt == "Cancel") - return - if (prompt == "Assigned Value") - assoc = 1 - assoc_key = L[index] + var/prompt = tgui_alert(usr, "Do you want to edit the key or its assigned value?", "Associated List", list("Key", "Assigned Value", "Cancel")) + if (prompt == "Cancel") + return + if (prompt == "Assigned Value") + assoc = 1 + assoc_key = L[index] var/default var/variable - var/old_assoc_value //EXPERIMENTAL - Keep old associated value while modifying key, if any - if (assoc) - variable = L[assoc_key] - else - variable = L[index] - //EXPERIMENTAL - Keep old associated value while modifying key, if any - if(IS_VALID_ASSOC_KEY(variable)) - var/found = L[variable] - if(!isnull(found)) - old_assoc_value = found - // + var/old_assoc_value //EXPERIMENTAL - Keep old associated value while modifying key, if any + if(is_normal_list) + if (assoc) + variable = L[assoc_key] + else + variable = L[index] + //EXPERIMENTAL - Keep old associated value while modifying key, if any + if(IS_VALID_ASSOC_KEY(variable)) + var/found = L[variable] + if(!isnull(found)) + old_assoc_value = found + // default = vv_get_class(objectvar, variable) - to_chat(src, "Variable appears to be [uppertext(default)].") + to_chat(src, "Variable appears to be " + span_bold("[uppertext(default)]") + ".", confidential = TRUE) - to_chat(src, "Variable contains: [variable]") + to_chat(src, "Variable contains: [variable]", confidential = TRUE) if(default == VV_NUM) var/dir_text = "" @@ -220,7 +218,7 @@ GLOBAL_PROTECT(VVpixelmovement) dir_text += "WEST" if(dir_text) - to_chat(usr, "If a direction, direction is: [dir_text]") + to_chat(usr, "If a direction, direction is: [dir_text]", confidential = TRUE) var/original_var = variable @@ -248,7 +246,7 @@ GLOBAL_PROTECT(VVpixelmovement) L.Cut(index, index+1) if (O) if (O.vv_edit_var(objectvar, L)) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [O.type] [objectvar]: REMOVED=[html_encode("[original_var]")]") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: REMOVED=[original_var]") @@ -261,15 +259,16 @@ GLOBAL_PROTECT(VVpixelmovement) new_var = replacetext(new_var,"\[[V]]","[O.vars[V]]") - if(assoc) - L[assoc_key] = new_var - else - L[index] = new_var - if(!isnull(old_assoc_value) && IS_VALID_ASSOC_KEY(new_var)) - L[new_var] = old_assoc_value + if(is_normal_list) + if(assoc) + L[assoc_key] = new_var + else + L[index] = new_var + if(!isnull(old_assoc_value) && IS_VALID_ASSOC_KEY(new_var)) + L[new_var] = old_assoc_value if (O) if (O.vv_edit_var(objectvar, L) == FALSE) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return log_world("### ListVarEdit by [src]: [(O ? O.type : "/list")] [objectvar]: [original_var]=[new_var]") log_admin("[key_name(src)] modified [original_name]'s [objectvar]: [original_var]=[new_var]") @@ -297,7 +296,7 @@ GLOBAL_PROTECT(VVpixelmovement) if(param_var_name) if(!(param_var_name in O.vars)) - to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this datum ([O])") + to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this datum ([O])", confidential = TRUE) return variable = param_var_name @@ -308,17 +307,10 @@ GLOBAL_PROTECT(VVpixelmovement) names = sortList(names) - variable = tgui_input_list(usr, "Which var?","Var", names) + variable = tgui_input_list(usr, "Which var?", "Var", names) if(!variable) return - if(variable in GLOB.VVpixelmovement) - if(!check_rights(R_DEBUG)) - return - var/prompt = tgui_alert(src, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", list("ABORT","Continue","ABORT")) - if (prompt != "Continue") - return - if(!O.can_vv_get(variable)) return @@ -329,11 +321,11 @@ GLOBAL_PROTECT(VVpixelmovement) var/default = vv_get_class(variable, var_value) if(isnull(default)) - to_chat(src, "Unable to determine variable type.") + to_chat(src, "Unable to determine variable type.", confidential = TRUE) else - to_chat(src, "Variable appears to be [uppertext(default)].") + to_chat(src, "Variable appears to be " + span_bold("[uppertext(default)]") + ".", confidential = TRUE) - to_chat(src, "Variable contains: [var_value]") + to_chat(src, "Variable contains: [var_value]", confidential = TRUE) if(default == VV_NUM) var/dir_text = "" @@ -348,7 +340,7 @@ GLOBAL_PROTECT(VVpixelmovement) dir_text += "WEST" if(dir_text) - to_chat(src, "If a direction, direction is: [dir_text]") + to_chat(src, "If a direction, direction is: [dir_text]", confidential = TRUE) if(autodetect_class && default != VV_NULL) if (default == VV_TEXT) @@ -385,9 +377,10 @@ GLOBAL_PROTECT(VVpixelmovement) if (O.vv_edit_var(variable, var_new) == FALSE) - to_chat(src, "Your edit was rejected by the object.") + to_chat(src, "Your edit was rejected by the object.", confidential = TRUE) return vv_update_display(O, "varedited", VV_MSG_EDITED) + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_VAR_EDIT, args) log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]") log_admin("[key_name(src)] modified [original_name]'s [variable] from [html_encode("[var_value]")] to [html_encode("[var_new]")]") var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]" diff --git a/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm new file mode 100644 index 0000000000..9dd013db13 --- /dev/null +++ b/code/modules/admin/view_variables/nobody_wants_to_learn_matrix_math.dm @@ -0,0 +1,80 @@ + +/** + * ## nobody wants to learn matrix math! + * + * More than just a completely true statement, this datum is created as a tgui interface + * allowing you to modify each vector until you know what you're doing. + * Much like filteriffic, 'nobody wants to learn matrix math' is meant for developers like you and I + * to implement interesting matrix transformations without the hassle if needing to know... algebra? Damn, i'm stupid. + */ +/datum/nobody_wants_to_learn_matrix_math + var/atom/target + var/matrix/testing_matrix + +/datum/nobody_wants_to_learn_matrix_math/New(atom/target) + src.target = target + testing_matrix = matrix(target.transform) + +/datum/nobody_wants_to_learn_matrix_math/Destroy(force) + QDEL_NULL(testing_matrix) + return ..() + +/datum/nobody_wants_to_learn_matrix_math/tgui_state(mob/user) + return ADMIN_STATE(R_VAREDIT) + +/datum/nobody_wants_to_learn_matrix_math/tgui_close(mob/user) + qdel(src) + +/datum/nobody_wants_to_learn_matrix_math/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "MatrixMathTester") + ui.open() + +/datum/nobody_wants_to_learn_matrix_math/tgui_data() + var/list/data = list() + data["matrix_a"] = testing_matrix.a + data["matrix_b"] = testing_matrix.b + data["matrix_c"] = testing_matrix.c + data["matrix_d"] = testing_matrix.d + data["matrix_e"] = testing_matrix.e + data["matrix_f"] = testing_matrix.f + data["pixelated"] = target.appearance_flags & PIXEL_SCALE + return data + +/datum/nobody_wants_to_learn_matrix_math/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + if(.) + return + + switch(action) + if("change_var") + var/matrix_var_name = params["var_name"] + var/matrix_var_value = params["var_value"] + if(testing_matrix.vv_edit_var(matrix_var_name, matrix_var_value) == FALSE) + to_chat(src, "Your edit was rejected by the object. This is a bug with the matrix tester, not your fault, so report it on GitHub.", confidential = TRUE) + return + set_transform() + if("scale") + testing_matrix.Scale(params["x"], params["y"]) + set_transform() + if("translate") + testing_matrix.Translate(params["x"], params["y"]) + set_transform() + if("shear") + testing_matrix.Shear(params["x"], params["y"]) + set_transform() + if("turn") + testing_matrix.Turn(params["angle"]) + set_transform() + if("toggle_pixel") + target.appearance_flags ^= PIXEL_SCALE + +/datum/nobody_wants_to_learn_matrix_math/proc/set_transform() + animate(target, transform = testing_matrix, time = 0.5 SECONDS) + testing_matrix = matrix(target.transform) + +/client/proc/open_matrix_tester(atom/in_atom) + if(holder) + var/datum/nobody_wants_to_learn_matrix_math/matrix_tester = new(in_atom) + matrix_tester.tgui_interact(mob) diff --git a/code/modules/admin/view_variables/particle_editor.dm b/code/modules/admin/view_variables/particle_editor.dm new file mode 100644 index 0000000000..b841e0ef2c --- /dev/null +++ b/code/modules/admin/view_variables/particle_editor.dm @@ -0,0 +1,212 @@ +/datum/particle_editor + /// movable whose particles we want to be editing + var/atom/movable/target + +/datum/particle_editor/New(atom/target) + src.target = target + +/datum/particle_editor/tgui_state(mob/user) + return ADMIN_STATE(R_VAREDIT) + +/datum/particle_editor/tgui_interact(mob/user, datum/tgui/ui) + ui = SStgui.try_update_ui(user, src, ui) + if(!ui) + ui = new(user, src, "ParticleEdit") + ui.open() + +/datum/particle_editor/ui_assets(mob/user) + . = ..() + . += get_asset_datum(/datum/asset/simple/particle_editor) + +///returns ui_data values for the particle editor +/particles/proc/return_ui_representation(mob/user) + var/data = list() + //affect entire set: no generators + data["width"] = width //float + data["height"] = height //float + data["count"] = count //float + data["spawning"] = spawning //float + data["bound1"] = islist(bound1) ? bound1 : list(bound1,bound1,bound1) //float OR list(x, y, z) + data["bound2"] = islist(bound2) ? bound2 : list(bound2,bound2,bound2) //float OR list(x, y, z) + data["gravity"] = gravity //list(x, y, z) + + var/list/tgui_grad_list = list() + for(var/entry in gradient) + if(entry == "space") + tgui_grad_list += list(list("[entry]" = gradient[entry])) // package this thing else json encoding breaks + continue + tgui_grad_list += entry + data["gradient"] = tgui_grad_list //gradient array list(number, string, number, string, "loop", "space"=COLORSPACE_RGB) + + data["transform"] = transform //list(a, b, c, d, e, f) OR list(xx,xy,xz, yx,yy,yz, zx,zy,zz) OR list(xx,xy,xz, yx,yy,yz, zx,zy,zz, cx,cy,cz) OR list(xx,xy,xz,xw, yx,yy,yz,yw, zx,zy,zz,zw, wx,wy,wz,ww) + + //applied on spawn + if(islist(icon)) + var/list/icon_data = list() + for(var/file in icon) + icon_data["[file]"] = icon[file] + data["icon"] = icon_data + else + data["icon"] = "[icon]" //list(icon = weight) OR file reference + data["icon_state"] = icon_state // list(icon_state = weight) OR string + if(isgenerator(lifespan)) + data["lifespan"] = return_generator_args(lifespan) + else + data["lifespan"] = lifespan //float + if(isgenerator(fade)) + data["fade"] = return_generator_args(fade) + else + data["fade"] = fade //float + if(isgenerator(fadein)) + data["fadein"] = return_generator_args(fadein) + else + data["fadein"] = fadein //float + if(isgenerator(color)) + data["color"] = return_generator_args(color) + else + data["color"] = color //float OR string + if(isgenerator(color_change)) + data["color_change"] = return_generator_args(color_change) + else + data["color_change"] = color_change //float + if(isgenerator(position)) + data["position"] = return_generator_args(position) + else + data["position"] = position //list(x,y) OR list(x,y,z) + if(isgenerator(velocity)) + data["velocity"] = return_generator_args(velocity) + else + data["velocity"] = velocity //list(x,y) OR list(x,y,z) + if(isgenerator(scale)) + data["scale"] = return_generator_args(scale) + else + data["scale"] = scale + if(isgenerator(grow)) + data["grow"] = return_generator_args(grow) + else + data["grow"] = grow //float OR list(x,y) + if(isgenerator(rotation)) + data["rotation"] = return_generator_args(rotation) + else + data["rotation"] = rotation + if(isgenerator(spin)) + data["spin"] = return_generator_args(spin) + else + data["spin"] = spin //float + if(isgenerator(friction)) + data["friction"] = return_generator_args(friction) + else + data["friction"] = friction //float: 0-1 + + //evaluated every tick + if(isgenerator(drift)) + data["drift"] = return_generator_args(drift) + else + data["drift"] = drift + return data + +/datum/particle_editor/tgui_data(mob/user) + var/list/data = list() + data["target_name"] = target.name + if(!target.particles) + target.particles = new /particles + data["particle_data"] = target.particles.return_ui_representation(user) + return data + +/datum/particle_editor/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state) + . = ..() + if(.) + return + + switch(action) + if("delete_and_close") + ui.close() + target.particles = null + target = null + . = FALSE + if("new_type") + var/new_type = pick_closest_path(/particles, make_types_fancy(typesof(/particles))) + if(!new_type) + return FALSE + target.particles = new new_type + target.particles.datum_flags |= DF_VAR_EDITED + . = TRUE + if("transform_size") + var/list/matrix_size = list("Simple Matrix" = 6, "Complex Matrix" = 12, "Projection Matrix" = 16) + var/new_size = matrix_size[params["new_value"]] + if(!new_size) + return FALSE + . = TRUE + target.particles.datum_flags |= DF_VAR_EDITED + if(!target.particles.transform || length(target.particles.transform) != new_size) + switch(new_size) + if(6) + target.particles.transform = list(1,0,0, 1,0,0) // TRANSFORM_MATRIX_IDENTITY seems wrong for only particles? + if(12) + target.particles.transform = TRANSFORM_COMPLEX_MATRIX_IDENTITY + if(16) + target.particles.transform = TRANSFORM_PROJECTION_MATRIX_IDENTITY + return + if("edit") + var/particles/owner = target.particles + var/param_var_name = params["var"] + if(!(param_var_name in owner.vars)) + return FALSE + var/var_value = params["new_value"] + var/var_mod = params["var_mod"] + // we can only return arrays from tgui so lets convert it to something usable if needed + switch(var_mod) + if(P_DATA_GENERATOR) + //these MUST be vectors and the others MUST be floats + if(var_value[1] in list(GEN_VECTOR, GEN_BOX)) + if(!islist(var_value[2])) + var_value[2] = list(var_value[2],var_value[2],var_value[2]) + if(!islist(var_value[3])) + var_value[3] = list(var_value[3],var_value[3],var_value[3]) + //this means we just switched off a vector-requiring generator type + else if(islist(var_value[2]) && islist(var_value[3])) + var_value[2] = var_value[1] + var_value[3] = var_value[1] + var_value = generator(arglist(var_value)) + if(P_DATA_ICON_ADD) + var_value = pick_and_customize_icon(ui.user, pick_only=TRUE) + if(!var_value) + return FALSE + var/list/new_values = list() + new_values += var_value + new_values[var_value] = 1 + if(isicon(owner.icon)) + new_values[owner.icon] = 1 + owner.icon = new_values + else if(islist(owner.icon)) + owner.icon[var_value] = 1 + else + owner.icon = new_values + target.particles.datum_flags |= DF_VAR_EDITED + return TRUE + if(P_DATA_ICON_REMOVE) + for(var/file in owner.icon) + if("[file]" == var_value) + owner.icon -= file + UNSETEMPTY(owner.icon) + target.particles.datum_flags |= DF_VAR_EDITED + return TRUE + if(P_DATA_ICON_WEIGHT) + // [filename, new_weight] + var/list/mod_data = var_value + for(var/file in owner.icon) + if("[file]" == mod_data[1]) + owner.icon[file] = mod_data[2] + target.particles.datum_flags |= DF_VAR_EDITED + return TRUE + if(P_DATA_GRADIENT) + var/list/new_grad_list = list() + for(var/entry in var_value) + new_grad_list += entry // Unpackage nested lists + owner.gradient = new_grad_list + target.particles.datum_flags |= DF_VAR_EDITED + return TRUE + + owner.vars[param_var_name] = var_value + target.particles.datum_flags |= DF_VAR_EDITED + return TRUE diff --git a/code/datums/reference_tracking_new.dm b/code/modules/admin/view_variables/reference_tracking.dm similarity index 97% rename from code/datums/reference_tracking_new.dm rename to code/modules/admin/view_variables/reference_tracking.dm index 56200a7d4e..b9fd0e6d2a 100644 --- a/code/datums/reference_tracking_new.dm +++ b/code/modules/admin/view_variables/reference_tracking.dm @@ -1,10 +1,6 @@ -// Drop in replacement for reference tracking #ifdef REFERENCE_TRACKING #define REFSEARCH_RECURSE_LIMIT 64 -/datum - var/references_to_clear - /datum/proc/find_references(references_to_clear = INFINITY) if(usr?.client) if(tgui_alert(usr,"Running this will lock everything up for about 5 minutes. Would you like to begin the search?", "Find References", list("Yes", "No")) != "Yes") @@ -17,8 +13,7 @@ _search_references() //restart the garbage collector SSgarbage.can_fire = TRUE - SSgarbage.next_fire = world.time + world.tick_lag - //SSgarbage.update_nextfire(reset_time = TRUE) + SSgarbage.update_nextfire(reset_time = TRUE) /datum/proc/_search_references() log_reftracker("Beginning search for references to a [type], looking for [references_to_clear] refs.") diff --git a/code/modules/admin/view_variables/tag_datum.dm b/code/modules/admin/view_variables/tag_datum.dm new file mode 100644 index 0000000000..b4ca42860c --- /dev/null +++ b/code/modules/admin/view_variables/tag_datum.dm @@ -0,0 +1,16 @@ +/client/proc/tag_datum(datum/target_datum) + if(!holder || QDELETED(target_datum)) + return + holder.add_tagged_datum(target_datum) + +/client/proc/toggle_tag_datum(datum/target_datum) + if(!holder || !target_datum) + return + + if(LAZYFIND(holder.tagged_datums, target_datum)) + holder.remove_tagged_datum(target_datum) + else + holder.add_tagged_datum(target_datum) + +ADMIN_VERB_ONLY_CONTEXT_MENU(tag_datum, R_NONE, "Tag Datum", datum/target_datum as mob|obj|turf|area in view()) + user.tag_datum(target_datum) diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm index 22b1dbe4ef..3d82c7b6bf 100644 --- a/code/modules/admin/view_variables/topic.dm +++ b/code/modules/admin/view_variables/topic.dm @@ -1,587 +1,157 @@ //DO NOT ADD MORE TO THIS FILE. -//Use vv_do_topic()! +//Use vv_do_topic() for datums! /client/proc/view_var_Topic(href, href_list, hsrc) - if((usr.client != src) || !check_rights(R_HOLDER)) + if(!check_rights_for(src, R_VAREDIT) || !holder.CheckAdminHref(href, href_list)) return - var/datum/target = locate(href_list["target"]) - if(istype(target)) - target.vv_do_topic(href_list) + var/target = GET_VV_TARGET + vv_do_basic(target, href_list, href) + if(isdatum(target)) + var/datum/D = target + D.vv_do_topic(href_list) else if(islist(target)) vv_do_list(target, href_list) - if(href_list["Vars"]) - debug_variables(locate(href_list["Vars"])) + var/datum/vars_target = locate(href_list["Vars"]) + if(href_list["special_varname"]) // Some special vars can't be located even if you have their ref, you have to use this instead + vars_target = vars_target.vars[href_list["special_varname"]] + debug_variables(vars_target) - //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). - else if(href_list["rename"]) - if(!check_rights(R_VAREDIT)) return +//~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records). + if(href_list["rename"]) - var/mob/M = locate(href_list["rename"]) + var/mob/M = locate(href_list["rename"]) in mob_list if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") + to_chat(usr, "This can only be used on instances of type /mob", confidential = TRUE) return - var/new_name = sanitize(tgui_input_text(src,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN), MAX_NAME_LEN) - if( !new_name || !M ) return + var/new_name = stripped_input(usr,"What would you like to name this mob?","Input a name",M.real_name,MAX_NAME_LEN) + + // If the new name is something that would be restricted by IC chat filters, + // give the admin a warning but allow them to do it anyway if they want. + //if(is_ic_filtered(new_name) || is_soft_ic_filtered(new_name) && tgui_alert(usr, "Your selected name contains words restricted by IC chat filters. Confirm this new name?", "IC Chat Filter Conflict", list("Confirm", "Cancel")) == "Cancel") + // return + + if( !new_name || !M ) + return message_admins("Admin [key_name_admin(usr)] renamed [key_name_admin(M)] to [new_name].") M.fully_replace_character_name(M.real_name,new_name) - href_list["datumrefresh"] = href_list["rename"] - - else if(href_list["varnameedit"] && href_list["datumedit"]) - if(!check_rights(R_VAREDIT)) return - - var/D = locate(href_list["datumedit"]) - if(!istype(D,/datum) && !istype(D,/client)) - to_chat(src, "This can only be used on instances of types /client or /datum") - return - - modify_variables(D, href_list["varnameedit"], 1) - - else if(href_list["varnamechange"] && href_list["datumchange"]) - if(!check_rights(R_VAREDIT)) return - - var/D = locate(href_list["datumchange"]) - if(!istype(D,/datum) && !istype(D,/client)) - to_chat(src, "This can only be used on instances of types /client or /datum") - return - - modify_variables(D, href_list["varnamechange"], 0) - - else if(href_list["varnamemass"] && href_list["datummass"]) - if(!check_rights(R_VAREDIT)) return - - var/atom/A = locate(href_list["datummass"]) - if(!istype(A)) - to_chat(src, "This can only be used on instances of type /atom") - return - - cmd_mass_modify_object_variables(A, href_list["varnamemass"]) - - else if(href_list["mob_player_panel"]) - if(!check_rights(0)) return - - var/mob/M = locate(href_list["mob_player_panel"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - src.holder.show_player_panel(M) - href_list["datumrefresh"] = href_list["mob_player_panel"] - - else if(href_list["give_spell"]) - if(!check_rights(R_ADMIN|R_FUN|R_EVENT)) return - - var/mob/M = locate(href_list["give_spell"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - src.give_spell(M) - href_list["datumrefresh"] = href_list["give_spell"] - - else if(href_list["give_modifier"]) - if(!check_rights(R_ADMIN|R_FUN|R_DEBUG|R_EVENT)) - return - - var/mob/living/M = locate(href_list["give_modifier"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob/living") - return - - src.admin_give_modifier(M) - href_list["datumrefresh"] = href_list["give_modifier"] - - else if(href_list["give_wound_internal"]) - if(!check_rights(R_ADMIN|R_FUN|R_DEBUG|R_EVENT)) - return - - var/mob/living/carbon/human/H = locate(href_list["give_wound_internal"]) - if(!istype(H)) - to_chat(src, span_notice("This can only be used on instances of type /mob/living/carbon/human")) - return - - var/severity = tgui_input_number(src, "How much damage should the bleeding internal wound cause? \ - Bleed timer directly correlates with this. 0 cancels. Input is rounded to nearest integer.", - "Wound Severity", 0) - if(!severity) return - - var/obj/item/organ/external/chosen_organ = tgui_input_list(src, "Choose an external organ to inflict IB on!", "Organ Choice", H.organs) - if(!chosen_organ || !istype(chosen_organ)) - to_chat(usr, span_notice("The chosen organ is of inappropriate type or no longer exists.")) - return - - var/datum/wound/internal_bleeding/I = new /datum/wound/internal_bleeding(severity) - if(!I || !istype(I)) - to_chat(src, span_notice("Could not initialize internal wound")) - log_debug("[usr] attempted to create an internal bleeding wound on [H]'s [chosen_organ] of [severity] damage \ - and wound initialization failed") - - chosen_organ.wounds += I - chosen_organ.update_wounds() - chosen_organ.update_damages() - H.bad_external_organs += chosen_organ - H.handle_organs() - - if(H.client) - H.custom_pain("You feel a throbbing pain inside your [chosen_organ]", severity, force=TRUE) - log_and_message_admins("created an Internal Bleeding wound on [H.ckey]'s mob [H] on [chosen_organ] of [severity] damage", usr) - - href_list["datumrefresh"] = href_list["give_wound_internal"] - - else if(href_list["godmode"]) - if(!check_rights(R_REJUVINATE)) return - - var/mob/M = locate(href_list["godmode"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - src.cmd_admin_godmode(M) - href_list["datumrefresh"] = href_list["godmode"] - - else if(href_list["gib"]) - if(!check_rights(0)) return - - var/mob/M = locate(href_list["gib"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - src.cmd_admin_gib(M) - - else if(href_list["build_mode"]) - if(!check_rights(R_BUILDMODE)) return - - var/mob/M = locate(href_list["build_mode"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - togglebuildmode(M) - href_list["datumrefresh"] = href_list["build_mode"] - - else if(href_list["drop_everything"]) - if(!check_rights(R_DEBUG|R_ADMIN|R_EVENT)) return - - var/mob/M = locate(href_list["drop_everything"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - if(usr.client) - usr.client.cmd_admin_drop_everything(M) - - else if(href_list["direct_control"]) - if(!check_rights(0)) return - - var/mob/M = locate(href_list["direct_control"]) - if(!istype(M)) - to_chat(src, "This can only be used on instances of type /mob") - return - - if(usr.client) - usr.client.cmd_assume_direct_control(M) - - else if(href_list["give_ai"]) - if(!check_rights(0)) return - - var/mob/M = locate(href_list["give_ai"]) - if(!isliving(M)) - to_chat(src, span_notice("This can only be used on instances of type /mob/living")) - return - var/mob/living/L = M - if(L.client || L.teleop) - to_chat(src, span_warning("This cannot be used on player mobs!")) - return - - if(L.ai_holder) //Cleaning up the original ai - var/ai_holder_old = L.ai_holder - L.ai_holder = null - qdel(ai_holder_old) //Only way I could make #TESTING - Unable to be GC'd to stop. del() logs show it works. - L.ai_holder_type = tgui_input_list(src, "Choose AI holder", "AI Type", typesof(/datum/ai_holder/)) - L.initialize_ai_holder() - L.faction = sanitize(tgui_input_text(src, "Please input AI faction", "AI faction", "neutral")) - L.a_intent = tgui_input_list(src, "Please choose AI intent", "AI intent", list(I_HURT, I_HELP)) - if(tgui_alert(src, "Make mob wake up? This is needed for carbon mobs.", "Wake mob?", list("Yes", "No")) == "Yes") - L.AdjustSleeping(-100) - - else if(href_list["make_skeleton"]) - if(!check_rights(R_FUN)) return - - var/mob/living/carbon/human/H = locate(href_list["make_skeleton"]) - if(!istype(H)) - to_chat(src, "This can only be used on instances of type /mob/living/carbon/human") - return - - H.ChangeToSkeleton() - href_list["datumrefresh"] = href_list["make_skeleton"] - - else if(href_list["delall"]) - if(!check_rights(R_DEBUG|R_SERVER)) - return - - var/obj/O = locate(href_list["delall"]) - if(!isobj(O)) - to_chat(src, "This can only be used on instances of type /obj") - return - - var/action_type = tgui_alert(src, "Strict type ([O.type]) or type and all subtypes?","Type Selection",list("Strict type","Type and subtypes","Cancel")) - if(action_type == "Cancel" || !action_type) - return - - if(tgui_alert(src, "Are you really sure you want to delete all objects of type [O.type]?","Delete All?",list("Yes","No")) != "Yes") - return - - if(tgui_alert(src, "Second confirmation required. Delete?","REALLY?",list("Yes","No")) != "Yes") - return - - var/O_type = O.type - switch(action_type) - if("Strict type") - var/i = 0 - for(var/obj/Obj in world) - if(Obj.type == O_type) - i++ - qdel(Obj) - CHECK_TICK - if(!i) - to_chat(src, "No objects of this type exist") - return - log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ") - message_admins(span_notice("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")) - if("Type and subtypes") - var/i = 0 - for(var/obj/Obj in world) - if(istype(Obj,O_type)) - i++ - qdel(Obj) - CHECK_TICK - if(!i) - to_chat(src, "No objects of this type exist") - return - log_admin("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ") - message_admins(span_notice("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")) - else if(href_list["fakepdapropconvo"]) - if(!check_rights(R_FUN)) return - - var/obj/item/pda/P = locate(href_list["fakepdapropconvo"]) - if(!istype(P)) - to_chat(src, span_warning("This can only be done to instances of type /pda")) - return - - P.createPropFakeConversation_admin(usr) + vv_update_display(M, "name", new_name) + vv_update_display(M, "real_name", M.real_name || "No real name") else if(href_list["rotatedatum"]) - if(!check_rights(0)) return var/atom/A = locate(href_list["rotatedatum"]) if(!istype(A)) - to_chat(src, "This can only be done to instances of type /atom") + to_chat(usr, "This can only be done to instances of type /atom", confidential = TRUE) return switch(href_list["rotatedir"]) - if("right") A.set_dir(turn(A.dir, -45)) - if("left") A.set_dir(turn(A.dir, 45)) - href_list["datumrefresh"] = href_list["rotatedatum"] + if("right") + A.set_dir(turn(A.dir, -45)) + if("left") + A.set_dir(turn(A.dir, 45)) + vv_update_display(A, "dir", dir2text(A.dir)) - else if(href_list["makemonkey"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makemonkey"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon/human") - return - - if(tgui_alert(src, "Confirm mob type change?","Confirm",list("Transform","Cancel")) != "Transform") return - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - holder.Topic(href, list("monkeyone"=href_list["makemonkey"])) - - else if(href_list["makerobot"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makerobot"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon/human") - return - - if(tgui_alert(src, "Confirm mob type change?","Confirm",list("Transform","Cancel")) != "Transform") return - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - holder.Topic(href, list("makerobot"=href_list["makerobot"])) - - else if(href_list["makealien"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makealien"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon/human") - return - - if(tgui_alert(src, "Confirm mob type change?","Confirm",list("Transform","Cancel")) != "Transform") return - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - holder.Topic(href, list("makealien"=href_list["makealien"])) - - else if(href_list["makeai"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["makeai"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon/human") - return - - if(tgui_alert(src, "Confirm mob type change?","Confirm",list("Transform","Cancel")) != "Transform") return - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - holder.Topic(href, list("makeai"=href_list["makeai"])) - - else if(href_list["setspecies"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/human/H = locate(href_list["setspecies"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon/human") - return - - var/new_species = tgui_input_list(src, "Please choose a new species.","Species", GLOB.all_species) - - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - - if(H.set_species(new_species)) - to_chat(src, "Set species of [H] to [H.species].") - else - to_chat(src, "Failed! Something went wrong.") - - else if(href_list["addlanguage"]) - if(!check_rights(R_SPAWN)) return - - var/mob/H = locate(href_list["addlanguage"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob") - return - - var/new_language = tgui_input_list(src, "Please choose a language to add.","Language", GLOB.all_languages) - - if(!new_language) - return - - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - - if(H.add_language(new_language)) - to_chat(src, "Added [new_language] to [H].") - else - to_chat(src, "Mob already knows that language.") - - else if(href_list["remlanguage"]) - if(!check_rights(R_SPAWN)) return - - var/mob/H = locate(href_list["remlanguage"]) - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob") - return - - if(!H.languages.len) - to_chat(src, "This mob knows no languages.") - return - - var/datum/language/rem_language = tgui_input_list(src, "Please choose a language to remove.","Language", H.languages) - - if(!rem_language) - return - - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - - if(H.remove_language(rem_language.name)) - to_chat(src, "Removed [rem_language] from [H].") - else - to_chat(src, "Mob doesn't know that language.") - - else if(href_list["addverb"]) - if(!check_rights(R_DEBUG)) return - - var/mob/H = locate(href_list["addverb"]) - - if(!ismob(H)) - to_chat(src, "This can only be done to instances of type /mob") - return - var/list/possibleverbs = list() - possibleverbs += "Cancel" // One for the top... - possibleverbs += typesof(/mob/proc, /mob/verb) - if(isobserver(H)) - possibleverbs += typesof(/mob/observer/dead/proc,/mob/observer/dead/verb) - if(isliving(H)) - possibleverbs += typesof(/mob/living/proc,/mob/living/verb) - if(ishuman(H)) - possibleverbs += typesof(/mob/living/carbon/proc,/mob/living/carbon/verb,/mob/living/carbon/human/verb,/mob/living/carbon/human/proc) - if(isrobot(H)) - possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/robot/proc,/mob/living/silicon/robot/verb) - if(isAI(H)) - possibleverbs += typesof(/mob/living/silicon/proc,/mob/living/silicon/ai/proc,/mob/living/silicon/ai/verb) - if(isanimal(H)) - possibleverbs += typesof(/mob/living/simple_mob/proc) - possibleverbs -= H.verbs - possibleverbs += "Cancel" // ...And one for the bottom - - var/verb = tgui_input_list(src, "Select a verb!", "Verbs", possibleverbs) - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - if(!verb || verb == "Cancel") - return - else - add_verb(H, verb) - - else if(href_list["remverb"]) - if(!check_rights(R_DEBUG)) return - - var/mob/H = locate(href_list["remverb"]) - - if(!istype(H)) - to_chat(src, "This can only be done to instances of type /mob") - return - var/verb = tgui_input_list(src, "Please choose a verb to remove.","Verbs", H.verbs) - if(!H) - to_chat(src, "Mob doesn't exist anymore") - return - if(!verb) - return - else - remove_verb(H, verb) - - else if(href_list["addorgan"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/M = locate(href_list["addorgan"]) - if(!istype(M)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon") - return - - var/new_organ = tgui_input_list(src, "Please choose an organ to add.","Organ", subtypesof(/obj/item/organ)) - if(!new_organ) return - - if(!M) - to_chat(src, "Mob doesn't exist anymore") - return - - if(locate(new_organ) in M.internal_organs) - to_chat(src, "Mob already has that organ.") - return - - new new_organ(M) - - - else if(href_list["remorgan"]) - if(!check_rights(R_SPAWN)) return - - var/mob/living/carbon/M = locate(href_list["remorgan"]) - if(!istype(M)) - to_chat(src, "This can only be done to instances of type /mob/living/carbon") - return - - var/obj/item/organ/rem_organ = tgui_input_list(src, "Please choose an organ to remove.","Organ", M.internal_organs) - - if(!M) - to_chat(src, "Mob doesn't exist anymore") - return - - if(!(locate(rem_organ) in M.internal_organs)) - to_chat(src, "Mob does not have that organ.") - return - - to_chat(src, "Removed [rem_organ] from [M].") - rem_organ.removed() - qdel(rem_organ) - - else if(href_list["fix_nano"]) - if(!check_rights(R_DEBUG)) return - - var/mob/H = locate(href_list["fix_nano"]) - - if(!istype(H) || !H.client) - to_chat(src, "This can only be done on mobs with clients") - return - - H.client.send_resources() - - to_chat(src, "Resource files sent") - to_chat(H, "Your NanoUI Resource files have been refreshed") - - log_admin("[key_name(usr)] resent the NanoUI resource files to [key_name(H)] ") - - else if(href_list["regenerateicons"]) - if(!check_rights(0)) return - - var/mob/M = locate(href_list["regenerateicons"]) - if(!ismob(M)) - to_chat(src, "This can only be done to instances of type /mob") - return - M.regenerate_icons() else if(href_list["adjustDamage"] && href_list["mobToDamage"]) - if(!check_rights(R_DEBUG|R_ADMIN|R_FUN|R_EVENT)) return - var/mob/living/L = locate(href_list["mobToDamage"]) - if(!istype(L)) return + var/mob/living/L = locate(href_list["mobToDamage"]) in mob_list + if(!istype(L)) + return var/Text = href_list["adjustDamage"] - var/amount = tgui_input_number(src, "Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0, min_value=-INFINITY, round_value=FALSE) + var/amount = tgui_input_number(src, "Deal how much damage to mob? (Negative values here heal)", "Adjust [Text]loss", 0, min_value=-INFINITY, round_value=FALSE) - if(!L) - to_chat(src, "Mob doesn't exist anymore") + if (isnull(amount)) return + if(!L) + to_chat(usr, "Mob doesn't exist anymore", confidential = TRUE) + return + + var/newamt switch(Text) - if("brute") L.adjustBruteLoss(amount) - if("fire") L.adjustFireLoss(amount) - if("toxin") L.adjustToxLoss(amount) - if("oxygen")L.adjustOxyLoss(amount) - if("brain") L.adjustBrainLoss(amount) - if("clone") L.adjustCloneLoss(amount) + if("brute") + L.adjustBruteLoss(amount) + newamt = L.getBruteLoss() + if("fire") + L.adjustFireLoss(amount) + newamt = L.getFireLoss() + if("toxin") + L.adjustToxLoss(amount) + newamt = L.getToxLoss() + if("oxygen") + L.adjustOxyLoss(amount) + newamt = L.getOxyLoss() + if("brain") + L.adjustBrainLoss(amount) + newamt = L.getBrainLoss() + if("clone") + L.adjustCloneLoss(amount) + newamt = L.getCloneLoss() + //if("brain") + // L.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount) + // newamt = L.get_organ_loss(ORGAN_SLOT_BRAIN) + //if("stamina") + // L.adjustStaminaLoss(amount, forced = TRUE) + // newamt = L.getStaminaLoss() else - to_chat(src, "You caused an error. DEBUG: Text:[Text] Mob:[L]") + to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]", confidential = TRUE) return if(amount != 0) - log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]") - message_admins(span_notice("[key_name(usr)] dealt [amount] amount of [Text] damage to [L]")) - href_list["datumrefresh"] = href_list["mobToDamage"] - else if(href_list["expose"]) - if(!check_rights(R_ADMIN, FALSE)) - return - var/thing = locate(href_list["expose"]) - if(!thing) //Do NOT QDELETED check! - return - var/value = vv_get_value(VV_CLIENT) - if (value["class"] != VV_CLIENT) - return - var/client/C = value["value"] - if (!C) - return - var/prompt = tgui_alert(src, "Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anysrc nor open nested vv windows unless they themselves are an admin)", "Confirm", list("Yes", "No")) - if (prompt != "Yes") - return - if(!thing) - to_chat(src, span_warning("The object you tried to expose to [C] no longer exists (GC'd)")) - return - message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") - log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [src]") - to_chat(C, "[holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window") - C.debug_variables(thing) + var/log_msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [key_name(L)]" + message_admins("[key_name(usr)] dealt [amount] amount of [Text] damage to [ADMIN_LOOKUPFLW(L)]") + log_admin(log_msg) + admin_ticket_log(L, "[log_msg]") + vv_update_display(L, Text, "[newamt]") + else if(href_list["item_to_tweak"] && href_list["var_tweak"]) + + var/obj/item/editing = locate(href_list["item_to_tweak"]) + if(!istype(editing) || QDELING(editing)) + return + + var/existing_val = -1 + switch(href_list["var_tweak"]) + if("damtype") + existing_val = editing.damtype + if("force") + existing_val = editing.force + //if("wound") + // existing_val = editing.wound_bonus + //if("bare wound") + // existing_val = editing.exposed_wound_bonus + else + CRASH("Invalid var_tweak passed to item vv set var: [href_list["var_tweak"]]") + + var/new_val + if(href_list["var_tweak"] == "damtype") + //new_val = tgui_input_list(usr, "Enter the new damage type for [editing]", "Set Damtype", list(BRUTE, BURN, TOX, OXY, STAMINA, BRAIN), existing_val) + new_val = tgui_input_list(usr, "Enter the new damage type for [editing]","Set Damtype", list(BRUTE, BURN, TOX, OXY, CLONE, HALLOSS, ELECTROCUTE, BIOACID, SEARING, ELECTROMAG), existing_val) + else + new_val = tgui_input_number(usr, "Enter the new value for [editing]'s [href_list["var_tweak"]]","Set [href_list["var_tweak"]]", existing_val) + if(isnull(new_val) || new_val == existing_val || QDELETED(editing) || !check_rights(R_VAREDIT)) + return + + switch(href_list["var_tweak"]) + if("damtype") + editing.damtype = new_val + if("force") + editing.force = new_val + //if("wound") + // editing.wound_bonus = new_val + //if("bare wound") + // editing.exposed_wound_bonus = new_val + + message_admins("[key_name(usr)] set [editing]'s [href_list["var_tweak"]] to [new_val] (was [existing_val])") + log_admin("[key_name(usr)] set [editing]'s [href_list["var_tweak"]] to [new_val] (was [existing_val])") + vv_update_display(editing, href_list["var_tweak"], istext(new_val) ? uppertext(new_val) : new_val) + + //Finally, refresh if something modified the list. if(href_list["datumrefresh"]) var/datum/DAT = locate(href_list["datumrefresh"]) - if(istype(DAT, /datum) || istype(DAT, /client) || islist(DAT)) + if(isdatum(DAT) || istype(DAT, /client) || islist(DAT)) debug_variables(DAT) diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm new file mode 100644 index 0000000000..679eb97fff --- /dev/null +++ b/code/modules/admin/view_variables/topic_basic.dm @@ -0,0 +1,145 @@ +//Not using datum.vv_do_topic for very basic/low level debug things, incase the datum's vv_do_topic is runtiming/whatnot. +/client/proc/vv_do_basic(datum/target, href_list) + var/target_var = GET_VV_VAR_TARGET + if(check_rights(R_VAREDIT)) + if(target_var) + if(href_list[VV_HK_BASIC_EDIT]) + if(!modify_variables(target, target_var, 1)) + return + switch(target_var) + if("name") + vv_update_display(target, "name", "[target]") + if("dir") + var/atom/A = target + if(istype(A)) + vv_update_display(target, "dir", dir2text(A.dir) || A.dir) + if("ckey") + var/mob/living/L = target + if(istype(L)) + vv_update_display(target, "ckey", L.ckey || "No ckey") + if("real_name") + var/mob/living/L = target + if(istype(L)) + vv_update_display(target, "real_name", L.real_name || "No real name") + + if(href_list[VV_HK_BASIC_CHANGE]) + modify_variables(target, target_var, 0) + if(href_list[VV_HK_BASIC_MASSEDIT]) + cmd_mass_modify_object_variables(target, target_var) + if(check_rights(R_ADMIN, FALSE)) + if(href_list[VV_HK_EXPOSE]) + var/value = vv_get_value(VV_CLIENT) + if (value["class"] != VV_CLIENT) + return + var/client/C = value["value"] + if (!C) + return + if(!target) + to_chat(usr, span_warning("The object you tried to expose to [C] no longer exists (nulled or hard-deled)"), confidential = TRUE) + return + message_admins("[key_name_admin(usr)] Showed [key_name_admin(C)] a VV window") + log_admin("Admin [key_name(usr)] Showed [key_name(C)] a VV window of a [target]") + to_chat(C, "[holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window", confidential = TRUE) + C.debug_variables(target) + if(check_rights(R_DEBUG)) + if(href_list[VV_HK_DELETE]) + usr.client.admin_delete(target) + if (isturf(target)) // show the turf that took its place + usr.client.debug_variables(target) + return + + if(href_list[VV_HK_MARK]) + usr.client.mark_datum(target) + if(href_list[VV_HK_TAG]) + usr.client.tag_datum(target) + if(href_list[VV_HK_ADDCOMPONENT]) + if(!check_rights(NONE)) + return + var/list/names = list() + var/list/componentsubtypes = sortList(subtypesof(/datum/component), GLOBAL_PROC_REF(cmp_typepaths_asc)) + names += "---Components---" + names += componentsubtypes + names += "---Elements---" + names += sortList(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) + + var/result = tgui_input_list(usr, "Choose a component/element to add", "Add Component", names) + if(isnull(result)) + return + if(!usr || result == "---Components---" || result == "---Elements---") + return + + if(QDELETED(src)) + to_chat(usr, "That thing doesn't exist anymore!", confidential = TRUE) + return + + var/add_source + if(ispath(result, /datum/component)) + var/datum/component/comp_path = result + if(initial(comp_path.dupe_mode) == COMPONENT_DUPE_SOURCES) + add_source = tgui_input_text(usr, "Enter a source for the component", "Add Component", "ADMIN-ABUSE") + if(isnull(add_source)) + return + + var/list/lst = get_callproc_args() + if(!lst) + return + + var/datumname = "error" + lst.Insert(1, result) + if(result in componentsubtypes) + datumname = "component" + target._AddComponent(lst, add_source) + else + datumname = "element" + target._AddElement(lst) + log_admin("[key_name(usr)] has added [result] [datumname] to [key_name(target)].") + message_admins(span_notice("[key_name_admin(usr)] has added [result] [datumname] to [key_name_admin(target)].")) + if(href_list[VV_HK_REMOVECOMPONENT] || href_list[VV_HK_MASS_REMOVECOMPONENT]) + if(!check_rights(NONE)) + return + var/mass_remove = href_list[VV_HK_MASS_REMOVECOMPONENT] + var/list/components = target._datum_components.Copy() + var/list/names = list() + names += "---Components---" + if(length(components)) + names += sortList(components, GLOBAL_PROC_REF(cmp_typepaths_asc)) + names += "---Elements---" + // We have to list every element here because there is no way to know what element is on this object without doing some sort of hack. + names += sortList(subtypesof(/datum/element), GLOBAL_PROC_REF(cmp_typepaths_asc)) + var/path = tgui_input_list(usr, "Choose a component/element to remove. All elements listed here may not be on the datum.", "Remove element", names) + if(isnull(path)) + return + if(!usr || path == "---Components---" || path == "---Elements---") + return + if(QDELETED(src)) + to_chat(usr, "That thing doesn't exist anymore!") + return + var/list/targets_to_remove_from = list(target) + if(mass_remove) + var/method = vv_subtype_prompt(target.type) + targets_to_remove_from = get_all_of_type(target.type, method) + + if(alert(usr, "Are you sure you want to mass-delete [path] on [target.type]?", "Mass Remove Confirmation", "Yes", "No") == "No") + return + + for(var/datum/target_to_remove_from as anything in targets_to_remove_from) + if(ispath(path, /datum/element)) + var/list/lst = get_callproc_args() + if(!lst) + lst = list() + lst.Insert(1, path) + target._RemoveElement(lst) + else + var/list/components_actual = target_to_remove_from.GetComponents(path) + for(var/to_delete in components_actual) + qdel(to_delete) + + message_admins(span_notice("[key_name_admin(usr)] has [mass_remove? "mass" : ""] removed [path] component from [mass_remove? target.type : key_name_admin(target)].")) + //if(href_list[VV_HK_MODIFY_GREYSCALE]) + // if(!check_rights(NONE)) + // return + // var/datum/greyscale_modify_menu/menu = new(target, usr, SSgreyscale.configurations, unlocked = TRUE) + // menu.ui_interact(usr) + + if(href_list[VV_HK_CALLPROC]) + return SSadmin_verbs.dynamic_invoke_verb(usr, /datum/admin_verb/call_proc_datum, target) diff --git a/code/modules/admin/view_variables/topic_list.dm b/code/modules/admin/view_variables/topic_list.dm index 1f535f2b42..b699dfdc0b 100644 --- a/code/modules/admin/view_variables/topic_list.dm +++ b/code/modules/admin/view_variables/topic_list.dm @@ -1,44 +1,43 @@ //LISTS - CAN NOT DO VV_DO_TOPIC BECAUSE LISTS AREN'T DATUMS :( /client/proc/vv_do_list(list/target, href_list) - if(!check_rights(R_VAREDIT)) - return - var/target_index = text2num(href_list["index"]) - if(target_index) - if(href_list[VV_HK_LIST_EDIT]) - mod_list(target, null, "list", "contents", target_index, autodetect_class = TRUE) - if(href_list[VV_HK_LIST_CHANGE]) - mod_list(target, null, "list", "contents", target_index, autodetect_class = FALSE) - if(href_list[VV_HK_LIST_REMOVE]) - var/variable = target[target_index] - var/prompt = tgui_alert(usr, "Do you want to remove item number [target_index] from list?", "Confirm", list("Yes", "No")) - if (prompt != "Yes") + var/target_index = text2num(GET_VV_VAR_TARGET) + if(check_rights(R_VAREDIT)) + if(target_index) + if(href_list[VV_HK_LIST_EDIT]) + mod_list(target, null, "list", "contents", target_index, autodetect_class = TRUE) + if(href_list[VV_HK_LIST_CHANGE]) + mod_list(target, null, "list", "contents", target_index, autodetect_class = FALSE) + if(href_list[VV_HK_LIST_REMOVE]) + var/variable = target[target_index] + var/prompt = tgui_alert(usr,"Do you want to remove item number [target_index] from list?", "Confirm", list("Yes", "No")) + if (prompt != "Yes") + return + target.Cut(target_index, target_index+1) + log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]") + log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]") + message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]") + if(href_list[VV_HK_LIST_ADD]) + mod_list_add(target, null, "list", "contents") + if(href_list[VV_HK_LIST_ERASE_DUPES]) + uniqueList_inplace(target) + log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES") + log_admin("[key_name(src)] modified list's contents: CLEAR DUPES") + message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES") + if(href_list[VV_HK_LIST_ERASE_NULLS]) + list_clear_nulls(target) + log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS") + log_admin("[key_name(src)] modified list's contents: CLEAR NULLS") + message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS") + if(href_list[VV_HK_LIST_SET_LENGTH]) + var/value = vv_get_value(VV_NUM) + if (value["class"] != VV_NUM || value["value"] > max(50000, target.len)) //safety - would rather someone not put an extra 0 and erase the server's memory lmao. return - target.Cut(target_index, target_index+1) - log_world("### ListVarEdit by [src]: /list's contents: REMOVED=[html_encode("[variable]")]") - log_admin("[key_name(src)] modified list's contents: REMOVED=[variable]") - message_admins("[key_name_admin(src)] modified list's contents: REMOVED=[variable]") - if(href_list[VV_HK_LIST_ADD]) - mod_list_add(target, null, "list", "contents") - if(href_list[VV_HK_LIST_ERASE_DUPES]) - uniqueList_inplace(target) - log_world("### ListVarEdit by [src]: /list contents: CLEAR DUPES") - log_admin("[key_name(src)] modified list's contents: CLEAR DUPES") - message_admins("[key_name_admin(src)] modified list's contents: CLEAR DUPES") - if(href_list[VV_HK_LIST_ERASE_NULLS]) - listclearnulls(target) - log_world("### ListVarEdit by [src]: /list contents: CLEAR NULLS") - log_admin("[key_name(src)] modified list's contents: CLEAR NULLS") - message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS") - if(href_list[VV_HK_LIST_SET_LENGTH]) - var/value = vv_get_value(VV_NUM) - if (value["class"] != VV_NUM || value["value"] > max(5000, target.len)) //safety - would rather someone not put an extra 0 and erase the server's memory lmao. - return - target.len = value["value"] - log_world("### ListVarEdit by [src]: /list len: [target.len]") - log_admin("[key_name(src)] modified list's len: [target.len]") - message_admins("[key_name_admin(src)] modified list's len: [target.len]") - if(href_list[VV_HK_LIST_SHUFFLE]) - shuffle_inplace(target) - log_world("### ListVarEdit by [src]: /list contents: SHUFFLE") - log_admin("[key_name(src)] modified list's contents: SHUFFLE") - message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE") + target.len = value["value"] + log_world("### ListVarEdit by [src]: /list len: [target.len]") + log_admin("[key_name(src)] modified list's len: [target.len]") + message_admins("[key_name_admin(src)] modified list's len: [target.len]") + if(href_list[VV_HK_LIST_SHUFFLE]) + shuffle_inplace(target) + log_world("### ListVarEdit by [src]: /list contents: SHUFFLE") + log_admin("[key_name(src)] modified list's contents: SHUFFLE") + message_admins("[key_name_admin(src)] modified list's contents: SHUFFLE") diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 98dc6b89e7..e477ad7bc3 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -5,17 +5,17 @@ ADMIN_VERB_AND_CONTEXT_MENU(debug_variables, (R_DEBUG|R_SERVER|R_ADMIN|R_SPAWN|R user.debug_variables(thing) // This is kept as a separate proc because admins are able to show VV to non-admins -/client/proc/debug_variables(datum/D in world) +/client/proc/debug_variables(datum/thing in world) set category = "Debug.Investigate" set name = "View Variables" //set src in world var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. - if(!usr.client || !usr.client.holder) //The usr vs src abuse in this proc is intentional and must not be changed - to_chat(usr, span_danger("You need to be an administrator to access this.")) + if(!usr.client || !usr.client.holder) //This is usr because admins can call the proc on other clients, even if they're not admins, to show them VVs. + to_chat(usr, span_danger("You need to be an administrator to access this."), confidential = TRUE) return - if(!D) + if(!thing) return var/dark = usr.client.prefs ? usr.client.prefs.read_preference(/datum/preference/toggle/holder/vv_dark) : TRUE @@ -24,305 +24,306 @@ ADMIN_VERB_AND_CONTEXT_MENU(debug_variables, (R_DEBUG|R_SERVER|R_ADMIN|R_SPAWN|R var/datum/asset/asset_cache_datum = get_asset_datum(/datum/asset/simple/vv) asset_cache_datum.send(usr) - var/islist = islist(D) || (!isdatum(D) && hascall(D, "Cut")) // Some special lists don't count as lists, but can be detected by if they have list procs - if(!islist && !isdatum(D)) + if(isappearance(thing)) + thing = get_vv_appearance(thing) // this is /mutable_appearance/our_bs_subtype + var/islist = islist(thing) || (!isdatum(thing) && hascall(thing, "Cut")) // Some special lists don't count as lists, but can be detected by if they have list procs + if(!islist && !isdatum(thing)) return - //VOREStation Edit Start - the rest of this proc in a spawn - spawn(0) - var/title = "" - var/refid = "\ref[D]" - var/icon/sprite - var/hash + var/title = "" + var/refid = REF(thing) + var/icon/sprite + var/hash - var/type = islist ? /list : D.type - var/no_icon = FALSE + var/type = islist ? /list : thing.type + var/no_icon = FALSE - if(isatom(D)) - var/atom/AT = D - if(use_gfi) - sprite = getFlatIcon(D) - if(!sprite) - no_icon = TRUE - else if(AT.icon && AT.icon_state) - sprite = new /icon(AT.icon, AT.icon_state) - else + if(isatom(thing)) + var/atom/AT = thing + if(use_gfi) + sprite = getFlatIcon(thing) + if(!sprite) no_icon = TRUE + else if(AT.icon && AT.icon_state) + sprite = new /icon(AT.icon, AT.icon_state) + else + no_icon = TRUE - else if(isimage(D)) - // icon_state=null shows first image even if dmi has no icon_state for null name. - // This list remembers which dmi has null icon_state, to determine if icon_state=null should display a sprite - // (NOTE: icon_state="" is correct, but saying null is obvious) - var/static/list/dmi_nullstate_checklist = list() - var/image/image_object = D - var/icon_filename_text = "[image_object.icon]" // "icon(null)" type can exist. textifying filters it. - if(icon_filename_text) - if(image_object.icon_state) + else if(isimage(thing)) + // icon_state=null shows first image even if dmi has no icon_state for null name. + // This list remembers which dmi has null icon_state, to determine if icon_state=null should display a sprite + // (NOTE: icon_state="" is correct, but saying null is obvious) + var/static/list/dmi_nullstate_checklist = list() + var/image/image_object = thing + var/icon_filename_text = "[image_object.icon]" // "icon(null)" type can exist. textifying filters it. + if(icon_filename_text) + if(image_object.icon_state) + sprite = icon(image_object.icon, image_object.icon_state) + + else // it means: icon_state="" + if(!dmi_nullstate_checklist[icon_filename_text]) + dmi_nullstate_checklist[icon_filename_text] = ICON_STATE_CHECKED + if(icon_exists(image_object.icon, "")) + // this dmi has nullstate. We'll allow "icon_state=null" to show image. + dmi_nullstate_checklist[icon_filename_text] = ICON_STATE_NULL + + if(dmi_nullstate_checklist[icon_filename_text] == ICON_STATE_NULL) sprite = icon(image_object.icon, image_object.icon_state) - else // it means: icon_state="" - if(!dmi_nullstate_checklist[icon_filename_text]) - dmi_nullstate_checklist[icon_filename_text] = ICON_STATE_CHECKED - if(icon_exists(image_object.icon, "")) - // this dmi has nullstate. We'll allow "icon_state=null" to show image. - dmi_nullstate_checklist[icon_filename_text] = ICON_STATE_NULL + var/sprite_text + if(sprite) + hash = md5(sprite) + src << browse_rsc(sprite, "vv[hash].png") + sprite_text = no_icon ? "\[NO ICON\]" : "
-
-
-
-
-
- [formatted_type]
-
- [ref_line] - [marked_line] - [varedited_line] - [deleted_line] - |
-
-
- Refresh
-
-
- |
-
- E - Edit, tries to determine the variable type by itself.
- C - Change, asks you for the var type first.
- M - Mass modify: changes this variable for all objects of this type.
-
+ return true; + } + + // onkeyup + function handle_keyup() { + updateSearch(); + } + + // onchange + function handle_dropdown(list) { + var value = list.options\[list.selectedIndex].value; + if (value !== "") { + location.href = value; + } + list.selectedIndex = 0; + document.getElementById('filter').focus(); + } + + // byjax + function replace_span(what) { + var idx = what.indexOf(':'); + document.getElementById(what.substr(0, idx)).innerHTML = what.substr(idx + 1); + } + +
| + |
+
- Search:
+ [formatted_type]
+
[ref_line] + [marked_line] + [tagged_line] + [varedited_line] + [deleted_line] |
- - + |
+
+ Refresh
+
+
|
-
-
- [variable_html.Join()]
-
+ + E - Edit, tries to determine the variable type by itself.
+ C - Change, asks you for the var type first.
+ M - Mass modify: changes this variable for all objects of this type.
+ +
+
|
+
+ Search:
+
+ |
+ + + | +
+
-
+ [variable_html.Join()]
+