/")
-
- var/sprite_text
- if(sprite)
- sprite_text = ""
- var/list/atomsnowflake = list()
-
- if(istype(D, /atom))
- var/atom/A = D
- if(isliving(A))
- atomsnowflake += "[D] << [dir2text(A.dir) || A.dir] >> [M.ckey || "No ckey"] / [M.real_name || "No real name"]
- BRUTE:[M.getBruteLoss()]
- FIRE:[M.getFireLoss()]
- TOXIN:[M.getToxLoss()]
- OXY:[M.getOxyLoss()]
- CLONE:[M.getCloneLoss()]
- BRAIN:[M.getOrganLoss(ORGAN_SLOT_BRAIN)]
- STAMINA:[M.getStaminaLoss()]
- "}
- if(GLOB.Debug2)
- atomsnowflake += {"
- HEART:[M.getOrganLoss(ORGAN_SLOT_HEART)]
- LIVER:[M.getOrganLoss(ORGAN_SLOT_LIVER)]
- LUNGS:[M.getOrganLoss(ORGAN_SLOT_LUNGS)]
- EYES:[M.getOrganLoss(ORGAN_SLOT_EYES)]
- EARS:[M.getOrganLoss(ORGAN_SLOT_EARS)]
- STOMACH:[M.getOrganLoss(ORGAN_SLOT_STOMACH)]
- TONGUE:[M.getOrganLoss(ORGAN_SLOT_TONGUE)]
- APPENDIX:[M.getOrganLoss(ORGAN_SLOT_APPENDIX)]
- "}
- atomsnowflake += {"
- [D] << [dir2text(A.dir) || A.dir] >> [D] [formatted_type] "
- formatted_type = null
-
- var/marked
- if(holder && holder.marked_datum && holder.marked_datum == D)
- marked = VV_MSG_MARKED
- var/varedited_line = ""
- if(!islist && (D.datum_flags & DF_VAR_EDITED))
- varedited_line = VV_MSG_EDITED
- var/deleted_line
- if(!islist && D.gc_destroyed)
- deleted_line = VV_MSG_DELETED
-
- var/list/dropdownoptions = list()
- if (islist)
- dropdownoptions = list(
- "---",
- "Add Item" = "?_src_=vars;[HrefToken()];listadd=[refid]",
- "Remove Nulls" = "?_src_=vars;[HrefToken()];listnulls=[refid]",
- "Remove Dupes" = "?_src_=vars;[HrefToken()];listdupes=[refid]",
- "Set len" = "?_src_=vars;[HrefToken()];listlen=[refid]",
- "Shuffle" = "?_src_=vars;[HrefToken()];listshuffle=[refid]",
- "Show VV To Player" = "?_src_=vars;[HrefToken()];expose=[refid]"
- )
- else
- dropdownoptions = D.vv_get_dropdown()
- var/list/dropdownoptions_html = list()
-
- for (var/name in dropdownoptions)
- var/link = dropdownoptions[name]
- if (link)
- dropdownoptions_html += "[name] "
- else
- dropdownoptions_html += "[name] "
-
- var/list/names = list()
- if (!islist)
- for (var/V in D.vars)
- names += V
- sleep(1)//For some reason, without this sleep, VVing will cause client to disconnect on certain objects.
-
- var/list/variable_html = list()
- if (islist)
- var/list/L = D
- for (var/i in 1 to L.len)
- var/key = L[i]
- var/value
- if (IS_NORMAL_LIST(L) && !isnum(key))
- value = L[key]
- variable_html += debug_variable(i, value, 0, D)
- else
-
- names = sortList(names)
- for (var/V in names)
- if(D.can_vv_get(V))
- variable_html += D.vv_get_var(V)
-
- var/html = {"
-
-
- [title]
-
-
-
-
-
-
-
-
-
-
-
- [sprite_text]
-
- [atomsnowflake.Join()]
-
-
-
-
-
- [formatted_type] [marked]
- [varedited_line]
- [deleted_line]
-
-
-
-
-
-
-
-
- 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.
-
- [variable_html.Join()]
-
-
-
-
-"}
- src << browse(html, "window=variables[refid];size=475x650")
-
-
-/client/proc/vv_update_display(datum/D, span, content)
- src << output("[span]:[content]", "variables\ref[D].browser:replace_span")
-
-
-#define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing )
-/proc/debug_variable(name, value, level, datum/DA = null, sanitize = TRUE)
- var/header
- if(DA)
- if (islist(DA))
- var/index = name
- if (value)
- name = DA[name] //name is really the index until this line
- else
- value = DA[name]
- header = "(E ) (C ) (- ) "
- else
- header = " (E ) (C ) (M ) "
- else
- header = " "
-
- var/item
- if (isnull(value))
- item = "[VV_HTML_ENCODE(name)] = null "
-
- else if (istext(value))
- item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\" "
-
- else if (isicon(value))
- #ifdef VARSICON
- var/icon/I = new/icon(value)
- var/rnd = rand(1,10000)
- var/rname = "tmp\ref[I][rnd].png"
- usr << browse_rsc(I, rname)
- item = "[VV_HTML_ENCODE(name)] = ([value] ) [value] )"
- #endif
-
- else if (isfile(value))
- item = "[VV_HTML_ENCODE(name)] = '[value]' "
-
- else if (istype(value, /datum))
- var/datum/D = value
- if ("[D]" != "[D.type]") //if the thing as a name var, lets use it.
- item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D] [D.type]"
- else
- item = "[VV_HTML_ENCODE(name)] [REF(value)] = [D.type]"
-
- else if (islist(value))
- var/list/L = value
- var/list/items = list()
-
- if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? 50 : 150)))
- for (var/i in 1 to L.len)
- var/key = L[i]
- var/val
- if (IS_NORMAL_LIST(L) && !isnum(key))
- val = L[key]
- if (isnull(val)) // we still want to display non-null false values, such as 0 or ""
- val = key
- key = i
-
- items += debug_variable(key, val, level + 1, sanitize = sanitize)
-
- item = "[VV_HTML_ENCODE(name)] = /list ([L.len]) "
- else
- item = "[VV_HTML_ENCODE(name)] = /list ([L.len]) "
-
- else if (name in GLOB.bitfields)
- var/list/flags = list()
- for (var/i in GLOB.bitfields[name])
- if (value & GLOB.bitfields[name][i])
- flags += i
- item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(jointext(flags, ", "))]"
- else
- item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)] "
-
- return "[header][item] "
-
-#undef VV_HTML_ENCODE
-
-/client/proc/view_var_Topic(href, href_list, hsrc)
- if( (usr.client != src) || !src.holder || !holder.CheckAdminHref(href, href_list))
- return
- if(href_list["Vars"])
- debug_variables(locate(href_list["Vars"]))
-
- else if(href_list["datumrefresh"])
- var/datum/DAT = locate(href_list["datumrefresh"])
- if(!DAT) //can't be an istype() because /client etc aren't datums
- return
- src.debug_variables(DAT)
-
- else if(href_list["mob_player_panel"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["mob_player_panel"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.holder.show_player_panel(M)
-
- else if(href_list["godmode"])
- if(!check_rights(R_ADMIN))
- return
-
- var/mob/M = locate(href_list["godmode"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.cmd_admin_godmode(M)
-
- else if(href_list["mark_object"])
- if(!check_rights(NONE))
- return
-
- var/datum/D = locate(href_list["mark_object"])
- if(!istype(D))
- to_chat(usr, "This can only be done to instances of type /datum")
- return
-
- if(holder.marked_datum)
- vv_update_display(holder.marked_datum, "marked", "")
- holder.marked_datum = D
- vv_update_display(D, "marked", VV_MSG_MARKED)
-
- else if(href_list["proc_call"])
- if(!check_rights(NONE))
- return
-
- var/T = locate(href_list["proc_call"])
-
- if(T)
- callproc_datum(T)
-
- else if(href_list["delete"])
- if(!check_rights(R_DEBUG, 0))
- return
-
- var/datum/D = locate(href_list["delete"])
- if(!istype(D))
- to_chat(usr, "Unable to locate item!")
- admin_delete(D)
- if (isturf(D)) // show the turf that took its place
- debug_variables(D)
-
- else if(href_list["osay"])
- if(!check_rights(R_FUN, 0))
- return
- usr.client.object_say(locate(href_list["osay"]))
-
- else if(href_list["regenerateicons"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["regenerateicons"]) in GLOB.mob_list
- if(!ismob(M))
- to_chat(usr, "This can only be done to instances of type /mob")
- return
- M.regenerate_icons()
- else if(href_list["expose"])
- if(!check_rights(R_ADMIN, FALSE))
- return
- var/thing = locate(href_list["expose"])
- if (!thing)
- return
- var/value = vv_get_value(VV_CLIENT)
- if (value["class"] != VV_CLIENT)
- return
- var/client/C = value["value"]
- if (!C)
- return
- var/prompt = alert("Do you want to grant [C] access to view this VV window? (they will not be able to edit or change anything nor open nested vv windows unless they themselves are an admin)", "Confirm", "Yes", "No")
- if (prompt != "Yes" || !usr.client)
- 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 [thing]")
- to_chat(C, "[usr.client.holder.fakekey ? "an Administrator" : "[usr.client.key]"] has granted you access to view a View Variables window")
- C.debug_variables(thing)
-
-
-//Needs +VAREDIT past this point
-
- else if(check_rights(R_VAREDIT))
-
-
- //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
-
- if(href_list["rename"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["rename"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- 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( !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)
- vv_update_display(M, "name", new_name)
- vv_update_display(M, "real_name", M.real_name || "No real name")
-
- else if(href_list["varnameedit"] && href_list["datumedit"])
- if(!check_rights(NONE))
- return
-
- var/datum/D = locate(href_list["datumedit"])
- if(!istype(D, /datum))
- to_chat(usr, "This can only be used on datums")
- return
-
- if (!modify_variables(D, href_list["varnameedit"], 1))
- return
- switch(href_list["varnameedit"])
- if("name")
- vv_update_display(D, "name", "[D]")
- if("dir")
- if(isatom(D))
- var/dir = D.vars["dir"]
- vv_update_display(D, "dir", dir2text(dir) || dir)
- if("ckey")
- if(isliving(D))
- vv_update_display(D, "ckey", D.vars["ckey"] || "No ckey")
- if("real_name")
- if(isliving(D))
- vv_update_display(D, "real_name", D.vars["real_name"] || "No real name")
-
- else if(href_list["varnamechange"] && href_list["datumchange"])
- if(!check_rights(NONE))
- return
-
- var/D = locate(href_list["datumchange"])
- if(!istype(D, /datum))
- to_chat(usr, "This can only be used on datums")
- return
-
- modify_variables(D, href_list["varnamechange"], 0)
-
- else if(href_list["varnamemass"] && href_list["datummass"])
- if(!check_rights(NONE))
- return
-
- var/datum/D = locate(href_list["datummass"])
- if(!istype(D))
- to_chat(usr, "This can only be used on instances of type /datum")
- return
-
- cmd_mass_modify_object_variables(D, href_list["varnamemass"])
-
- else if(href_list["listedit"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listedit"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list(L, null, "list", "contents", index, autodetect_class = TRUE)
-
- else if(href_list["listchange"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listchange"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list(L, null, "list", "contents", index, autodetect_class = FALSE)
-
- else if(href_list["listremove"] && href_list["index"])
- var/index = text2num(href_list["index"])
- if (!index)
- return
-
- var/list/L = locate(href_list["listremove"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- var/variable = L[index]
- var/prompt = alert("Do you want to remove item number [index] from list?", "Confirm", "Yes", "No")
- if (prompt != "Yes")
- return
- L.Cut(index, 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]")
-
- else if(href_list["listadd"])
- var/list/L = locate(href_list["listadd"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- mod_list_add(L, null, "list", "contents")
-
- else if(href_list["listdupes"])
- var/list/L = locate(href_list["listdupes"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- uniqueList_inplace(L)
- 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")
-
- else if(href_list["listnulls"])
- var/list/L = locate(href_list["listnulls"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- listclearnulls(L)
- 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")
-
- else if(href_list["listlen"])
- var/list/L = locate(href_list["listlen"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
- var/value = vv_get_value(VV_NUM)
- if (value["class"] != VV_NUM)
- return
-
- L.len = value["value"]
- log_world("### ListVarEdit by [src]: /list len: [L.len]")
- log_admin("[key_name(src)] modified list's len: [L.len]")
- message_admins("[key_name_admin(src)] modified list's len: [L.len]")
-
- else if(href_list["listshuffle"])
- var/list/L = locate(href_list["listshuffle"])
- if (!istype(L))
- to_chat(usr, "This can only be used on instances of type /list")
- return
-
- shuffle_inplace(L)
- 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")
-
- else if(href_list["give_spell"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["give_spell"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.give_spell(M)
-
- else if(href_list["remove_spell"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["remove_spell"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- remove_spell(M)
-
- else if(href_list["give_disease"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["give_disease"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- src.give_disease(M)
-
- else if(href_list["gib"])
- if(!check_rights(R_FUN))
- return
-
- var/mob/M = locate(href_list["gib"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "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"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
-
- togglebuildmode(M)
-
- else if(href_list["drop_everything"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["drop_everything"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "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(NONE))
- return
-
- var/mob/M = locate(href_list["direct_control"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "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["offer_control"])
- if(!check_rights(NONE))
- return
-
- var/mob/M = locate(href_list["offer_control"]) in GLOB.mob_list
- if(!istype(M))
- to_chat(usr, "This can only be used on instances of type /mob")
- return
- offer_control(M)
-
- else if (href_list["modarmor"])
- if(!check_rights(NONE))
- return
-
- var/obj/O = locate(href_list["modarmor"])
- if(!istype(O))
- to_chat(usr, "This can only be used on instances of type /obj")
- return
-
- var/list/pickerlist = list()
- var/list/armorlist = O.armor.getList()
-
- for (var/i in armorlist)
- pickerlist += list(list("value" = armorlist[i], "name" = i))
-
- var/list/result = presentpicker(usr, "Modify armor", "Modify armor: [O]", Button1="Save", Button2 = "Cancel", Timeout=FALSE, inputtype = "text", values = pickerlist)
-
- if (islist(result))
- if (result["button"] == 2) // If the user pressed the cancel button
- return
- // text2num conveniently returns a null on invalid values
- O.armor = O.armor.setRating(melee = text2num(result["values"]["melee"]),\
- bullet = text2num(result["values"]["bullet"]),\
- laser = text2num(result["values"]["laser"]),\
- energy = text2num(result["values"]["energy"]),\
- bomb = text2num(result["values"]["bomb"]),\
- bio = text2num(result["values"]["bio"]),\
- rad = text2num(result["values"]["rad"]),\
- fire = text2num(result["values"]["fire"]),\
- acid = text2num(result["values"]["acid"]))
- log_admin("[key_name(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid]")
- message_admins("[key_name_admin(usr)] modified the armor on [O] ([O.type]) to melee: [O.armor.melee], bullet: [O.armor.bullet], laser: [O.armor.laser], energy: [O.armor.energy], bomb: [O.armor.bomb], bio: [O.armor.bio], rad: [O.armor.rad], fire: [O.armor.fire], acid: [O.armor.acid] ")
- else
- return
-
- 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(usr, "This can only be used on instances of type /obj")
- return
-
- var/action_type = alert("Strict type ([O.type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
- if(action_type == "Cancel" || !action_type)
- return
-
- if(alert("Are you really sure you want to delete all objects of type [O.type]?",,"Yes","No") != "Yes")
- return
-
- if(alert("Second confirmation required. Delete?",,"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(usr, "No objects of this type exist")
- return
- log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
- message_admins("[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(usr, "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("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
-
- else if(href_list["addreagent"])
- if(!check_rights(NONE))
- return
-
- var/atom/A = locate(href_list["addreagent"])
-
- if(!A.reagents)
- var/amount = input(usr, "Specify the reagent size of [A]", "Set Reagent Size", 50) as num
- if(amount)
- A.create_reagents(amount)
-
- if(A.reagents)
- var/chosen_id = choose_reagent_id(usr)
- if(chosen_id)
- var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", A.reagents.maximum_volume) as num
- if(amount)
- A.reagents.add_reagent(chosen_id, amount)
- log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A]")
- message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to \the [A] ")
-
- else if(href_list["explode"])
- if(!check_rights(R_FUN))
- return
-
- var/atom/A = locate(href_list["explode"])
- if(!isobj(A) && !ismob(A) && !isturf(A))
- to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
- return
-
- src.cmd_admin_explosion(A)
-
- else if(href_list["emp"])
- if(!check_rights(R_FUN))
- return
-
- var/atom/A = locate(href_list["emp"])
- if(!isobj(A) && !ismob(A) && !isturf(A))
- to_chat(usr, "This can only be done to instances of type /obj, /mob and /turf")
- return
-
- src.cmd_admin_emp(A)
-
- else if(href_list["modtransform"])
- if(!check_rights(R_DEBUG))
- return
-
- var/atom/A = locate(href_list["modtransform"])
- if(!istype(A))
- to_chat(usr, "This can only be done to atoms.")
- return
-
- var/result = input(usr, "Choose the transformation to apply","Transform Mod") as null|anything in list("Scale","Translate","Rotate")
- var/matrix/M = A.transform
- switch(result)
- if("Scale")
- var/x = input(usr, "Choose x mod","Transform Mod") as null|num
- var/y = input(usr, "Choose y mod","Transform Mod") as null|num
- if(!isnull(x) && !isnull(y))
- A.transform = M.Scale(x,y)
- if("Translate")
- var/x = input(usr, "Choose x mod","Transform Mod") as null|num
- var/y = input(usr, "Choose y mod","Transform Mod") as null|num
- if(!isnull(x) && !isnull(y))
- A.transform = M.Translate(x,y)
- if("Rotate")
- var/angle = input(usr, "Choose angle to rotate","Transform Mod") as null|num
- if(!isnull(angle))
- A.transform = M.Turn(angle)
-
- else if(href_list["rotatedatum"])
- if(!check_rights(NONE))
- return
-
- var/atom/A = locate(href_list["rotatedatum"])
- if(!istype(A))
- to_chat(usr, "This can only be done to instances of type /atom")
- return
-
- switch(href_list["rotatedir"])
- if("right")
- A.setDir(turn(A.dir, -45))
- if("left")
- A.setDir(turn(A.dir, 45))
- vv_update_display(A, "dir", dir2text(A.dir))
-
- else if(href_list["editorgans"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/carbon/C = locate(href_list["editorgans"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- manipulate_organs(C)
-
- else if(href_list["givemartialart"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/carbon/C = locate(href_list["givemartialart"]) in GLOB.carbon_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- var/list/artpaths = subtypesof(/datum/martial_art)
- var/list/artnames = list()
- for(var/i in artpaths)
- var/datum/martial_art/M = i
- artnames[initial(M.name)] = M
-
- var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in artnames
- if(!usr)
- return
- if(QDELETED(C))
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- var/chosenart = artnames[result]
- var/datum/martial_art/MA = new chosenart
- MA.teach(C)
-
- else if(href_list["givetrauma"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/carbon/C = locate(href_list["givetrauma"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- var/list/traumas = subtypesof(/datum/brain_trauma)
- var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in traumas
- if(!usr)
- return
- if(QDELETED(C))
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- C.gain_trauma(result)
-
- else if(href_list["curetraumas"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/carbon/C = locate(href_list["curetraumas"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- C.cure_all_traumas(TRAUMA_RESILIENCE_ABSOLUTE)
-
- else if(href_list["hallucinate"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/carbon/C = locate(href_list["hallucinate"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- var/list/hallucinations = subtypesof(/datum/hallucination)
- var/result = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in hallucinations
- if(!usr)
- return
- if(QDELETED(C))
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- new result(C, TRUE)
-
- else if(href_list["makehuman"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
- if(!istype(Mo))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!Mo)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("humanone"=href_list["makehuman"]))
-
- else if(href_list["makemonkey"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/human/H = locate(href_list["makemonkey"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "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"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "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"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makealien"=href_list["makealien"]))
-
- else if(href_list["makeslime"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/human/H = locate(href_list["makeslime"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
- holder.Topic(href, list("makeslime"=href_list["makeslime"]))
-
- else if(href_list["makeai"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/H = locate(href_list["makeai"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
- return
- if(!H)
- to_chat(usr, "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"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list
-
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- var/newtype = GLOB.species_list[result]
- admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [H] to [result]")
- H.set_species(newtype)
-
- else if(href_list["editbodypart"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/C = locate(href_list["editbodypart"]) in GLOB.mob_list
- if(!istype(C))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon")
- return
-
- var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment")
- if(!edit_action)
- return
- var/list/limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
- if(edit_action == "augment")
- limb_list += BODY_ZONE_CHEST
- var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list
-
- if(!C)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- if(result)
- var/obj/item/bodypart/BP = C.get_bodypart(result)
- switch(edit_action)
- if("remove")
- if(BP)
- BP.drop_limb()
- else
- to_chat(usr, "[C] doesn't have such bodypart.")
- if("add")
- if(BP)
- to_chat(usr, "[C] already has such bodypart.")
- else
- if(!C.regenerate_limb(result))
- to_chat(usr, "[C] cannot have such bodypart.")
- if("augment")
- if(ishuman(C))
- if(BP)
- BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE)
- else
- to_chat(usr, "[C] doesn't have such bodypart.")
- else
- to_chat(usr, "Only humans can be augmented.")
- admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [C]")
-
-
- else if(href_list["purrbation"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/human/H = locate(href_list["purrbation"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
- if(!ishumanbasic(H))
- to_chat(usr, "This can only be done to the basic human species at the moment.")
- return
-
- if(!H)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- var/success = purrbation_toggle(H)
- if(success)
- to_chat(usr, "Put [H] on purrbation.")
- log_admin("[key_name(usr)] has put [key_name(H)] on purrbation.")
- var/msg = "[key_name_admin(usr)] has put [key_name(H)] on purrbation. "
- message_admins(msg)
- admin_ticket_log(H, msg)
-
- else
- to_chat(usr, "Removed [H] from purrbation.")
- log_admin("[key_name(usr)] has removed [key_name(H)] from purrbation.")
- var/msg = "[key_name_admin(usr)] has removed [key_name(H)] from purrbation. "
- message_admins(msg)
- admin_ticket_log(H, msg)
-
- else if(href_list["adjustDamage"] && href_list["mobToDamage"])
- if(!check_rights(NONE))
- return
-
- var/mob/living/L = locate(href_list["mobToDamage"]) in GLOB.mob_list
- if(!istype(L))
- return
-
- var/Text = href_list["adjustDamage"]
-
- var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
-
- if(!L)
- to_chat(usr, "Mob doesn't exist anymore")
- return
-
- var/newamt
- switch(Text)
- 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.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_BRAIN)
- if("clone")
- L.adjustCloneLoss(amount)
- newamt = L.getCloneLoss()
- if("stamina")
- L.adjustStaminaLoss(amount)
- newamt = L.getStaminaLoss()
- if("heart")
- L.adjustOrganLoss(ORGAN_SLOT_HEART, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_HEART)
- if("liver")
- L.adjustOrganLoss(ORGAN_SLOT_LIVER, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_LIVER)
- if("lungs")
- L.adjustOrganLoss(ORGAN_SLOT_LUNGS, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_LUNGS)
- if("eye_sight")
- L.adjustOrganLoss(ORGAN_SLOT_EYES, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_EYES)
- if("ears")
- L.adjustOrganLoss(ORGAN_SLOT_EARS, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_EARS)
- if("stomach")
- L.adjustOrganLoss(ORGAN_SLOT_STOMACH, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_STOMACH)
- if("tongue")
- L.adjustOrganLoss(ORGAN_SLOT_TONGUE, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_TONGUE)
- if("appendix")
- L.adjustOrganLoss(ORGAN_SLOT_APPENDIX, amount)
- newamt = L.getOrganLoss(ORGAN_SLOT_APPENDIX)
- else
- to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
- return
-
- if(amount != 0)
- log_admin("[key_name(usr)] dealt [amount] amount of [Text] damage to [L] ")
- var/msg = "[key_name(usr)] dealt [amount] amount of [Text] damage to [L] "
- message_admins("[msg] ")
- admin_ticket_log(L, msg)
- vv_update_display(L, Text, "[newamt]")
- else if(href_list["copyoutfit"])
- if(!check_rights(R_SPAWN))
- return
- var/mob/living/carbon/human/H = locate(href_list["copyoutfit"]) in GLOB.carbon_list
- if(istype(H))
- H.copy_outfit()
- else if(href_list["modquirks"])
- if(!check_rights(R_SPAWN))
- return
-
- var/mob/living/carbon/human/H = locate(href_list["modquirks"]) in GLOB.mob_list
- if(!istype(H))
- to_chat(usr, "This can only be done to instances of type /mob/living/carbon/human")
- return
-
- var/list/options = list("Clear"="Clear")
- for(var/x in subtypesof(/datum/quirk))
- var/datum/quirk/T = x
- var/qname = initial(T.name)
- options[H.has_quirk(T) ? "[qname] (Remove)" : "[qname] (Add)"] = T
-
- var/result = input(usr, "Choose quirk to add/remove","Quirk Mod") as null|anything in options
- if(result)
- if(result == "Clear")
- for(var/datum/quirk/q in H.roundstart_quirks)
- H.remove_quirk(q.type)
- else
- var/T = options[result]
- if(H.has_quirk(T))
- H.remove_quirk(T)
- else
- H.add_quirk(T,TRUE)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index d8d7ce3d91..266d5b5bb5 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -694,14 +694,64 @@
/atom/vv_get_dropdown()
. = ..()
- . += "---"
- var/turf/curturf = get_turf(src)
- if (curturf)
- .["Jump to"] = "?_src_=holder;[HrefToken()];adminplayerobservecoodjump=1;X=[curturf.x];Y=[curturf.y];Z=[curturf.z]"
- .["Modify Transform"] = "?_src_=vars;[HrefToken()];modtransform=[REF(src)]"
- .["Add reagent"] = "?_src_=vars;[HrefToken()];addreagent=[REF(src)]"
- .["Trigger EM pulse"] = "?_src_=vars;[HrefToken()];emp=[REF(src)]"
- .["Trigger explosion"] = "?_src_=vars;[HrefToken()];explode=[REF(src)]"
+ VV_DROPDOWN_OPTION("", "---------")
+ if(!ismovableatom(src))
+ var/turf/curturf = get_turf(src)
+ if(curturf)
+ . += "Jump To "
+ VV_DROPDOWN_OPTION(VV_HK_MODIFY_TRANSFORM, "Modify Transform")
+ VV_DROPDOWN_OPTION(VV_HK_ADD_REAGENT, "Add Reagent")
+ VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EMP, "EMP Pulse")
+ VV_DROPDOWN_OPTION(VV_HK_TRIGGER_EXPLOSION, "Explosion")
+
+/atom/vv_do_topic(list/href_list)
+ . = ..()
+ if(href_list[VV_HK_ADD_REAGENT] && check_rights(R_VAREDIT))
+ if(!reagents)
+ var/amount = input(usr, "Specify the reagent size of [src]", "Set Reagent Size", 50) as num
+ if(amount)
+ create_reagents(amount)
+
+ if(reagents)
+ var/chosen_id = choose_reagent_id(usr)
+ if(chosen_id)
+ var/amount = input(usr, "Choose the amount to add.", "Choose the amount.", reagents.maximum_volume) as num
+ if(amount)
+ reagents.add_reagent(chosen_id, amount)
+ log_admin("[key_name(usr)] has added [amount] units of [chosen_id] to [src]")
+ message_admins("[key_name(usr)] has added [amount] units of [chosen_id] to [src] ")
+ if(href_list[VV_HK_TRIGGER_EXPLOSION] && check_rights(R_FUN))
+ usr.client.cmd_admin_explosion(src)
+ if(href_list[VV_HK_TRIGGER_EMP] && check_rights(R_FUN))
+ usr.client.cmd_admin_emp(src)
+ if(href_list[VV_HK_MODIFY_TRANSFORM] && check_rights(R_VAREDIT))
+ var/result = input(usr, "Choose the transformation to apply","Transform Mod") as null|anything in list("Scale","Translate","Rotate")
+ var/matrix/M = transform
+ switch(result)
+ if("Scale")
+ var/x = input(usr, "Choose x mod","Transform Mod") as null|num
+ var/y = input(usr, "Choose y mod","Transform Mod") as null|num
+ if(!isnull(x) && !isnull(y))
+ transform = M.Scale(x,y)
+ if("Translate")
+ var/x = input(usr, "Choose x mod","Transform Mod") as null|num
+ var/y = input(usr, "Choose y mod","Transform Mod") as null|num
+ if(!isnull(x) && !isnull(y))
+ transform = M.Translate(x,y)
+ if("Rotate")
+ var/angle = input(usr, "Choose angle to rotate","Transform Mod") as null|num
+ if(!isnull(angle))
+ transform = M.Turn(angle)
+ if(href_list[VV_HK_AUTO_RENAME] && check_rights(R_VAREDIT))
+ var/newname = input(usr, "What do you want to rename this to?", "Automatic Rename") as null|text
+ if(newname)
+ vv_auto_rename(newname)
+
+/atom/vv_get_header()
+ . = ..()
+ var/refid = REF(src)
+ . += "[VV_HREF_TARGETREF(refid, VV_HK_AUTO_RENAME, "[src] ")]"
+ . += "<< [dir2text(dir) || dir] >> Follow "
+ . += "Get "
/atom/movable/proc/ex_check(ex_id)
if(!ex_id)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 4eaa0b4e0a..d2d72193b7 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -213,9 +213,78 @@
/obj/vv_get_dropdown()
. = ..()
- .["Delete all of type"] = "?_src_=vars;[HrefToken()];delall=[REF(src)]"
- .["Osay"] = "?_src_=vars;[HrefToken()];osay[REF(src)]"
- .["Modify armor values"] = "?_src_=vars;[HrefToken()];modarmor=[REF(src)]"
+ VV_DROPDOWN_OPTION("", "---")
+ VV_DROPDOWN_OPTION(VV_HK_MASS_DEL_TYPE, "Delete all of type")
+ VV_DROPDOWN_OPTION(VV_HK_OSAY, "Object Say")
+ VV_DROPDOWN_OPTION(VV_HK_ARMOR_MOD, "Modify armor values")
+
+/obj/vv_do_topic(list/href_list)
+ if(!(. = ..()))
+ return
+ if(href_list[VV_HK_OSAY])
+ if(check_rights(R_FUN, FALSE))
+ usr.client.object_say(src)
+ if(href_list[VV_HK_ARMOR_MOD])
+ var/list/pickerlist = list()
+ var/list/armorlist = armor.getList()
+
+ for (var/i in armorlist)
+ pickerlist += list(list("value" = armorlist[i], "name" = i))
+
+ var/list/result = presentpicker(usr, "Modify armor", "Modify armor: [src]", Button1="Save", Button2 = "Cancel", Timeout=FALSE, inputtype = "text", values = pickerlist)
+
+ if (islist(result))
+ if (result["button"] != 2) // If the user pressed the cancel button
+ // text2num conveniently returns a null on invalid values
+ armor = armor.setRating(melee = text2num(result["values"]["melee"]),\
+ bullet = text2num(result["values"]["bullet"]),\
+ laser = text2num(result["values"]["laser"]),\
+ energy = text2num(result["values"]["energy"]),\
+ bomb = text2num(result["values"]["bomb"]),\
+ bio = text2num(result["values"]["bio"]),\
+ rad = text2num(result["values"]["rad"]),\
+ fire = text2num(result["values"]["fire"]),\
+ acid = text2num(result["values"]["acid"]))
+ log_admin("[key_name(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid]")
+ message_admins("[key_name_admin(usr)] modified the armor on [src] ([type]) to melee: [armor.melee], bullet: [armor.bullet], laser: [armor.laser], energy: [armor.energy], bomb: [armor.bomb], bio: [armor.bio], rad: [armor.rad], fire: [armor.fire], acid: [armor.acid] ")
+ if(href_list[VV_HK_MASS_DEL_TYPE])
+ if(check_rights(R_DEBUG|R_SERVER))
+ var/action_type = alert("Strict type ([type]) or type and all subtypes?",,"Strict type","Type and subtypes","Cancel")
+ if(action_type == "Cancel" || !action_type)
+ return
+
+ if(alert("Are you really sure you want to delete all objects of type [type]?",,"Yes","No") != "Yes")
+ return
+
+ if(alert("Second confirmation required. Delete?",,"Yes","No") != "Yes")
+ return
+
+ var/O_type = 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(usr, "No objects of this type exist")
+ return
+ log_admin("[key_name(usr)] deleted all objects of type [O_type] ([i] objects deleted) ")
+ message_admins("[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(usr, "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("[key_name(usr)] deleted all objects of type or subtype of [O_type] ([i] objects deleted) ")
/obj/examine(mob/user)
. = ..()
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 3ccd113864..cbd429af5c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -74,6 +74,7 @@ GLOBAL_PROTECT(admin_verbs_admin)
/client/proc/addbunkerbypass,
/client/proc/revokebunkerbypass,
/client/proc/stop_sounds,
+ /client/proc/mark_datum_mapview,
/client/proc/hide_verbs, /*hides all our adminverbs*/
/client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/
/datum/admins/proc/open_borgopanel
diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm
new file mode 100644
index 0000000000..3de5e39ff4
--- /dev/null
+++ b/code/modules/admin/callproc/callproc.dm
@@ -0,0 +1,208 @@
+
+/client/proc/callproc()
+ set category = "Debug"
+ set name = "Advanced ProcCall"
+ set waitfor = FALSE
+ callproc_blocking()
+
+/client/proc/callproc_blocking(list/get_retval)
+ if(!check_rights(R_DEBUG))
+ return
+
+ var/datum/target
+ var/targetselected = FALSE
+ var/returnval
+
+ switch(alert("Proc owned by something?",,"Yes","No"))
+ if("Yes")
+ targetselected = TRUE
+ var/list/value = vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_CLIENT, VV_MARKED_DATUM, VV_TEXT_LOCATE, VV_PROCCALL_RETVAL))
+ if (!value["class"] || !value["value"])
+ return
+ target = value["value"]
+ if(!istype(target))
+ to_chat(usr, "Invalid target. ")
+ return
+ if("No")
+ target = null
+ targetselected = FALSE
+
+ var/procpath = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
+ if(!procpath)
+ return
+
+ //strip away everything but the proc name
+ var/list/proclist = splittext(procpath, "/")
+ if (!length(proclist))
+ return
+
+ var/procname = proclist[proclist.len]
+ var/proctype = ("verb" in proclist) ? "verb" :"proc"
+
+ if(targetselected)
+ if(!hascall(target, procname))
+ to_chat(usr, "Error: callproc(): type [target.type] has no [proctype] named [procpath]. ")
+ return
+ else
+ procpath = "/[proctype]/[procname]"
+ if(!text2path(procpath))
+ to_chat(usr, "Error: callproc(): [procpath] does not exist. ")
+ return
+
+ var/list/lst = get_callproc_args()
+ if(!lst)
+ return
+
+ if(targetselected)
+ if(!target)
+ to_chat(usr, "Error: callproc(): owner of proc no longer exists. ")
+ return
+ var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]."
+ log_admin(msg)
+ message_admins(msg) //Proccall announce removed.
+ admin_ticket_log(target, msg)
+ returnval = WrapAdminProcCall(target, procname, lst) // Pass the lst as an argument list to the proc
+ else
+ //this currently has no hascall protection. wasn't able to get it working.
+ log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
+ message_admins("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") //Proccall announce removed.
+ returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ if(get_retval)
+ get_retval += returnval
+ . = get_callproc_returnval(returnval, procname)
+ if(.)
+ to_chat(usr, .)
+
+GLOBAL_VAR(AdminProcCaller)
+GLOBAL_PROTECT(AdminProcCaller)
+GLOBAL_VAR_INIT(AdminProcCallCount, 0)
+GLOBAL_PROTECT(AdminProcCallCount)
+GLOBAL_VAR(LastAdminCalledTargetRef)
+GLOBAL_PROTECT(LastAdminCalledTargetRef)
+GLOBAL_VAR(LastAdminCalledTarget)
+GLOBAL_PROTECT(LastAdminCalledTarget)
+GLOBAL_VAR(LastAdminCalledProc)
+GLOBAL_PROTECT(LastAdminCalledProc)
+GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention)
+GLOBAL_PROTECT(AdminProcCallSpamPrevention)
+
+/proc/WrapAdminProcCall(datum/target, procname, list/arguments)
+ if(target != GLOBAL_PROC && procname == "Del")
+ to_chat(usr, "Calling Del() is not allowed ")
+ return
+
+ if(target != GLOBAL_PROC && !target.CanProcCall(procname))
+ to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!")
+ return
+ var/current_caller = GLOB.AdminProcCaller
+ var/ckey = usr ? usr.client.ckey : GLOB.AdminProcCaller
+ if(!ckey)
+ CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]")
+ if(current_caller && current_caller != ckey)
+ if(!GLOB.AdminProcCallSpamPrevention[ckey])
+ to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish. ")
+ GLOB.AdminProcCallSpamPrevention[ckey] = TRUE
+ UNTIL(!GLOB.AdminProcCaller)
+ to_chat(usr, "Running your proc ")
+ GLOB.AdminProcCallSpamPrevention -= ckey
+ else
+ UNTIL(!GLOB.AdminProcCaller)
+ GLOB.LastAdminCalledProc = procname
+ if(target != GLOBAL_PROC)
+ GLOB.LastAdminCalledTargetRef = "[REF(target)]"
+ GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you
+ ++GLOB.AdminProcCallCount
+ . = world.WrapAdminProcCall(target, procname, arguments)
+ if(--GLOB.AdminProcCallCount == 0)
+ GLOB.AdminProcCaller = null
+
+//adv proc call this, ya nerds
+/world/proc/WrapAdminProcCall(datum/target, procname, list/arguments)
+ if(target == GLOBAL_PROC)
+ return call(procname)(arglist(arguments))
+ else if(target != world)
+ return call(target, procname)(arglist(arguments))
+ else
+ log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]")
+
+/proc/IsAdminAdvancedProcCall()
+#ifdef TESTING
+ return FALSE
+#else
+ return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey
+#endif
+
+/client/proc/callproc_datum(datum/A as null|area|mob|obj|turf)
+ set category = "Debug"
+ set name = "Atom ProcCall"
+ set waitfor = FALSE
+
+ if(!check_rights(R_DEBUG))
+ return
+
+ var/procname = input("Proc name, eg: fake_blood","Proc:", null) as text|null
+ if(!procname)
+ return
+ if(!hascall(A,procname))
+ to_chat(usr, "Error: callproc_datum(): type [A.type] has no proc named [procname]. ")
+ return
+ var/list/lst = get_callproc_args()
+ if(!lst)
+ return
+
+ if(!A || !IsValidSrc(A))
+ to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists. ")
+ return
+ var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]."
+ log_admin(msg)
+ message_admins(msg)
+ admin_ticket_log(A, msg)
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+ var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc
+ . = get_callproc_returnval(returnval,procname)
+ if(.)
+ to_chat(usr, .)
+
+/client/proc/get_callproc_args()
+ var/argnum = input("Number of arguments","Number:",0) as num|null
+ if(isnull(argnum))
+ return
+
+ . = list()
+ var/list/named_args = list()
+ while(argnum--)
+ var/named_arg = input("Leave blank for positional argument. Positional arguments will be considered as if they were added first.", "Named argument") as text|null
+ var/value = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT))
+ if (!value["class"])
+ return
+ if(named_arg)
+ named_args[named_arg] = value["value"]
+ else
+ . += value["value"]
+ if(LAZYLEN(named_args))
+ . += named_args
+
+/client/proc/get_callproc_returnval(returnval,procname)
+ . = ""
+ if(islist(returnval))
+ var/list/returnedlist = returnval
+ . = ""
+ if(returnedlist.len)
+ var/assoc_check = returnedlist[1]
+ if(istext(assoc_check) && (returnedlist[assoc_check] != null))
+ . += "[procname] returned an associative list:"
+ for(var/key in returnedlist)
+ . += "\n[key] = [returnedlist[key]]"
+
+ else
+ . += "[procname] returned a list:"
+ for(var/elem in returnedlist)
+ . += "\n[elem]"
+ else
+ . = "[procname] returned an empty list"
+ . += " "
+
+ else
+ . = "[procname] returned: [!isnull(returnval) ? returnval : "null"] "
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 54d6a864fd..e67176029a 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -15,214 +15,6 @@
SSblackbox.record_feedback("tally", "admin_verb", 1, "Toggle Debug Two") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-
-/* 21st Sept 2010
-Updated by Skie -- Still not perfect but better!
-Stuff you can't do:
-Call proc /mob/proc/Dizzy() for some player
-Because if you select a player mob as owner it tries to do the proc for
-/mob/living/carbon/human/ instead. And that gives a run-time error.
-But you can call procs that are of type /mob/living/carbon/human/proc/ for that player.
-*/
-
-/client/proc/callproc()
- set category = "Debug"
- set name = "Advanced ProcCall"
- set waitfor = FALSE
-
- if(!check_rights(R_DEBUG))
- return
-
- var/datum/target = null
- var/targetselected = FALSE
- var/returnval = null
-
- if(alert("Proc owned by something?",,"Yes","No") == "Yes")
- targetselected = TRUE
- var/list/value = vv_get_value(default_class = VV_ATOM_REFERENCE, classes = list(VV_ATOM_REFERENCE, VV_DATUM_REFERENCE, VV_MOB_REFERENCE, VV_CLIENT))
- if (!value["class"] || !value["value"])
- return
- target = value["value"]
-
- var/procpath = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
- if(!procpath)
- return
-
- //strip away everything but the proc name
- var/list/proclist = splittext(procpath, "/")
- if (!length(proclist))
- return
-
- var/procname = proclist[proclist.len]
- var/proctype = ("verb" in proclist) ? "verb" :"proc"
-
- if(targetselected)
- if(!hascall(target, procname))
- to_chat(usr, "Error: callproc(): type [target.type] has no [proctype] named [procpath]. ")
- return
- else
- procpath = "/[proctype]/[procname]"
- if(!text2path(procpath))
- to_chat(usr, "Error: callproc(): [procpath] does not exist. ")
- return
-
- var/list/lst = get_callproc_args()
- if(!lst)
- return
-
- if(targetselected)
- if(!target)
- to_chat(usr, "Error: callproc(): owner of proc no longer exists. ")
- return
- var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no argument"]."
- log_admin(msg)
- message_admins(msg)
- admin_ticket_log(target, msg)
- returnval = WrapAdminProcCall(target, procname, lst)
- else
- var/msg = "[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no argument"]."
- log_admin(msg)
- message_admins(msg)
- returnval = WrapAdminProcCall(GLOBAL_PROC, procpath, lst) //calling globals needs full qualified name (e.g /proc/foo)
- . = get_callproc_returnval(returnval, procname)
- if(.)
- to_chat(usr, .)
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
-GLOBAL_VAR(AdminProcCaller)
-GLOBAL_PROTECT(AdminProcCaller)
-GLOBAL_VAR_INIT(AdminProcCallCount, 0)
-GLOBAL_PROTECT(AdminProcCallCount)
-GLOBAL_VAR(LastAdminCalledTargetRef)
-GLOBAL_PROTECT(LastAdminCalledTargetRef)
-GLOBAL_VAR(LastAdminCalledTarget)
-GLOBAL_PROTECT(LastAdminCalledTarget)
-GLOBAL_VAR(LastAdminCalledProc)
-GLOBAL_PROTECT(LastAdminCalledProc)
-GLOBAL_LIST_EMPTY(AdminProcCallSpamPrevention)
-GLOBAL_PROTECT(AdminProcCallSpamPrevention)
-
-/proc/WrapAdminProcCall(datum/target, procname, list/arguments)
- if(target != GLOBAL_PROC && procname == "Del")
- to_chat(usr, "Calling Del() is not allowed ")
- return
-
- if(target != GLOBAL_PROC && !target.CanProcCall(procname))
- to_chat(usr, "Proccall on [target.type]/proc/[procname] is disallowed!")
- return
- var/current_caller = GLOB.AdminProcCaller
- var/ckey = usr ? usr.client.ckey : GLOB.AdminProcCaller
- if(!ckey)
- CRASH("WrapAdminProcCall with no ckey: [target] [procname] [english_list(arguments)]")
- if(current_caller && current_caller != ckey)
- if(!GLOB.AdminProcCallSpamPrevention[ckey])
- to_chat(usr, "Another set of admin called procs are still running, your proc will be run after theirs finish. ")
- GLOB.AdminProcCallSpamPrevention[ckey] = TRUE
- UNTIL(!GLOB.AdminProcCaller)
- to_chat(usr, "Running your proc ")
- GLOB.AdminProcCallSpamPrevention -= ckey
- else
- UNTIL(!GLOB.AdminProcCaller)
- GLOB.LastAdminCalledProc = procname
- if(target != GLOBAL_PROC)
- GLOB.LastAdminCalledTargetRef = "[REF(target)]"
- GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you
- ++GLOB.AdminProcCallCount
- . = world.WrapAdminProcCall(target, procname, arguments)
- if(--GLOB.AdminProcCallCount == 0)
- GLOB.AdminProcCaller = null
-
-//adv proc call this, ya nerds
-/world/proc/WrapAdminProcCall(datum/target, procname, list/arguments)
- if(target == GLOBAL_PROC)
- return call(procname)(arglist(arguments))
- else if(target != world)
- return call(target, procname)(arglist(arguments))
- else
- log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]")
-
-/proc/IsAdminAdvancedProcCall()
-#ifdef TESTING
- return FALSE
-#else
- return usr && usr.client && GLOB.AdminProcCaller == usr.client.ckey
-#endif
-
-/client/proc/callproc_datum(datum/A as null|area|mob|obj|turf)
- set category = "Debug"
- set name = "Atom ProcCall"
- set waitfor = FALSE
-
- if(!check_rights(R_DEBUG))
- return
-
- var/procname = input("Proc name, eg: fake_blood","Proc:", null) as text|null
- if(!procname)
- return
- if(!hascall(A,procname))
- to_chat(usr, "Error: callproc_datum(): type [A.type] has no proc named [procname]. ")
- return
- var/list/lst = get_callproc_args()
- if(!lst)
- return
-
- if(!A || !IsValidSrc(A))
- to_chat(usr, "Error: callproc_datum(): owner of proc no longer exists. ")
- return
- var/msg = "[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]."
- log_admin(msg)
- message_admins(msg)
- admin_ticket_log(A, msg)
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Atom ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-
- var/returnval = WrapAdminProcCall(A, procname, lst) // Pass the lst as an argument list to the proc
- . = get_callproc_returnval(returnval,procname)
- if(.)
- to_chat(usr, .)
-
-/client/proc/get_callproc_args()
- var/argnum = input("Number of arguments","Number:",0) as num|null
- if(isnull(argnum))
- return
-
- . = list()
- var/list/named_args = list()
- while(argnum--)
- var/named_arg = input("Leave blank for positional argument. Positional arguments will be considered as if they were added first.", "Named argument") as text|null
- var/value = vv_get_value(restricted_classes = list(VV_RESTORE_DEFAULT))
- if (!value["class"])
- return
- if(named_arg)
- named_args[named_arg] = value["value"]
- else
- . += value["value"]
- if(LAZYLEN(named_args))
- . += named_args
-
-/client/proc/get_callproc_returnval(returnval,procname)
- . = ""
- if(islist(returnval))
- var/list/returnedlist = returnval
- . = ""
- if(returnedlist.len)
- var/assoc_check = returnedlist[1]
- if(istext(assoc_check) && (returnedlist[assoc_check] != null))
- . += "[procname] returned an associative list:"
- for(var/key in returnedlist)
- . += "\n[key] = [returnedlist[key]]"
-
- else
- . += "[procname] returned a list:"
- for(var/elem in returnedlist)
- . += "\n[elem]"
- else
- . = "[procname] returned an empty list"
- . += " "
-
- else
- . = "[procname] returned: [!isnull(returnval) ? returnval : "null"] "
-
/client/proc/Cell()
set category = "Debug"
set name = "Air Status in Location"
@@ -343,66 +135,6 @@ GLOBAL_PROTECT(AdminProcCallSpamPrevention)
else
alert("Invalid mob")
-/proc/make_types_fancy(var/list/types)
- if (ispath(types))
- types = list(types)
- . = list()
- for(var/type in types)
- var/typename = "[type]"
- var/static/list/TYPES_SHORTCUTS = list(
- /obj/effect/decal/cleanable = "CLEANABLE",
- /obj/item/radio/headset = "HEADSET",
- /obj/item/clothing/head/helmet/space = "SPESSHELMET",
- /obj/item/book/manual = "MANUAL",
- /obj/item/reagent_containers/food/drinks = "DRINK", //longest paths comes first
- /obj/item/reagent_containers/food = "FOOD",
- /obj/item/reagent_containers = "REAGENT_CONTAINERS",
- /obj/machinery/atmospherics = "ATMOS_MECH",
- /obj/machinery/portable_atmospherics = "PORT_ATMOS",
- /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack = "MECHA_MISSILE_RACK",
- /obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
- /obj/item/organ = "ORGAN",
- /obj/item = "ITEM",
- /obj/machinery = "MACHINERY",
- /obj/effect = "EFFECT",
- /obj = "O",
- /datum = "D",
- /turf/open = "OPEN",
- /turf/closed = "CLOSED",
- /turf = "T",
- /mob/living/carbon = "CARBON",
- /mob/living/simple_animal = "SIMPLE",
- /mob/living = "LIVING",
- /mob = "M"
- )
- for (var/tn in TYPES_SHORTCUTS)
- if (copytext(typename,1, length("[tn]/")+1)=="[tn]/" /*findtextEx(typename,"[tn]/",1,2)*/ )
- typename = TYPES_SHORTCUTS[tn]+copytext(typename,length("[tn]/"))
- break
- .[typename] = type
-
-/proc/get_fancy_list_of_atom_types()
- var/static/list/pre_generated_list
- if (!pre_generated_list) //init
- pre_generated_list = make_types_fancy(typesof(/atom))
- return pre_generated_list
-
-
-/proc/get_fancy_list_of_datum_types()
- var/static/list/pre_generated_list
- if (!pre_generated_list) //init
- pre_generated_list = make_types_fancy(sortList(typesof(/datum) - typesof(/atom)))
- return pre_generated_list
-
-
-/proc/filter_fancy_list(list/L, filter as text)
- var/list/matches = new
- for(var/key in L)
- var/value = L[key]
- if(findtext("[key]", filter) || findtext("[value]", filter))
- matches[key] = value
- return matches
-
//TODO: merge the vievars version into this or something maybe mayhaps
/client/proc/cmd_debug_del_all(object as text)
set category = "Debug"
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index c44328775f..ef8a63a728 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -594,31 +594,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
admin_delete(A)
-/client/proc/admin_delete(datum/D)
- var/atom/A = D
- var/coords = ""
- var/jmp_coords = ""
- if(istype(A))
- var/turf/T = get_turf(A)
- if(T)
- coords = "at [COORD(T)]"
- jmp_coords = "at [ADMIN_COORDJMP(T)]"
- else
- jmp_coords = coords = "in nullspace"
-
- if (alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", "Yes", "No") == "Yes")
- log_admin("[key_name(usr)] deleted [D] [coords]")
- message_admins("[key_name_admin(usr)] deleted [D] [jmp_coords]")
- SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
- if(isturf(D))
- var/turf/T = D
- T.ScrapeAway()
- else
- vv_update_display(D, "deleted", VV_MSG_DELETED)
- qdel(D)
- if(!QDELETED(D))
- vv_update_display(D, "deleted", "")
-
/client/proc/cmd_admin_list_open_jobs()
set category = "Admin"
set name = "Manage Job Slots"
diff --git a/code/modules/admin/view_variables/admin_delete.dm b/code/modules/admin/view_variables/admin_delete.dm
new file mode 100644
index 0000000000..947ad5db2c
--- /dev/null
+++ b/code/modules/admin/view_variables/admin_delete.dm
@@ -0,0 +1,24 @@
+/client/proc/admin_delete(datum/D)
+ var/atom/A = D
+ var/coords = ""
+ var/jmp_coords = ""
+ if(istype(A))
+ var/turf/T = get_turf(A)
+ if(T)
+ coords = "at [COORD(T)]"
+ jmp_coords = "at [ADMIN_COORDJMP(T)]"
+ else
+ jmp_coords = coords = "in nullspace"
+
+ if (alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", "Yes", "No") == "Yes")
+ log_admin("[key_name(usr)] deleted [D] [coords]")
+ message_admins("[key_name_admin(usr)] deleted [D] [jmp_coords]")
+ SSblackbox.record_feedback("tally", "admin_verb", 1, "Delete") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+ if(isturf(D))
+ var/turf/T = D
+ T.ScrapeAway()
+ else
+ vv_update_display(D, "deleted", VV_MSG_DELETED)
+ qdel(D)
+ if(!QDELETED(D))
+ vv_update_display(D, "deleted", "")
diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm
new file mode 100644
index 0000000000..23f85cba15
--- /dev/null
+++ b/code/modules/admin/view_variables/debug_variables.dm
@@ -0,0 +1,76 @@
+#define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing )
+/proc/debug_variable(name, value, level, datum/D, sanitize = TRUE) //if D is a list, name will be index, and value will be assoc value.
+ var/header
+ if(D)
+ if(islist(D))
+ var/index = name
+ if (value)
+ name = D[name] //name is really the index until this line
+ else
+ value = D[name]
+ header = "([VV_HREF_TARGET_1V(D, VV_HK_LIST_EDIT, "E", index)]) ([VV_HREF_TARGET_1V(D, VV_HK_LIST_CHANGE, "C", index)]) ([VV_HREF_TARGET_1V(D, VV_HK_LIST_REMOVE, "-", index)]) "
+ else
+ header = " ([VV_HREF_TARGET_1V(D, VV_HK_BASIC_EDIT, "E", name)]) ([VV_HREF_TARGET_1V(D, VV_HK_BASIC_CHANGE, "C", name)]) ([VV_HREF_TARGET_1V(D, VV_HK_BASIC_MASSEDIT, "M", name)]) "
+ else
+ header = " "
+
+ var/item
+ if (isnull(value))
+ item = "[VV_HTML_ENCODE(name)] = null "
+
+ else if (istext(value))
+ item = "[VV_HTML_ENCODE(name)] = \"[VV_HTML_ENCODE(value)]\" "
+
+ else if (isicon(value))
+ #ifdef VARSICON
+ var/icon/I = icon(value)
+ var/rnd = rand(1,10000)
+ var/rname = "tmp[REF(I)][rnd].png"
+ usr << browse_rsc(I, rname)
+ item = "[VV_HTML_ENCODE(name)] = ([value] ) [value] )"
+ #endif
+
+ else if (isfile(value))
+ item = "[VV_HTML_ENCODE(name)] = '[value]' "
+
+ else if (istype(value, /datum))
+ var/datum/DV = value
+ if ("[DV]" != "[DV.type]") //if the thing as a name var, lets use it.
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [DV] [DV.type]"
+ else
+ item = "[VV_HTML_ENCODE(name)] [REF(value)] = [DV.type]"
+
+ else if (islist(value))
+ var/list/L = value
+ var/list/items = list()
+
+ if (L.len > 0 && !(name == "underlays" || name == "overlays" || L.len > (IS_NORMAL_LIST(L) ? VV_NORMAL_LIST_NO_EXPAND_THRESHOLD : VV_SPECIAL_LIST_NO_EXPAND_THRESHOLD)))
+ for (var/i in 1 to L.len)
+ var/key = L[i]
+ var/val
+ if (IS_NORMAL_LIST(L) && !isnum(key))
+ val = L[key]
+ if (isnull(val)) // we still want to display non-null false values, such as 0 or ""
+ val = key
+ key = i
+
+ items += debug_variable(key, val, level + 1, sanitize = sanitize)
+
+ item = "[VV_HTML_ENCODE(name)] = /list ([L.len]) "
+ else
+ item = "[VV_HTML_ENCODE(name)] = /list ([L.len]) "
+
+ else if (name in GLOB.bitfields)
+ var/list/flags = list()
+ for (var/i in GLOB.bitfields[name])
+ if (value & GLOB.bitfields[name][i])
+ flags += i
+ item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(jointext(flags, ", "))]"
+ else
+ item = "[VV_HTML_ENCODE(name)] = [VV_HTML_ENCODE(value)] "
+
+ return "[header][item] "
+
+#undef VV_HTML_ENCODE
diff --git a/code/modules/admin/view_variables/get_variables.dm b/code/modules/admin/view_variables/get_variables.dm
new file mode 100644
index 0000000000..3f90002edc
--- /dev/null
+++ b/code/modules/admin/view_variables/get_variables.dm
@@ -0,0 +1,271 @@
+/client/proc/vv_get_class(var_name, var_value)
+ if(isnull(var_value))
+ . = VV_NULL
+
+ else if(isnum(var_value))
+ if(var_name in GLOB.bitfields)
+ . = VV_BITFIELD
+ else
+ . = VV_NUM
+
+ else if(istext(var_value))
+ if(findtext(var_value, "\n"))
+ . = VV_MESSAGE
+ else
+ . = VV_TEXT
+
+ else if(isicon(var_value))
+ . = VV_ICON
+
+ else if(ismob(var_value))
+ . = VV_MOB_REFERENCE
+
+ else if(isloc(var_value))
+ . = VV_ATOM_REFERENCE
+
+ else if(istype(var_value, /client))
+ . = VV_CLIENT
+
+ else if(istype(var_value, /datum))
+ . = VV_DATUM_REFERENCE
+
+ else if(ispath(var_value))
+ if(ispath(var_value, /atom))
+ . = VV_ATOM_TYPE
+ else if(ispath(var_value, /datum))
+ . = VV_DATUM_TYPE
+ else
+ . = VV_TYPE
+
+ else if(islist(var_value))
+ . = VV_LIST
+
+ else if(isfile(var_value))
+ . = VV_FILE
+ else
+ . = VV_NULL
+
+/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes, var_name)
+ . = list("class" = class, "value" = null)
+ if(!class)
+ if(!classes)
+ classes = list (
+ VV_NUM,
+ VV_TEXT,
+ VV_MESSAGE,
+ VV_ICON,
+ VV_ATOM_REFERENCE,
+ VV_DATUM_REFERENCE,
+ VV_MOB_REFERENCE,
+ VV_CLIENT,
+ VV_ATOM_TYPE,
+ VV_DATUM_TYPE,
+ VV_TYPE,
+ VV_FILE,
+ VV_NEW_ATOM,
+ VV_NEW_DATUM,
+ VV_NEW_TYPE,
+ VV_NEW_LIST,
+ VV_NULL,
+ VV_RESTORE_DEFAULT,
+ VV_TEXT_LOCATE,
+ VV_PROCCALL_RETVAL,
+ )
+
+ var/markstring
+ if(!(VV_MARKED_DATUM in restricted_classes))
+ markstring = "[VV_MARKED_DATUM] (CURRENT: [(istype(holder) && istype(holder.marked_datum))? holder.marked_datum.type : "NULL"])"
+ classes += markstring
+
+ if(restricted_classes)
+ classes -= restricted_classes
+
+ if(extra_classes)
+ classes += extra_classes
+
+ .["class"] = input(src, "What kind of data?", "Variable Type", default_class) as null|anything in classes
+ if(holder && holder.marked_datum && .["class"] == markstring)
+ .["class"] = VV_MARKED_DATUM
+
+ switch(.["class"])
+ if(VV_TEXT)
+ .["value"] = input("Enter new text:", "Text", current_value) as null|text
+ if(.["value"] == null)
+ .["class"] = null
+ return
+ if(VV_MESSAGE)
+ .["value"] = input("Enter new text:", "Text", current_value) as null|message
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+
+ if(VV_NUM)
+ .["value"] = input("Enter new number:", "Num", current_value) as null|num
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_BITFIELD)
+ .["value"] = input_bitfield(usr, "Editing bitfield: [var_name]", var_name, current_value)
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_ATOM_TYPE)
+ .["value"] = pick_closest_path(FALSE)
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_DATUM_TYPE)
+ .["value"] = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_TYPE)
+ var/type = current_value
+ var/error = ""
+ do
+ type = input("Enter type:[error]", "Type", type) as null|text
+ if(!type)
+ break
+ type = text2path(type)
+ error = "\nType not found, Please try again"
+ while(!type)
+ if(!type)
+ .["class"] = null
+ return
+ .["value"] = type
+
+ if(VV_ATOM_REFERENCE)
+ var/type = pick_closest_path(FALSE)
+ var/subtypes = vv_subtype_prompt(type)
+ if(subtypes == null)
+ .["class"] = null
+ return
+ var/list/things = vv_reference_list(type, subtypes)
+ var/value = input("Select reference:", "Reference", current_value) as null|anything in things
+ if(!value)
+ .["class"] = null
+ return
+ .["value"] = things[value]
+
+ if(VV_DATUM_REFERENCE)
+ var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
+ var/subtypes = vv_subtype_prompt(type)
+ if(subtypes == null)
+ .["class"] = null
+ return
+ var/list/things = vv_reference_list(type, subtypes)
+ var/value = input("Select reference:", "Reference", current_value) as null|anything in things
+ if(!value)
+ .["class"] = null
+ return
+ .["value"] = things[value]
+
+ if(VV_MOB_REFERENCE)
+ var/type = pick_closest_path(FALSE, make_types_fancy(typesof(/mob)))
+ var/subtypes = vv_subtype_prompt(type)
+ if(subtypes == null)
+ .["class"] = null
+ return
+ var/list/things = vv_reference_list(type, subtypes)
+ var/value = input("Select reference:", "Reference", current_value) as null|anything in things
+ if(!value)
+ .["class"] = null
+ return
+ .["value"] = things[value]
+
+ if(VV_CLIENT)
+ .["value"] = input("Select reference:", "Reference", current_value) as null|anything in GLOB.clients
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_FILE)
+ .["value"] = input("Pick file:", "File") as null|file
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_ICON)
+ .["value"] = input("Pick icon:", "Icon") as null|icon
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_MARKED_DATUM)
+ .["value"] = holder.marked_datum
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_PROCCALL_RETVAL)
+ var/list/get_retval = list()
+ callproc_blocking(get_retval)
+ .["value"] = get_retval[1] //should have been set in proccall!
+ if(.["value"] == null)
+ .["class"] = null
+ return
+
+ if(VV_NEW_ATOM)
+ var/type = pick_closest_path(FALSE)
+ if(!type)
+ .["class"] = null
+ return
+ .["type"] = type
+ var/atom/newguy = new type()
+ newguy.datum_flags |= DF_VAR_EDITED
+ .["value"] = newguy
+
+ if(VV_NEW_DATUM)
+ var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
+ if(!type)
+ .["class"] = null
+ return
+ .["type"] = type
+ var/datum/newguy = new type()
+ newguy.datum_flags |= DF_VAR_EDITED
+ .["value"] = newguy
+
+ if(VV_NEW_TYPE)
+ var/type = current_value
+ var/error = ""
+ do
+ type = input("Enter type:[error]", "Type", type) as null|text
+ if(!type)
+ break
+ type = text2path(type)
+ error = "\nType not found, Please try again"
+ while(!type)
+ if(!type)
+ .["class"] = null
+ return
+ .["type"] = type
+ var/datum/newguy = new type()
+ if(istype(newguy))
+ newguy.datum_flags |= DF_VAR_EDITED
+ .["value"] = newguy
+
+ if(VV_NEW_LIST)
+ .["value"] = list()
+ .["type"] = /list
+
+ if(VV_TEXT_LOCATE)
+ var/datum/D
+ do
+ var/ref = input("Enter reference:", "Reference") as null|text
+ if(!ref)
+ break
+ D = locate(ref)
+ if(!D)
+ alert("Invalid ref!")
+ continue
+ if(!D.can_vv_mark())
+ alert("Datum can not be marked!")
+ continue
+ while(!D)
+ .["type"] = D.type
+ .["value"] = D
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..9f1b333750
--- /dev/null
+++ b/code/modules/admin/view_variables/mark_datum.dm
@@ -0,0 +1,12 @@
+/client/proc/mark_datum(datum/D)
+ if(!holder)
+ return
+ if(holder.marked_datum)
+ vv_update_display(holder.marked_datum, "marked", "")
+ holder.marked_datum = D
+ vv_update_display(D, "marked", VV_MSG_MARKED)
+
+/client/proc/mark_datum_mapview(datum/D as mob|obj|turf|area in view(view))
+ set category = "Debug"
+ set name = "Mark Object"
+ mark_datum(D)
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/view_variables/mass_edit_variables.dm
similarity index 94%
rename from code/modules/admin/verbs/massmodvar.dm
rename to code/modules/admin/view_variables/mass_edit_variables.dm
index ba199350e3..4e78e1aed7 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/view_variables/mass_edit_variables.dm
@@ -197,7 +197,7 @@
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)")
-
+//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(var/T, subtypes = TRUE)
var/list/typecache = list()
typecache[T] = 1
@@ -205,19 +205,25 @@
typecache = typecacheof(typecache)
. = list()
if (ispath(T, /mob))
- for(var/mob/thing in GLOB.mob_list)
+ for(var/mob/thing in world)
if (typecache[thing.type])
. += thing
CHECK_TICK
else if (ispath(T, /obj/machinery/door))
- for(var/obj/machinery/door/thing in GLOB.airlocks)
+ for(var/obj/machinery/door/thing in world)
if (typecache[thing.type])
. += thing
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
@@ -247,7 +253,7 @@
CHECK_TICK
else if (ispath(T, /client))
- for(var/client/thing in GLOB.clients)
+ for(var/client/thing in world)
if (typecache[thing.type])
. += thing
CHECK_TICK
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/view_variables/modify_variables.dm
similarity index 60%
rename from code/modules/admin/verbs/modifyvariables.dm
rename to code/modules/admin/view_variables/modify_variables.dm
index 537c31d3b4..a4ed4d45bd 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/view_variables/modify_variables.dm
@@ -1,264 +1,12 @@
-GLOBAL_LIST_INIT(VVlocked, list("vars", "datum_flags", "client", "virus", "viruses", "cuffed", "last_eaten", "unlock_content", "force_ending"))
+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", "resize"))
+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"))
+GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN
GLOBAL_PROTECT(VVckey_edit)
-GLOBAL_LIST_INIT(VVpixelmovement, list("step_x", "step_y", "bound_height", "bound_width", "bound_x", "bound_y"))
+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_get_class(var/var_name, var/var_value)
- if(isnull(var_value))
- . = VV_NULL
-
- else if (isnum(var_value))
- if (var_name in GLOB.bitfields)
- . = VV_BITFIELD
- else
- . = VV_NUM
-
- else if (istext(var_value))
- if (findtext(var_value, "\n"))
- . = VV_MESSAGE
- else
- . = VV_TEXT
-
- else if (isicon(var_value))
- . = VV_ICON
-
- else if (ismob(var_value))
- . = VV_MOB_REFERENCE
-
- else if (isloc(var_value))
- . = VV_ATOM_REFERENCE
-
- else if (istype(var_value, /client))
- . = VV_CLIENT
-
- else if (istype(var_value, /datum))
- . = VV_DATUM_REFERENCE
-
- else if (ispath(var_value))
- if (ispath(var_value, /atom))
- . = VV_ATOM_TYPE
- else if (ispath(var_value, /datum))
- . = VV_DATUM_TYPE
- else
- . = VV_TYPE
-
- else if (islist(var_value))
- . = VV_LIST
-
- else if (isfile(var_value))
- . = VV_FILE
- else
- . = VV_NULL
-
-/client/proc/vv_get_value(class, default_class, current_value, list/restricted_classes, list/extra_classes, list/classes, var_name)
- . = list("class" = class, "value" = null)
- if (!class)
- if (!classes)
- classes = list (
- VV_NUM,
- VV_TEXT,
- VV_MESSAGE,
- VV_ICON,
- VV_ATOM_REFERENCE,
- VV_DATUM_REFERENCE,
- VV_MOB_REFERENCE,
- VV_CLIENT,
- VV_ATOM_TYPE,
- VV_DATUM_TYPE,
- VV_TYPE,
- VV_FILE,
- VV_NEW_ATOM,
- VV_NEW_DATUM,
- VV_NEW_TYPE,
- VV_NEW_LIST,
- VV_NULL,
- VV_RESTORE_DEFAULT
- )
-
- if(holder && holder.marked_datum && !(VV_MARKED_DATUM in restricted_classes))
- classes += "[VV_MARKED_DATUM] ([holder.marked_datum.type])"
- if (restricted_classes)
- classes -= restricted_classes
-
- if (extra_classes)
- classes += extra_classes
-
- .["class"] = input(src, "What kind of data?", "Variable Type", default_class) as null|anything in classes
- if (holder && holder.marked_datum && .["class"] == "[VV_MARKED_DATUM] ([holder.marked_datum.type])")
- .["class"] = VV_MARKED_DATUM
-
-
- switch(.["class"])
- if (VV_TEXT)
- .["value"] = input("Enter new text:", "Text", current_value) as null|text
- if (.["value"] == null)
- .["class"] = null
- return
- if (VV_MESSAGE)
- .["value"] = input("Enter new text:", "Text", current_value) as null|message
- if (.["value"] == null)
- .["class"] = null
- return
-
-
- if (VV_NUM)
- .["value"] = input("Enter new number:", "Num", current_value) as null|num
- if (.["value"] == null)
- .["class"] = null
- return
-
- if (VV_BITFIELD)
- .["value"] = input_bitfield(usr, "Editing bitfield: [var_name]", var_name, current_value)
- if (.["value"] == null)
- .["class"] = null
- return
-
- if (VV_ATOM_TYPE)
- .["value"] = pick_closest_path(FALSE)
- if (.["value"] == null)
- .["class"] = null
- return
-
- if (VV_DATUM_TYPE)
- .["value"] = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
- if (.["value"] == null)
- .["class"] = null
- return
-
- if (VV_TYPE)
- var/type = current_value
- var/error = ""
- do
- type = input("Enter type:[error]", "Type", type) as null|text
- if (!type)
- break
- type = text2path(type)
- error = "\nType not found, Please try again"
- while(!type)
- if (!type)
- .["class"] = null
- return
- .["value"] = type
-
-
- if (VV_ATOM_REFERENCE)
- var/type = pick_closest_path(FALSE)
- var/subtypes = vv_subtype_prompt(type)
- if (subtypes == null)
- .["class"] = null
- return
- var/list/things = vv_reference_list(type, subtypes)
- var/value = input("Select reference:", "Reference", current_value) as null|anything in things
- if (!value)
- .["class"] = null
- return
- .["value"] = things[value]
-
- if (VV_DATUM_REFERENCE)
- var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
- var/subtypes = vv_subtype_prompt(type)
- if (subtypes == null)
- .["class"] = null
- return
- var/list/things = vv_reference_list(type, subtypes)
- var/value = input("Select reference:", "Reference", current_value) as null|anything in things
- if (!value)
- .["class"] = null
- return
- .["value"] = things[value]
-
- if (VV_MOB_REFERENCE)
- var/type = pick_closest_path(FALSE, make_types_fancy(typesof(/mob)))
- var/subtypes = vv_subtype_prompt(type)
- if (subtypes == null)
- .["class"] = null
- return
- var/list/things = vv_reference_list(type, subtypes)
- var/value = input("Select reference:", "Reference", current_value) as null|anything in things
- if (!value)
- .["class"] = null
- return
- .["value"] = things[value]
-
-
-
- if (VV_CLIENT)
- .["value"] = input("Select reference:", "Reference", current_value) as null|anything in GLOB.clients
- if (.["value"] == null)
- .["class"] = null
- return
-
-
- if (VV_FILE)
- .["value"] = input("Pick file:", "File") as null|file
- if (.["value"] == null)
- .["class"] = null
- return
-
-
- if (VV_ICON)
- .["value"] = input("Pick icon:", "Icon") as null|icon
- if (.["value"] == null)
- .["class"] = null
- return
-
-
- if (VV_MARKED_DATUM)
- .["value"] = holder.marked_datum
- if (.["value"] == null)
- .["class"] = null
- return
-
-
- if (VV_NEW_ATOM)
- var/type = pick_closest_path(FALSE)
- if (!type)
- .["class"] = null
- return
- .["type"] = type
- var/atom/newguy = new type()
- newguy.datum_flags |= DF_VAR_EDITED
- .["value"] = newguy
-
- if (VV_NEW_DATUM)
- var/type = pick_closest_path(FALSE, get_fancy_list_of_datum_types())
- if (!type)
- .["class"] = null
- return
- .["type"] = type
- var/datum/newguy = new type()
- newguy.datum_flags |= DF_VAR_EDITED
- .["value"] = newguy
-
- if (VV_NEW_TYPE)
- var/type = current_value
- var/error = ""
- do
- type = input("Enter type:[error]", "Type", type) as null|text
- if (!type)
- break
- type = text2path(type)
- error = "\nType not found, Please try again"
- while(!type)
- if (!type)
- .["class"] = null
- return
- .["type"] = type
- var/datum/newguy = new type()
- if(istype(newguy))
- newguy.datum_flags |= DF_VAR_EDITED
- .["value"] = newguy
-
-
- if (VV_NEW_LIST)
- .["value"] = list()
- .["type"] = /list
-
/client/proc/vv_parse_text(O, new_var)
if(O && findtext(new_var,"\["))
var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
@@ -372,13 +120,13 @@ GLOBAL_PROTECT(VVpixelmovement)
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"
@@ -439,10 +187,17 @@ GLOBAL_PROTECT(VVpixelmovement)
assoc_key = L[index]
var/default
var/variable
- if (assoc)
- variable = L[assoc_key]
- else
- variable = L[index]
+ 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
+ var/found = L[variable]
+ if(!isnull(found))
+ old_assoc_value = found
+ //
default = vv_get_class(objectvar, variable)
@@ -504,11 +259,13 @@ GLOBAL_PROTECT(VVpixelmovement)
for(var/V in varsvars)
new_var = replacetext(new_var,"\[[V]]","[O.vars[V]]")
-
- if(assoc)
- L[assoc_key] = new_var
- else
- L[index] = new_var
+ 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.")
@@ -527,15 +284,8 @@ GLOBAL_PROTECT(VVpixelmovement)
if(param_var_name in GLOB.VVicon_edit_lock)
if(!check_rights(R_FUN|R_DEBUG))
return FALSE
- if(param_var_name in GLOB.VVpixelmovement)
- if(!check_rights(R_DEBUG))
- return FALSE
- var/prompt = alert(usr, "Editing this var may irreparably break tile gliding for the rest of the round. THIS CAN'T BE UNDONE", "DANGER", "ABORT ", "Continue", " ABORT")
- if (prompt != "Continue")
- return FALSE
return TRUE
-
/client/proc/modify_variables(atom/O, param_var_name = null, autodetect_class = 0)
if(!check_rights(R_VAREDIT))
return
@@ -567,11 +317,6 @@ GLOBAL_PROTECT(VVpixelmovement)
var_value = O.vars[variable]
if(!vv_varname_lockcheck(variable))
return
- if(istype(O, /datum/armor))
- var/prompt = alert(src, "Editing this var changes this value on potentially thousands of items that share the same combination of armor values. If you want to edit the armor of just one item, use the \"Modify armor values\" dropdown item", "DANGER", "ABORT ", "Continue", " ABORT")
- if (prompt != "Continue")
- return
-
var/default = vv_get_class(variable, var_value)
@@ -635,10 +380,9 @@ GLOBAL_PROTECT(VVpixelmovement)
to_chat(src, "Your edit was rejected by the object.")
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]"
message_admins(msg)
admin_ticket_log(O, msg)
- return TRUE
\ No newline at end of file
+ return TRUE
diff --git a/code/modules/admin/view_variables/topic.dm b/code/modules/admin/view_variables/topic.dm
new file mode 100644
index 0000000000..626e75fa10
--- /dev/null
+++ b/code/modules/admin/view_variables/topic.dm
@@ -0,0 +1,128 @@
+//DO NOT ADD MORE TO THIS FILE.
+//Use vv_do_topic() for datums!
+/client/proc/view_var_Topic(href, href_list, hsrc)
+ if( (usr.client != src) || !src.holder || !holder.CheckAdminHref(href, href_list))
+ return
+ var/target = GET_VV_TARGET
+ vv_do_basic(target, href_list, href)
+ if(istype(target, /datum))
+ 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"]))
+
+//Stuff below aren't in dropdowns/etc.
+
+ if(check_rights(R_VAREDIT))
+
+ //~CARN: for renaming mobs (updates their name, real_name, mind.name, their ID/PDA and datacore records).
+
+ if(href_list["rename"])
+ if(!check_rights(NONE))
+ return
+
+ var/mob/M = locate(href_list["rename"]) in GLOB.mob_list
+ if(!istype(M))
+ to_chat(usr, "This can only be used on instances of type /mob")
+ 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( !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)
+ 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(NONE))
+ return
+
+ var/atom/A = locate(href_list["rotatedatum"])
+ if(!istype(A))
+ to_chat(usr, "This can only be done to instances of type /atom")
+ return
+
+ switch(href_list["rotatedir"])
+ if("right")
+ A.setDir(turn(A.dir, -45))
+ if("left")
+ A.setDir(turn(A.dir, 45))
+ vv_update_display(A, "dir", dir2text(A.dir))
+
+
+ else if(href_list["makehuman"])
+ if(!check_rights(R_SPAWN))
+ return
+
+ var/mob/living/carbon/monkey/Mo = locate(href_list["makehuman"]) in GLOB.mob_list
+ if(!istype(Mo))
+ to_chat(usr, "This can only be done to instances of type /mob/living/carbon/monkey")
+ return
+
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ if(!Mo)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ holder.Topic(href, list("humanone"=href_list["makehuman"]))
+
+ else if(href_list["adjustDamage"] && href_list["mobToDamage"])
+ if(!check_rights(NONE))
+ return
+
+ var/mob/living/L = locate(href_list["mobToDamage"]) in GLOB.mob_list
+ if(!istype(L))
+ return
+
+ var/Text = href_list["adjustDamage"]
+
+ var/amount = input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
+
+ if(!L)
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+
+ var/newamt
+ switch(Text)
+ 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.adjustOrganLoss(ORGAN_SLOT_BRAIN, amount)
+ newamt = L.getOrganLoss(ORGAN_SLOT_BRAIN)
+ if("clone")
+ L.adjustCloneLoss(amount)
+ newamt = L.getCloneLoss()
+ if("stamina")
+ L.adjustStaminaLoss(amount)
+ newamt = L.getStaminaLoss()
+ else
+ to_chat(usr, "You caused an error. DEBUG: Text:[Text] Mob:[L]")
+ return
+
+ if(amount != 0)
+ 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]")
+
+
+ //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))
+ 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..2a0f3d7302
--- /dev/null
+++ b/code/modules/admin/view_variables/topic_basic.dm
@@ -0,0 +1,51 @@
+//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, "The object you tried to expose to [C] no longer exists (nulled or hard-deled) ")
+ 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")
+ C.debug_variables(target)
+ if(check_rights(R_DEBUG))
+ if(href_list[VV_HK_DELETE])
+ usr.client.admin_delete(target)
+ if (isturf(src)) // show the turf that took its place
+ usr.client.debug_variables(src)
+ if(href_list[VV_HK_MARK])
+ usr.client.mark_datum(target)
+ if(href_list[VV_HK_CALLPROC])
+ usr.client.callproc_datum(target)
diff --git a/code/modules/admin/view_variables/topic_list.dm b/code/modules/admin/view_variables/topic_list.dm
new file mode 100644
index 0000000000..349d9da698
--- /dev/null
+++ b/code/modules/admin/view_variables/topic_list.dm
@@ -0,0 +1,43 @@
+//LISTS - CAN NOT DO VV_DO_TOPIC BECAUSE LISTS AREN'T DATUMS :(
+/client/proc/vv_do_list(list/target, href_list)
+ 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 = alert("Do you want to remove item number [target_index] from list?", "Confirm", "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])
+ 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(50000, 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")
diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm
new file mode 100644
index 0000000000..a85b4ff1a3
--- /dev/null
+++ b/code/modules/admin/view_variables/view_variables.dm
@@ -0,0 +1,269 @@
+
+/client/proc/debug_variables(datum/D in world)
+ set category = "Debug"
+ 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) //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, "You need to be an administrator to access this. ")
+ return
+
+ if(!D)
+ return
+
+ var/islist = islist(D)
+ if(!islist && !istype(D))
+ return
+
+ var/title = ""
+ var/refid = REF(D)
+ var/icon/sprite
+ var/hash
+
+ var/type = islist? /list : D.type
+ var/no_icon = FALSE
+
+ if(istype(D, /atom))
+ sprite = getFlatIcon(D)
+ hash = md5(sprite)
+ if(sprite)
+ hash = md5(sprite)
+ src << browse_rsc(sprite, "vv[hash].png")
+ else
+ no_icon = TRUE
+
+ title = "[D] ([REF(D)]) = [type]"
+ var/formatted_type = replacetext("[type]", "/", "/")
+
+ var/sprite_text
+ if(sprite)
+ sprite_text = no_icon? "\[NO ICON\]" : " "
+ var/list/header = islist(D)? list("/list ") : D.vv_get_header()
+
+ var/marked_line
+ if(holder && holder.marked_datum && holder.marked_datum == D)
+ marked_line = VV_MSG_MARKED
+ var/varedited_line
+ if(!islist && (D.datum_flags & DF_VAR_EDITED))
+ varedited_line = VV_MSG_EDITED
+ var/deleted_line
+ if(!islist && D.gc_destroyed)
+ deleted_line = VV_MSG_DELETED
+
+ var/list/dropdownoptions
+ if (islist)
+ dropdownoptions = list(
+ "---",
+ "Add Item" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_LIST_ADD),
+ "Remove Nulls" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_LIST_ERASE_NULLS),
+ "Remove Dupes" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_LIST_ERASE_DUPES),
+ "Set len" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_LIST_SET_LENGTH),
+ "Shuffle" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_LIST_SHUFFLE),
+ "Show VV To Player" = VV_HREF_TARGETREF_INTERNAL(refid, VV_HK_EXPOSE),
+ "---"
+ )
+ for(var/i in 1 to length(dropdownoptions))
+ var/name = dropdownoptions[i]
+ var/link = dropdownoptions[name]
+ dropdownoptions[i] = "[name] "
+ else
+ dropdownoptions = D.vv_get_dropdown()
+
+ var/list/names = list()
+ if(!islist)
+ for(var/V in D.vars)
+ names += V
+ sleep(1)
+
+ var/list/variable_html = list()
+ if(islist)
+ var/list/L = D
+ for(var/i in 1 to L.len)
+ var/key = L[i]
+ var/value
+ if(IS_NORMAL_LIST(L) && IS_VALID_ASSOC_KEY(key))
+ value = L[key]
+ variable_html += debug_variable(i, value, 0, L)
+ else
+ names = sortList(names)
+ for(var/V in names)
+ if(D.can_vv_get(V))
+ variable_html += D.vv_get_var(V)
+
+ var/html = {"
+
+
+ [title]
+
+
+
+
+
+
+
+
+
+
+
+ [sprite_text]
+
+ [header.Join()]
+
+
+
+
+
+ [formatted_type] [marked_line]
+ [varedited_line]
+ [deleted_line]
+
+
+
+
+
+
+
+
+ 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.
+
+ [variable_html.Join()]
+
+
+
+
+"}
+ src << browse(html, "window=variables[refid];size=475x650")
+
+/client/proc/vv_update_display(datum/D, span, content)
+ src << output("[span]:[content]", "variables[REF(D)].browser:replace_span")
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 9c9b131f48..3b8f8de359 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -393,17 +393,13 @@
/datum/spacevine_controller/vv_get_dropdown()
. = ..()
- . += "---"
- .["Delete Vines"] = "?_src_=[REF(src)];[HrefToken()];purge_vines=1"
+ VV_DROPDOWN_OPTION(VV_HK_SPACEVINE_PURGE, "Delete Vines")
-/datum/spacevine_controller/Topic(href, href_list)
- if(..() || !check_rights(R_ADMIN, FALSE) || !usr.client.holder.CheckAdminHref(href, href_list))
- return
-
- if(href_list["purge_vines"])
- if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", "Yes", "No") != "Yes")
- return
- DeleteVines()
+/datum/spacevine_controller/vv_do_topic(href_list)
+ . = ..()
+ if(href_list[VV_HK_SPACEVINE_PURGE])
+ if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", "Yes", "No") == "Yes")
+ DeleteVines()
/datum/spacevine_controller/proc/DeleteVines() //this is kill
QDEL_LIST(vines) //this will also qdel us
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 3c5ef91c41..fc85fc25c4 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -984,14 +984,121 @@
/mob/living/carbon/vv_get_dropdown()
. = ..()
- . += "---"
- .["Make AI"] = "?_src_=vars;[HrefToken()];makeai=[REF(src)]"
- .["Modify bodypart"] = "?_src_=vars;[HrefToken()];editbodypart=[REF(src)]"
- .["Modify organs"] = "?_src_=vars;[HrefToken()];editorgans=[REF(src)]"
- .["Hallucinate"] = "?_src_=vars;[HrefToken()];hallucinate=[REF(src)]"
- .["Give martial arts"] = "?_src_=vars;[HrefToken()];givemartialart=[REF(src)]"
- .["Give brain trauma"] = "?_src_=vars;[HrefToken()];givetrauma=[REF(src)]"
- .["Cure brain traumas"] = "?_src_=vars;[HrefToken()];curetraumas=[REF(src)]"
+ VV_DROPDOWN_OPTION("", "---------")
+ VV_DROPDOWN_OPTION(VV_HK_MAKE_AI, "Make AI")
+ VV_DROPDOWN_OPTION(VV_HK_MODIFY_BODYPART, "Modify bodypart")
+ VV_DROPDOWN_OPTION(VV_HK_MODIFY_ORGANS, "Modify organs")
+ VV_DROPDOWN_OPTION(VV_HK_HALLUCINATION, "Hallucinate")
+ VV_DROPDOWN_OPTION(VV_HK_MARTIAL_ART, "Give Martial Arts")
+ VV_DROPDOWN_OPTION(VV_HK_GIVE_TRAUMA, "Give Brain Trauma")
+ VV_DROPDOWN_OPTION(VV_HK_CURE_TRAUMA, "Cure Brain Traumas")
+
+/mob/living/carbon/vv_do_topic(list/href_list)
+ . = ..()
+ if(href_list[VV_HK_MODIFY_BODYPART])
+ if(!check_rights(R_SPAWN))
+ return
+ var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment")
+ if(!edit_action)
+ return
+ var/list/limb_list = list()
+ if(edit_action == "remove" || edit_action == "augment")
+ for(var/obj/item/bodypart/B in bodyparts)
+ limb_list += B.body_zone
+ if(edit_action == "remove")
+ limb_list -= BODY_ZONE_CHEST
+ else
+ limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
+ for(var/obj/item/bodypart/B in bodyparts)
+ limb_list -= B.body_zone
+ var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list
+ if(result)
+ var/obj/item/bodypart/BP = get_bodypart(result)
+ switch(edit_action)
+ if("remove")
+ if(BP)
+ BP.drop_limb()
+ else
+ to_chat(usr, "[src] doesn't have such bodypart.")
+ if("add")
+ if(BP)
+ to_chat(usr, "[src] already has such bodypart.")
+ else
+ if(!regenerate_limb(result))
+ to_chat(usr, "[src] cannot have such bodypart.")
+ if("augment")
+ if(ishuman(src))
+ if(BP)
+ BP.change_bodypart_status(BODYPART_ROBOTIC, TRUE, TRUE)
+ else
+ to_chat(usr, "[src] doesn't have such bodypart.")
+ else
+ to_chat(usr, "Only humans can be augmented.")
+ admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src]")
+ if(href_list[VV_HK_MAKE_AI])
+ if(!check_rights(R_SPAWN))
+ return
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ usr.client.holder.Topic("vv_override", list("makeai"=href_list[VV_HK_TARGET]))
+ if(href_list[VV_HK_MODIFY_ORGANS])
+ if(!check_rights(NONE))
+ return
+ usr.client.manipulate_organs(src)
+ if(href_list[VV_HK_MARTIAL_ART])
+ if(!check_rights(NONE))
+ return
+ var/list/artpaths = subtypesof(/datum/martial_art)
+ var/list/artnames = list()
+ for(var/i in artpaths)
+ var/datum/martial_art/M = i
+ artnames[initial(M.name)] = M
+ var/result = input(usr, "Choose the martial art to teach","JUDO CHOP") as null|anything in artnames
+ if(!usr)
+ return
+ if(QDELETED(src))
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ if(result)
+ var/chosenart = artnames[result]
+ var/datum/martial_art/MA = new chosenart
+ MA.teach(src)
+ log_admin("[key_name(usr)] has taught [MA] to [key_name(src)].")
+ message_admins("[key_name_admin(usr)] has taught [MA] to [key_name_admin(src)]. ")
+ if(href_list[VV_HK_GIVE_TRAUMA])
+ if(!check_rights(NONE))
+ return
+ var/list/traumas = subtypesof(/datum/brain_trauma)
+ var/result = input(usr, "Choose the brain trauma to apply","Traumatize") as null|anything in traumas
+ if(!usr)
+ return
+ if(QDELETED(src))
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ if(!result)
+ return
+ var/datum/brain_trauma/BT = gain_trauma(result)
+ if(BT)
+ log_admin("[key_name(usr)] has traumatized [key_name(src)] with [BT.name]")
+ message_admins("[key_name_admin(usr)] has traumatized [key_name_admin(src)] with [BT.name]. ")
+ if(href_list[VV_HK_CURE_TRAUMA])
+ if(!check_rights(NONE))
+ return
+ cure_all_traumas(TRAUMA_RESILIENCE_ABSOLUTE)
+ log_admin("[key_name(usr)] has cured all traumas from [key_name(src)].")
+ message_admins("[key_name_admin(usr)] has cured all traumas from [key_name_admin(src)]. ")
+ if(href_list[VV_HK_HALLUCINATION])
+ if(!check_rights(NONE))
+ return
+ var/list/hallucinations = subtypesof(/datum/hallucination)
+ var/result = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in hallucinations
+ if(!usr)
+ return
+ if(QDELETED(src))
+ to_chat(usr, "Mob doesn't exist anymore")
+ return
+ if(result)
+ new result(src, TRUE)
/mob/living/carbon/can_resist()
return bodyparts.len > 2 && ..()
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index a515693047..94aba6851a 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -849,15 +849,95 @@
/mob/living/carbon/human/vv_get_dropdown()
. = ..()
- . += "---"
- .["Make monkey"] = "?_src_=vars;[HrefToken()];makemonkey=[REF(src)]"
- .["Set Species"] = "?_src_=vars;[HrefToken()];setspecies=[REF(src)]"
- .["Make cyborg"] = "?_src_=vars;[HrefToken()];makerobot=[REF(src)]"
- .["Make alien"] = "?_src_=vars;[HrefToken()];makealien=[REF(src)]"
- .["Make slime"] = "?_src_=vars;[HrefToken()];makeslime=[REF(src)]"
- .["Toggle Purrbation"] = "?_src_=vars;[HrefToken()];purrbation=[REF(src)]"
- .["Copy outfit"] = "?_src_=vars;[HrefToken()];copyoutfit=[REF(src)]"
- .["Add/Remove Quirks"] = "?_src_=vars;[HrefToken()];modquirks=[REF(src)]"
+ VV_DROPDOWN_OPTION("", "---------")
+ VV_DROPDOWN_OPTION(VV_HK_COPY_OUTFIT, "Copy Outfit")
+ VV_DROPDOWN_OPTION(VV_HK_MOD_QUIRKS, "Add/Remove Quirks")
+ VV_DROPDOWN_OPTION(VV_HK_MAKE_MONKEY, "Make Monkey")
+ VV_DROPDOWN_OPTION(VV_HK_MAKE_CYBORG, "Make Cyborg")
+ VV_DROPDOWN_OPTION(VV_HK_MAKE_SLIME, "Make Slime")
+ VV_DROPDOWN_OPTION(VV_HK_MAKE_ALIEN, "Make Alien")
+ VV_DROPDOWN_OPTION(VV_HK_SET_SPECIES, "Set Species")
+ VV_DROPDOWN_OPTION(VV_HK_PURRBATION, "Toggle Purrbation")
+
+/mob/living/carbon/human/vv_do_topic(list/href_list)
+ . = ..()
+ if(href_list[VV_HK_COPY_OUTFIT])
+ if(!check_rights(R_SPAWN))
+ return
+ copy_outfit()
+ if(href_list[VV_HK_MOD_QUIRKS])
+ if(!check_rights(R_SPAWN))
+ return
+
+ var/list/options = list("Clear"="Clear")
+ for(var/x in subtypesof(/datum/quirk))
+ var/datum/quirk/T = x
+ var/qname = initial(T.name)
+ options[has_quirk(T) ? "[qname] (Remove)" : "[qname] (Add)"] = T
+
+ var/result = input(usr, "Choose quirk to add/remove","Quirk Mod") as null|anything in options
+ if(result)
+ if(result == "Clear")
+ for(var/datum/quirk/q in roundstart_quirks)
+ remove_quirk(q.type)
+ else
+ var/T = options[result]
+ if(has_quirk(T))
+ remove_quirk(T)
+ else
+ add_quirk(T,TRUE)
+ if(href_list[VV_HK_MAKE_MONKEY])
+ if(!check_rights(R_SPAWN))
+ return
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ usr.client.holder.Topic("vv_override", list("monkeyone"=href_list[VV_HK_TARGET]))
+ if(href_list[VV_HK_MAKE_CYBORG])
+ if(!check_rights(R_SPAWN))
+ return
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ usr.client.holder.Topic("vv_override", list("makerobot"=href_list[VV_HK_TARGET]))
+ if(href_list[VV_HK_MAKE_ALIEN])
+ if(!check_rights(R_SPAWN))
+ return
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ usr.client.holder.Topic("vv_override", list("makealien"=href_list[VV_HK_TARGET]))
+ if(href_list[VV_HK_MAKE_SLIME])
+ if(!check_rights(R_SPAWN))
+ return
+ if(alert("Confirm mob type change?",,"Transform","Cancel") != "Transform")
+ return
+ usr.client.holder.Topic("vv_override", list("makeslime"=href_list[VV_HK_TARGET]))
+ if(href_list[VV_HK_SET_SPECIES])
+ if(!check_rights(R_SPAWN))
+ return
+ var/result = input(usr, "Please choose a new species","Species") as null|anything in GLOB.species_list
+ if(result)
+ var/newtype = GLOB.species_list[result]
+ admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src] to [result]")
+ set_species(newtype)
+ if(href_list[VV_HK_PURRBATION])
+ if(!check_rights(R_SPAWN))
+ return
+ if(!ishumanbasic(src))
+ to_chat(usr, "This can only be done to the basic human species at the moment.")
+ return
+ var/success = purrbation_toggle(src)
+ if(success)
+ to_chat(usr, "Put [src] on purrbation.")
+ log_admin("[key_name(usr)] has put [key_name(src)] on purrbation.")
+ var/msg = "[key_name_admin(usr)] has put [key_name(src)] on purrbation. "
+ message_admins(msg)
+ admin_ticket_log(src, msg)
+
+ else
+ to_chat(usr, "Removed [src] from purrbation.")
+ log_admin("[key_name(usr)] has removed [key_name(src)] from purrbation.")
+ var/msg = "[key_name_admin(usr)] has removed [key_name(src)] from purrbation. "
+ message_admins(msg)
+ admin_ticket_log(src, msg)
/mob/living/carbon/human/MouseDrop_T(mob/living/target, mob/living/user)
if(pulling == target && grab_state >= GRAB_AGGRESSIVE && stat == CONSCIOUS)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 4ef741745f..5fa64e5ab5 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1198,3 +1198,19 @@
gender = ngender
return TRUE
return FALSE
+
+/mob/living/vv_get_header()
+ . = ..()
+ var/refid = REF(src)
+ . += {"
+ [VV_HREF_TARGETREF_1V(refid, VV_HK_BASIC_EDIT, "[ckey || "no ckey"]", NAMEOF(src, ckey))] / [VV_HREF_TARGETREF_1V(refid, VV_HK_BASIC_EDIT, "[real_name || "no real name"]", NAMEOF(src, real_name))]
+
+ BRUTE:[getBruteLoss()]
+ FIRE:[getFireLoss()]
+ TOXIN:[getToxLoss()]
+ OXY:[getOxyLoss()]
+ CLONE:[getCloneLoss()]
+ BRAIN:[getOrganLoss(ORGAN_SLOT_BRAIN)]
+ STAMINA:[getStaminaLoss()]
+ 