cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-13 08:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/BrokenInhands.dm
-2
View File
@@ -32,7 +32,5 @@
var/F = file("broken_hand_icons.txt")
fdel(F)
to_chat(F, text)
to_chat(world, "Completed and written to [F]")
code/modules/admin/verbs/SDQL2/SDQL_2.dm
-17
View File
@@ -27,7 +27,6 @@
// to_chat(world, query_text)
var/list/query_list = SDQL2_tokenize(query_text)
if(!query_list || query_list.len < 1)
@@ -149,10 +148,8 @@
d.vars[v] = vals[v]
catch(var/exception/e)
to_chat(usr, "<span class='warning'>A runtime error has occured during the execution of your query and your query has been aborted.</span>")
to_chat(usr, "[e]")
/proc/SDQL_parse(list/query_list)
var/datum/SDQL_parser/parser = new()
var/list/querys = list()
@@ -178,7 +175,6 @@
querys_pos++
else //There was an error so don't run anything, and tell the user which query has errored.
to_chat(usr, "<span class='danger'>Parsing error on [querys_pos]\th query. Nothing was executed.</span>")
return list()
query_tree = list()
do_parse = 0
@@ -200,28 +196,22 @@
for(var/item in query_tree)
if(istype(item, /list))
to_chat(usr, "[spaces](")
SDQL_testout(item, indent + 1)
to_chat(usr, "[spaces])")
else
to_chat(usr, "[spaces][item]")
if(!isnum(item) && query_tree[item])
if(istype(query_tree[item], /list))
to_chat(usr, "[spaces] (")
SDQL_testout(query_tree[item], indent + 2)
to_chat(usr, "[spaces] )")
else
to_chat(usr, "[spaces] [query_tree[item]]")
/proc/SDQL_from_objs(list/tree)
if("world" in tree)
return list(world)
@@ -331,7 +321,6 @@
result = (result || val)
else
to_chat(usr, "<span class='danger'>SDQL2: Unknown op [op]</span>")
result = null
else
result = val
@@ -400,12 +389,10 @@
else if(expression[start] == "\[" && start < expression.len)
if(lowertext(copytext(expression[start + 1], 1, 3)) != "0x")
to_chat(usr, "<span class='danger'>Invalid ref syntax: [expression[start + 1]]</span>")
return null
v = locate("\[[expression[start + 1]]\]")
if(!v)
to_chat(usr, "<span class='danger'>Invalid ref: [expression[start + 1]]</span>")
return null
start++
else
@@ -462,7 +449,6 @@
else if(char == "'")
if(word != "")
to_chat(usr, "<span class='danger'>SDQL2: You have an error in your SDQL syntax, unexpected ' in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again.</span>")
return null
word = "'"
@@ -483,7 +469,6 @@
if(i > len)
to_chat(usr, "<span class='danger'>SDQL2: You have an error in your SDQL syntax, unmatched ' in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again.</span>")
return null
query_list += "[word]'"
@@ -492,7 +477,6 @@
else if(char == "\"")
if(word != "")
to_chat(usr, "<span class='danger'>SDQL2: You have an error in your SDQL syntax, unexpected \" in query: \"<font color=gray>[query_text]</font>\" following \"<font color=gray>[word]</font>\". Please check your syntax, and try again.</span>")
return null
word = "\""
@@ -513,7 +497,6 @@
if(i > len)
to_chat(usr, "<span class='danger'>SDQL2: You have an error in your SDQL syntax, unmatched \" in query: \"<font color=gray>[query_text]</font>\". Please check your syntax, and try again.</span>")
return null
query_list += "[word]\""
code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm
-1
View File
@@ -61,7 +61,6 @@
/datum/SDQL_parser/proc/parse_error(error_message)
error = 1
to_chat(usr, "<span class='danger'>SQDL2 Parsing Error: [error_message]</span>")
return query.len + 1
/datum/SDQL_parser/proc/parse()
code/modules/admin/verbs/adminhelp.dm
-6
View File
@@ -10,7 +10,6 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
//handle muting and automuting
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted).</font>")
return
adminhelped = 1 //Determines if they get the message to reply by clicking the name.
@@ -114,22 +113,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
for(var/client/X in mentorholders + modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
to_chat(X, 'sound/effects/adminhelp.ogg')
to_chat(X, msg)
if("Adminhelp")
msg = "<span class='adminhelp'>[selected_type]: </span><span class='boldnotice'>[key_name(src, 1, 1, selected_type)] (<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) ([admin_jump_link(mob, "holder")]) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>) (<A HREF='?_src_=holder;rejectadminhelp=[ref_client]'>REJT</A>) [ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</span> <span class='adminhelp'>[msg]</span>"
for(var/client/X in modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
to_chat(X, 'sound/effects/adminhelp.ogg')
to_chat(X, msg)
//show it to the person adminhelping too
to_chat(src, "<span class='boldnotice'>[selected_type]</b>: [original_msg]</span>")
var/admin_number_present = adminholders.len - admin_number_afk
log_admin("[selected_type]: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
if(admin_number_present <= 0)
code/modules/admin/verbs/adminjump.dm
-3
View File
@@ -20,7 +20,6 @@
var/turf/T = pick_n_take(turfs)
if(!T)
to_chat(src, "Nowhere to jump to!")
return
admin_forcemove(usr, T)
@@ -59,7 +58,6 @@
else
to_chat(A, "This mob is not located in the game world.")
/client/proc/jumptocoord(tx as num, ty as num, tz as num)
set category = "Admin"
set name = "Jump to Coordinate"
@@ -88,7 +86,6 @@
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
if(!selection)
to_chat(src, "No keys found.")
return
var/mob/M = selection:mob
log_admin("[key_name(usr)] jumped to [key_name(M)]")
code/modules/admin/verbs/adminpm.dm
-20
View File
@@ -4,7 +4,6 @@
set name = "Admin PM Mob"
if(!holder)
to_chat(src, "<font color='red'>Error: Admin-PM-Context: Only administrators may use this command.</font>")
return
if( !ismob(M) || !M.client ) return
cmd_admin_pm(M.client,null)
@@ -16,7 +15,6 @@
set name = "Admin PM Name"
if(!holder)
to_chat(src, "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>")
return
var/list/client/targets[0]
for(var/client/T)
@@ -40,7 +38,6 @@
set name = "Admin PM Key"
if(!holder)
to_chat(src, "<font color='red'>Error: Admin-PM-Panel: Only administrators may use this command.</font>")
return
var/list/client/targets[0]
for(var/client/T)
@@ -64,7 +61,6 @@
/client/proc/cmd_admin_pm(whom, msg, type = "PM")
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>")
return
var/client/C
@@ -78,7 +74,6 @@
if(!C)
if(holder)
to_chat(src, "<span class='danger'>Error: Private-Message: Client not found.</span>")
else
adminhelp(msg) //admin we are replying to left. adminhelp instead
return
@@ -87,7 +82,6 @@
//send a warning to admins, but have a delay popup for mods
if(holder.rights & R_ADMIN)
to_chat(src, "\red <b>Simultaneous PMs warning:</b> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]")
else
if(alert("That player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]","Simultaneous PMs warning","Continue","Cancel") == "Cancel")
return*/
@@ -101,7 +95,6 @@
if(!C)
if(holder)
to_chat(src, "<span class='danger'>Error: Admin-PM: Client not found.</span>")
else
adminhelp(msg) //admin we are replying to has vanished, adminhelp instead
return
@@ -133,7 +126,6 @@
else if(!C.holder)
to_chat(src, "<font color='red'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</font>")
return
var/recieve_message = ""
@@ -142,7 +134,6 @@
recieve_message = "<span class='[recieve_span]' size='3'>-- Click the [recieve_pm_type]'s name to reply --</span>\n"
if(C.adminhelped)
to_chat(C, recieve_message)
C.adminhelped = 0
//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
@@ -160,10 +151,8 @@
recieve_message = "<span class='[recieve_span]'>[type] from-<b>[recieve_pm_type][key_name(src, C, C.holder ? 1 : 0, type)]</b>: [msg]</span>"
to_chat(C, recieve_message)
to_chat(src, "<font color='blue'>[send_pm_type][type] to-<b>[key_name(C, src, holder ? 1 : 0, type)]</b>: [msg]</font>")
/*if(holder && !C.holder)
C.last_pm_recieved = world.time
C.ckey_last_pm = ckey*/
@@ -173,7 +162,6 @@
if(C.prefs.sound & SOUND_ADMINHELP)
to_chat(C, 'sound/effects/adminhelp.ogg')
log_admin("PM: [key_name(src)]->[key_name(C)]: [msg]")
//we don't use message_admins here because the sender/receiver might get it too
for(var/client/X in admins)
@@ -185,20 +173,16 @@
if("Mentorhelp")
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))
to_chat(X, "<span class='mentorhelp'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]: [msg]</span>")
if("Adminhelp")
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
to_chat(X, "<span class='adminhelp'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]: [msg]</span>")
else
if(check_rights(R_ADMIN|R_MOD, 0, X.mob))
to_chat(X, "<span class='boldnotice'>[type]: [key_name(src, X, 0, type)]-&gt;[key_name(C, X, 0, type)]: [msg]</span>")
/client/proc/cmd_admin_irc_pm()
if(prefs.muted & MUTE_ADMINHELP)
to_chat(src, "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>")
return
var/msg = input(src,"Message:", "Private message to admins on IRC / 400 character limit") as text|null
@@ -210,20 +194,16 @@
if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations. Probably easier to do this on the bots ends.
to_chat(src, "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting")
to_chat(src, "\blue [msg]")
return
send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]")
to_chat(src, "<font color='blue'>IRC PM to-<b>IRC-Admins</b>: [msg]</font>")
log_admin("PM: [key_name(src)]->IRC: [msg]")
for(var/client/X in admins)
if(X == src)
continue
if(check_rights(R_ADMIN|R_MOD|R_MENTOR, 0, X.mob))
to_chat(X, "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;IRC-Admins:</B> \blue [msg]</font>")
code/modules/admin/verbs/adminsay.dm
-2
View File
@@ -14,7 +14,6 @@
if(R_ADMIN & C.holder.rights)
to_chat(C, "<span class='admin_channel'>ADMIN: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob, "holder")]): <span class='message'>[msg]</span></span>")
feedback_add_details("admin_verb","M") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_mod_say(msg as text)
@@ -38,5 +37,4 @@
if(check_rights(R_ADMIN|R_MOD, 0, C.mob))
to_chat(C, "<span class='[spanclass]'>MOD: <span class='name'>[key_name(usr, 1)]</span> ([admin_jump_link(mob, C.holder)]): <span class='message'>[msg]</span></span>")
feedback_add_details("admin_verb","MS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/antag-ooc.dm
-1
View File
@@ -17,5 +17,4 @@
to_chat(M, "<font color='#960018'><span class='ooc'><span class='prefix'>AOOC:</span> <EM>[display_name]:</EM> <span class='message'>[msg]</span></span></font>")
log_ooc("(ANTAG) [key] : [msg]")
code/modules/admin/verbs/atmosdebug.dm
-11
View File
@@ -4,7 +4,6 @@
set background = 1
if(!src.holder)
to_chat(src, "Only administrators may use this command.")
return
feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -12,27 +11,22 @@
return
to_chat(usr, "Checking for disconnected pipes...")
//all plumbing - yes, some things might get stated twice, doesn't matter.
for (var/obj/machinery/atmospherics/plumbing in world)
if (plumbing.nodealert)
to_chat(usr, "Unconnected [plumbing.name] located at [plumbing.x],[plumbing.y],[plumbing.z] ([get_area(plumbing.loc)])")
//Manifolds
for (var/obj/machinery/atmospherics/pipe/manifold/pipe in world)
if (!pipe.node1 || !pipe.node2 || !pipe.node3)
to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])")
//Pipes
for (var/obj/machinery/atmospherics/pipe/simple/pipe in world)
if (!pipe.node1 || !pipe.node2)
to_chat(usr, "Unconnected [pipe.name] located at [pipe.x],[pipe.y],[pipe.z] ([get_area(pipe.loc)])")
to_chat(usr, "Checking for overlapping pipes...")
next_turf:
for(var/turf/T in world)
for(var/dir in cardinal)
@@ -42,17 +36,14 @@
check++
if(check > 1)
to_chat(usr, "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])")
continue next_turf
to_chat(usr, "Done")
/client/proc/powerdebug()
set category = "Mapping"
set name = "Check Power"
if(!src.holder)
to_chat(src, "Only administrators may use this command.")
return
feedback_add_details("admin_verb","CPOW") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -62,9 +53,7 @@
var/obj/structure/cable/C = PN.cables[1]
to_chat(usr, "Powernet with no nodes! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")
if (!PN.cables || (PN.cables.len < 10))
if(PN.cables && (PN.cables.len > 1))
var/obj/structure/cable/C = PN.cables[1]
to_chat(usr, "Powernet with fewer than 10 cables! (number [PN.number]) - example cable at [C.x], [C.y], [C.z] in area [get_area(C.loc)]")
code/modules/admin/verbs/custom_event.dm
-11
View File
@@ -5,7 +5,6 @@
if(!holder)
to_chat(src, "Only administrators may use this command.")
return
var/input = input(usr, "Enter the description of the custom event. Be descriptive. To cancel the event, make this blank or hit cancel.", "Custom Event", custom_event_msg) as message|null
@@ -21,14 +20,10 @@
custom_event_msg = input
to_chat(world, "<h1 class='alert'>Custom Event</h1>")
to_chat(world, "<h2 class='alert'>A custom event is starting. OOC Info:</h2>")
to_chat(world, "<span class='alert'>[html_encode(custom_event_msg)]</span>")
to_chat(world, "<br>")
// normal verb for players to view info
/client/verb/cmd_view_custom_event()
set category = "OOC"
@@ -36,16 +31,10 @@
if(!custom_event_msg || custom_event_msg == "")
to_chat(src, "There currently is no known custom event taking place.")
to_chat(src, "Keep in mind: it is possible that an admin has not properly set this.")
return
to_chat(src, "<h1 class='alert'>Custom Event</h1>")
to_chat(src, "<h2 class='alert'>A custom event is taking place. OOC Info:</h2>")
to_chat(src, "<span class='alert'>[html_encode(custom_event_msg)]</span>")
to_chat(src, "<br>")
code/modules/admin/verbs/deadsay.dm
-2
View File
@@ -11,12 +11,10 @@
if(prefs.muted & MUTE_DEADCHAT)
to_chat(src, "<span class='warning'>You cannot send DSAY messages (muted).</span>")
return
if(!(prefs.toggles & CHAT_DEAD))
to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
return
if (handle_spam_prevention(msg,MUTE_DEADCHAT))
code/modules/admin/verbs/debug.dm
-32
View File
@@ -73,7 +73,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(targetselected && !hascall(target,procname))
to_chat(usr, "<font color='red'>Error: callproc(): target has no such call [procname].</font>")
return
var/list/lst = get_callproc_args()
@@ -83,7 +82,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(targetselected)
if(!target)
to_chat(usr, "<font color='red'>Error: callproc(): owner of proc no longer exists.</font>")
return
message_admins("[key_name_admin(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
@@ -95,7 +93,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
returnval = call(procname)(arglist(lst)) // Pass the lst as an argument list to the proc
to_chat(usr, "<font color='blue'>[procname] returned: [returnval ? returnval : "null"]</font>")
feedback_add_details("admin_verb","APC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/callproc_datum(var/A as null|area|mob|obj|turf)
@@ -111,7 +108,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!hascall(A,procname))
to_chat(usr, "<span class='warning'>Error: callproc_datum(): target has no such call [procname].</span>")
return
var/list/lst = get_callproc_args()
@@ -120,7 +116,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!A || !IsValidSrc(A))
to_chat(usr, "<span class='warning'>Error: callproc_datum(): owner of proc no longer exists.</span>")
return
message_admins("[key_name_admin(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]")
log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]")
@@ -129,7 +124,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/returnval = call(A,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
to_chat(usr, "<span class='notice'>[procname] returned: [returnval ? returnval : "null"]</span>")
feedback_add_details("admin_verb","DPC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/get_callproc_args()
@@ -513,59 +507,41 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/list/areas_without_camera = areas_all - areas_with_camera
to_chat(world, "<b>AREAS WITHOUT AN APC:</b>")
for(var/areatype in areas_without_APC)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT AN AIR ALARM:</b>")
for(var/areatype in areas_without_air_alarm)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITH TOO MANY APCS:</b>")
for(var/areatype in areas_with_multiple_APCs)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITH TOO MANY AIR ALARMS:</b>")
for(var/areatype in areas_with_multiple_air_alarms)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT A REQUEST CONSOLE:</b>")
for(var/areatype in areas_without_RC)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT ANY LIGHTS:</b>")
for(var/areatype in areas_without_light)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT A LIGHT SWITCH:</b>")
for(var/areatype in areas_without_LS)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT ANY INTERCOMS:</b>")
for(var/areatype in areas_without_intercom)
to_chat(world, "* [areatype]")
to_chat(world, "<b>AREAS WITHOUT ANY CAMERAS:</b>")
for(var/areatype in areas_without_camera)
to_chat(world, "* [areatype]")
/client/proc/cmd_admin_dress(var/mob/living/carbon/human/M in mob_list)
set category = "Event"
set name = "Select equipment"
@@ -1191,30 +1167,22 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
switch(input("Which list?") in list("Players","Admins","Mobs","Living Mobs","Dead Mobs","Silicons","Clients","Respawnable Mobs"))
if("Players")
to_chat(usr, jointext(player_list,","))
if("Admins")
to_chat(usr, jointext(admins,","))
if("Mobs")
to_chat(usr, jointext(mob_list,","))
if("Living Mobs")
to_chat(usr, jointext(living_mob_list,","))
if("Dead Mobs")
to_chat(usr, jointext(dead_mob_list,","))
if("Silicons")
to_chat(usr, jointext(silicon_mob_list,","))
if("Clients")
to_chat(usr, jointext(clients,","))
if("Respawnable Mobs")
to_chat(usr, jointext(respawnable_list,","))
/client/proc/cmd_admin_toggle_block(var/mob/M,var/block)
if(!check_rights(R_SPAWN))
return
code/modules/admin/verbs/diagnostics.dm
-6
View File
@@ -16,10 +16,8 @@
burning = 1
to_chat(usr, "\blue @[target.x],[target.y]: O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]")
for(var/datum/gas/trace_gas in GM.trace_gases)
to_chat(usr, "[trace_gas.type]: [trace_gas.moles]")
message_admins("[key_name_admin(usr)] has checked the air status of [T]")
log_admin("[key_name(usr)] has checked the air status of [T]")
@@ -133,10 +131,8 @@
return
to_chat(usr, "<b>Jobbans active in this round.</b>")
for(var/t in jobban_keylist)
to_chat(usr, "[t]")
message_admins("[key_name_admin(usr)] has printed the jobban log")
log_admin("[key_name(usr)] has printed the jobban log")
@@ -154,11 +150,9 @@
return
to_chat(usr, "<b>Jobbans active in this round.</b>")
for(var/t in jobban_keylist)
if(findtext(t, filter))
to_chat(usr, "[t]")
message_admins("[key_name_admin(usr)] has searched the jobban log for [filter]")
log_admin("[key_name(usr)] has searched the jobban log for [filter]")
code/modules/admin/verbs/dice.dm
-2
View File
@@ -14,11 +14,9 @@
if(alert("Do you want to inform the world about your game?",,"Yes", "No") == "Yes")
to_chat(world, "<h2 style=\"color:#A50400\">The dice have been rolled by Gods!</h2>")
var/result = roll(dice)
if(alert("Do you want to inform the world about the result?",,"Yes", "No") == "Yes")
to_chat(world, "<h2 style=\"color:#A50400\">Gods rolled [dice], result is [result]</h2>")
message_admins("[key_name_admin(src)] rolled dice [dice], result is [result]", 1)
code/modules/admin/verbs/freeze.dm
-7
View File
@@ -11,7 +11,6 @@ var/global/list/frozen_mob_list = list()
set name = "Freeze"
if(!holder)
to_chat(src, "<font color='red'>Error: Freeze: Only administrators may use this command.</font>")
return
if(!istype(M)) return
if(!check_rights(R_ADMIN)) return
@@ -28,7 +27,6 @@ var/global/list/frozen_mob_list = list()
/mob/living/proc/admin_Freeze(var/client/admin)
if(istype(admin))
to_chat(src, "<b><font color= red>You have been frozen by [key_name(admin)]</b></font>")
message_admins("<span class='notice'>[key_name_admin(admin)]</span> froze [key_name_admin(src)]")
log_admin("[key_name(admin)] froze [key_name(src)]")
@@ -45,7 +43,6 @@ var/global/list/frozen_mob_list = list()
/mob/living/proc/admin_unFreeze(var/client/admin)
if(istype(admin))
to_chat(src, "<b><font color= red>You have been unfrozen by [key_name(admin)]</b></font>")
message_admins("\blue [key_name_admin(admin)] unfroze [key_name_admin(src)]")
log_admin("[key_name(admin)] unfroze [key_name(src)]")
@@ -89,12 +86,10 @@ var/global/list/frozen_mob_list = list()
set name = "Freeze Mech"
if(!holder)
to_chat(src, "Only administrators may use this command.")
return
var/obj/mecha/M = O
if(!istype(M,/obj/mecha))
to_chat(src, "\red <b>This can only be used on Mechs!</b>")
return
else
if(usr)
@@ -107,7 +102,6 @@ var/global/list/frozen_mob_list = list()
if(M.occupant)
M.removeVerb(/obj/mecha/verb/eject)
to_chat(M.occupant, "<b><font color= red>You have been frozen by <a href='?priv_msg=\ref[usr.client]'>[key]</a></b></font>")
message_admins("\blue [key_name_admin(usr)] froze [key_name(M.occupant)] in a [M.name]")
log_admin("[key_name(usr)] froze [key_name(M.occupant)] in a [M.name]")
else
@@ -119,7 +113,6 @@ var/global/list/frozen_mob_list = list()
if(M.occupant)
M.addVerb(/obj/mecha/verb/eject)
to_chat(M.occupant, "<b><font color= red>You have been unfrozen by <a href='?priv_msg=\ref[usr.client]'>[key]</a></b></font>")
message_admins("\blue [key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]")
log_admin("[key_name(usr)] unfroze [M.occupant.name]/[M.occupant.ckey] in a [M.name]")
else
code/modules/admin/verbs/getlogs.dm
-6
View File
@@ -25,18 +25,15 @@
if(!src.holder)
to_chat(src, "<font color='red'>Only Admins may use this command.</font>")
return
var/client/target = input(src,"Choose somebody to grant access to the server's runtime logs (permissions expire at the end of each round):","Grant Permissions",null) as null|anything in clients
if(!istype(target,/client))
to_chat(src, "<font color='red'>Error: giveruntimelog(): Client not found.</font>")
return
target.verbs |= /client/proc/getruntimelog
to_chat(target, "<font color='red'>You have been granted access to runtime logs. Please use them responsibly or risk being banned.</font>")
return
@@ -58,7 +55,6 @@
src << ftp(file(path))
to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.")
return
@@ -80,7 +76,6 @@
src << ftp(file(path))
to_chat(src, "Attempting to send file, this may take a fair few minutes if the file is very large.")
return
@@ -114,7 +109,6 @@
else
to_chat(src, "<font color='red'>Error: view_atk_log(): File not found/Invalid path([path]).</font>")
return
usr << run(file(path))
code/modules/admin/verbs/honksquad.dm
-5
View File
@@ -6,15 +6,12 @@ var/global/sent_honksquad = 0
/client/proc/honksquad()
if(!ticker)
to_chat(usr, "<font color='red'>The game hasn't started yet!</font>")
return
if(world.time < 6000)
to_chat(usr, "<font color='red'>There are [(6000-world.time)/10] seconds remaining before it may be called.</font>")
return
if(sent_honksquad == 1)
to_chat(usr, "<font color='red'>Clown Planet has already dispatched a HONKsquad.</font>")
return
if(alert("Do you want to send in the HONKsquad? Once enabled, this is irreversible.",,"Yes","No")!="Yes")
return
@@ -29,7 +26,6 @@ var/global/sent_honksquad = 0
if(sent_honksquad)
to_chat(usr, "Looks like someone beat you to it. HONK.")
return
sent_honksquad = 1
@@ -70,7 +66,6 @@ var/global/sent_honksquad = 0
to_chat(new_honksquad, "\blue You are a HONKsquad. [!honk_leader_selected?"commando":"<B>LEADER</B>"] in the service of Clown Planet. You are called in cases of exteme low levels of HONK. You are NOT authorized to kill. \nYour current mission is: \red<B>[input]</B>")
honksquad_number--
code/modules/admin/verbs/mapping.dm
-2
View File
@@ -189,7 +189,6 @@ var/list/admin_verbs_show_debug_verbs = list(
atom_list += A
to_chat(world, "There are [count] objects of type [type_path] on z-level [num_level].")
feedback_add_details("admin_verb","mOBJZ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/count_objects_all()
@@ -211,5 +210,4 @@ var/list/admin_verbs_show_debug_verbs = list(
count++
to_chat(world, "There are [count] objects of type [type_path] in the game world.")
feedback_add_details("admin_verb","mOBJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
code/modules/admin/verbs/massmodvar.dm
-12
View File
@@ -31,7 +31,6 @@
for(var/p in forbidden_varedit_object_types)
if( istype(O,p) )
to_chat(usr, "<span class='danger'>It is forbidden to edit this object's variables.</span>")
return
var/list/names = list()
@@ -58,51 +57,41 @@
if(isnull(var_value))
to_chat(usr, "Unable to determine variable type.")
else if(isnum(var_value))
to_chat(usr, "Variable appears to be <b>NUM</b>.")
default = "num"
dir = 1
else if(istext(var_value))
to_chat(usr, "Variable appears to be <b>TEXT</b>.")
default = "text"
else if(isloc(var_value))
to_chat(usr, "Variable appears to be <b>REFERENCE</b>.")
default = "reference"
else if(isicon(var_value))
to_chat(usr, "Variable appears to be <b>ICON</b>.")
var_value = "\icon[var_value]"
default = "icon"
else if(istype(var_value,/atom) || istype(var_value,/datum))
to_chat(usr, "Variable appears to be <b>TYPE</b>.")
default = "type"
else if(istype(var_value,/list))
to_chat(usr, "Variable appears to be <b>LIST</b>.")
default = "list"
else if(istype(var_value,/client))
to_chat(usr, "Variable appears to be <b>CLIENT</b>.")
default = "cancel"
else
to_chat(usr, "Variable appears to be <b>FILE</b>.")
default = "file"
to_chat(usr, "Variable contains: [var_value]")
if(dir)
switch(var_value)
if(1)
@@ -126,7 +115,6 @@
if(dir)
to_chat(usr, "If a direction, direction is: [dir]")
var/class = input("What kind of variable?","Variable Type",default) as null|anything in list("text",
"num","type","icon","file","edit referenced object","restore to default")
code/modules/admin/verbs/modifyvariables.dm
-26
View File
@@ -19,7 +19,6 @@ var/list/forbidden_varedit_object_types = list(
if (ticker == null)
to_chat(src, "Game hasn't started yet.")
else
src.modify_variables(ticker)
feedback_add_details("admin_verb","ETV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -56,7 +55,6 @@ var/list/forbidden_varedit_object_types = list(
if(!var_value)
to_chat(src, "<span class='warning'>[type_text] is not a valid path!</span>")
if("reference")
var_value = input("Select reference:","Reference") as null|mob|obj|turf|area in world
@@ -110,7 +108,6 @@ var/list/forbidden_varedit_object_types = list(
if(!var_value)
to_chat(src, "<span class='warning'>[type_text] is not a valid path!</span>")
if("reference")
var_value = input("Select reference:","Reference") as mob|obj|turf|area in world
@@ -140,7 +137,6 @@ var/list/forbidden_varedit_object_types = list(
if(!istype(L,/list))
to_chat(src, "Not a List.")
if(L.len > 1000)
var/confirm = alert(src, "The list you're trying to edit is very long, continuing may crash the server.", "Warning", "Continue", "Abort")
if(confirm != "Continue")
@@ -155,7 +151,6 @@ var/list/forbidden_varedit_object_types = list(
assoc = 1 //This is pretty weak test but i can't think of anything else
to_chat(usr, "List appears to be associative.")
var/list/names = null
if(!assoc)
names = sortList(L)
@@ -188,14 +183,12 @@ var/list/forbidden_varedit_object_types = list(
default = variable_to_type(variable)
to_chat(usr, "Variable contains: [variable]")
if(default == "num")
dir = dir2text(variable)
if(dir)
to_chat(usr, "If a direction, direction is: [dir]")
var/class = "text"
var/list/allowed_types = list("text", "num","type", "type from text", "reference","mob reference", "icon","file","list","edit referenced object","restore to default","DELETE FROM LIST")
if(src.holder && src.holder.marked_datum)
@@ -284,12 +277,10 @@ var/list/forbidden_varedit_object_types = list(
for(var/p in forbidden_varedit_object_types)
if( istype(O,p) )
to_chat(usr, "<span class='warning'>It is forbidden to edit this object's variables.</span>")
return
if(istype(O, /client) && (param_var_name == "ckey" || param_var_name == "key"))
to_chat(usr, "<span class='warning'>You cannot edit ckeys on client objects.</span>")
return
var/class
@@ -299,7 +290,6 @@ var/list/forbidden_varedit_object_types = list(
if(param_var_name)
if(!param_var_name in O.vars)
to_chat(src, "A variable with this name ([param_var_name]) doesn't exist in this atom ([O])")
return
if(param_var_name == "holder" || (param_var_name in locked))
@@ -341,13 +331,11 @@ var/list/forbidden_varedit_object_types = list(
var_value = "\icon[var_value]"
to_chat(usr, "Variable contains: [var_value]")
if(dir)
dir = dir2text(var_value)
if(dir)
to_chat(usr, "If a direction, direction is: [dir]")
var/list/allowed_types = list("text", "num","type","reference","mob reference", "path", "matrix", "icon","file","list","edit referenced object","restore to default")
if(src.holder && src.holder.marked_datum)
allowed_types += "marked datum ([holder.marked_datum.type])"
@@ -415,7 +403,6 @@ var/list/forbidden_varedit_object_types = list(
var/var_new = text2path(path_text)
if(!var_new && path_text != null) // So aborting doesn't bother the VVer
to_chat(usr, "<span class='warning'>[path_text] does not appear to be a valid path.</span>")
return
O.vars[variable] = var_new
@@ -424,7 +411,6 @@ var/list/forbidden_varedit_object_types = list(
var/var_new = text2matrix(matrix_text)
if(!var_new && matrix_text != null)
to_chat(usr, "<span class='warning'>[matrix_text] is not a valid matrix string.</span>")
return
O.vars[variable] = var_new
var_as_text = "matrix([matrix_text])"
@@ -464,62 +450,50 @@ var/list/forbidden_varedit_object_types = list(
var/class
if(isnull(variable))
to_chat(usr, "Unable to determine variable type.")
class = null
else if(isnum(variable))
to_chat(usr, "Variable appears to be <b>NUM</b>.")
class = "num"
else if(istext(variable))
to_chat(usr, "Variable appears to be <b>TEXT</b>.")
class = "text"
else if(isloc(variable))
to_chat(usr, "Variable appears to be <b>REFERENCE</b>.")
class = "reference"
else if(isicon(variable))
to_chat(usr, "Variable appears to be <b>ICON</b>.")
variable = "\icon[variable]"
class = "icon"
else if(istype(variable,/matrix))
to_chat(usr, "Variable appears to be <b>MATRIX</b>")
class = "matrix"
else if(istype(variable,/atom) || istype(variable,/datum))
to_chat(usr, "Variable appears to be <b>TYPE</b>.")
class = "type"
else if(istype(variable,/list))
to_chat(usr, "Variable appears to be <b>LIST</b>.")
class = "list"
else if(istype(variable,/client))
to_chat(usr, "Variable appears to be <b>CLIENT</b>.")
class = "cancel"
else if(ispath(variable))
to_chat(usr, "Variable appears to be <b>PATH</b>.")
class = "path"
else if(isfile(variable))
to_chat(usr, "Variable appears to be <b>FILE</b>.")
class = "file"
else
to_chat(usr, "Variable type is <b>UNKNOWN</b>.")
class = null
return class
code/modules/admin/verbs/one_click_antag.dm
-5
View File
@@ -379,7 +379,6 @@ client/proc/one_click_antag()
to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: \red<B> [input]</B>")
numagents--
if(numagents >= 6)
return 0
@@ -484,10 +483,8 @@ client/proc/one_click_antag()
new_vox.key = theghost.key
to_chat(new_vox, "\blue You are a Vox Primalis, fresh out of the Shoal. Your ship has arrived at the Tau Ceti system hosting the NSV Exodus... or was it the Luna? NSS? Utopia? Nobody is really sure, but everyong is raring to start pillaging! Your current goal is: \red<B> [input]</B>")
to_chat(new_vox, "\red Don't forget to turn on your nitrogen internals!")
raiders--
if(raiders > max_raiders)
return 0
@@ -617,7 +614,6 @@ client/proc/one_click_antag()
teamOneMembers--
to_chat(newMember, "You are a member of the <font color = 'green'><b>GREEN</b></font> Thunderdome team! Gear up and help your team destroy the red team!")
if(L.name == "tdome2")
if(teamTwoMembers<=0)
break
@@ -639,7 +635,6 @@ client/proc/one_click_antag()
newMember.key = theghost.key
teamTwoMembers--
to_chat(newMember, "You are a member of the <font color = 'red'><b>RED</b></font> Thunderdome team! Gear up and help your team destroy the green team!")
else
return 0
return 1
code/modules/admin/verbs/onlyone.dm
-6
View File
@@ -22,11 +22,9 @@
H.mind.objectives += hijack_objective
to_chat(H, "<B>You are a Highlander. Kill all other Highlanders. There can be only one.</B>")
var/obj_count = 1
for(var/datum/objective/OBJ in H.mind.objectives)
to_chat(H, "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]")
obj_count++
for (var/obj/item/I in H)
@@ -59,7 +57,6 @@
nologevent = 1
to_chat(world, sound('sound/music/THUNDERDOME.ogg'))
/client/proc/only_me()
if(!ticker)
alert("The game hasn't started yet!")
@@ -77,11 +74,9 @@
H.mind.objectives += hijack_objective
to_chat(H, "<B>You are the multiverse summoner. Activate your blade to summon copies of yourself from another universe to fight by your side.</B>")
var/obj_count = 1
for(var/datum/objective/OBJ in H.mind.objectives)
to_chat(H, "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]")
obj_count++
var/obj/item/slot_item_ID = H.get_item_by_slot(slot_wear_id)
@@ -107,4 +102,3 @@
log_admin("[key_name(usr)] used there can be only me.")
nologevent = 1
to_chat(world, sound('sound/music/THUNDERDOME.ogg'))
code/modules/admin/verbs/onlyoneteam.dm
-4
View File
@@ -23,7 +23,6 @@
to_chat(H, "<B>You are part of the [station_name()] dodgeball tournament. Throw dodgeballs at crewmembers wearing a different color than you. OOC: Use THROW on an EMPTY-HAND to catch thrown dodgeballs.</B>")
H.equip_to_slot_or_del(new /obj/item/device/radio/headset/heads/captain(H), slot_l_ear)
H.equip_to_slot_or_del(new /obj/item/weapon/beach_ball/dodgeball(H), slot_r_hand)
H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes)
@@ -77,15 +76,12 @@
var/mob/A = H.LAssailant
if((H in team_alpha) && (A in team_alpha))
to_chat(A, "<span class='warning'>He's on your team!</span>")
return
else if((H in team_bravo) && (A in team_bravo))
to_chat(A, "<span class='warning'>He's on your team!</span>")
return
else if(!A in team_alpha && !A in team_bravo)
to_chat(A, "<span class='warning'>You're not part of the dodgeball game, sorry!</span>")
return
else
playsound(src, 'sound/items/dodgeball.ogg', 50, 1)
code/modules/admin/verbs/playsound.dm
-6
View File
@@ -19,7 +19,6 @@ var/list/sounds_cache = list()
if(M.client.prefs.sound & SOUND_MIDI)
to_chat(M, uploaded_sound)
feedback_add_details("admin_verb","PGS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -89,11 +88,9 @@ var/list/sounds_cache = list()
if(M.client.midis)
to_chat(M, 'cubanpetetime.ogg')
for(var/mob/living/carbon/human/CP in world)
if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")
to_chat(CP, "Your body can't contain the rhumba beat")
CP.gib()
@@ -108,7 +105,6 @@ var/list/sounds_cache = list()
to_chat(M, 'bananaphone.ogg')
client/proc/space_asshole()
set category = "Event"
set name = "Space Asshole"
@@ -120,7 +116,6 @@ client/proc/space_asshole()
to_chat(M, 'sound/music/space_asshole.ogg')
client/proc/honk_theme()
set category = "Event"
set name = "Honk"
@@ -130,4 +125,3 @@ client/proc/honk_theme()
if(M.client)
if(M.client.midis)
to_chat(M, 'honk_theme.ogg')*/
code/modules/admin/verbs/possess.dm
-1
View File
@@ -5,7 +5,6 @@
if(istype(O,/obj/singularity))
if(config.forbid_singulo_possession)
to_chat(usr, "It is forbidden to possess singularities.")
return
var/turf/T = get_turf(O)
code/modules/admin/verbs/pray.dm
-7
View File
@@ -8,7 +8,6 @@
if(usr.client)
if(usr.client.prefs.muted & MUTE_PRAY)
to_chat(usr, "\red You cannot pray (muted).")
return
if(src.client.handle_spam_prevention(msg,MUTE_PRAY))
return
@@ -20,10 +19,8 @@
if(check_rights(R_EVENT,0,X.mob))
to_chat(X, msg)
to_chat(usr, "Your prayers have been received by the gods.")
feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//log_admin("HELP: [key_name(src)]: [msg]")
@@ -35,7 +32,6 @@
if(R_EVENT & X.holder.rights)
to_chat(X, msg)
/proc/Syndicate_announce(var/text , var/mob/Sender)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color='#DC143C'>SYNDICATE: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
@@ -44,7 +40,6 @@
if(check_rights(R_EVENT,0,X.mob))
to_chat(X, msg)
/proc/HONK_announce(var/text , var/mob/Sender)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color=pink>HONK: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;HONKReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
@@ -53,7 +48,6 @@
if(R_EVENT & X.holder.rights)
to_chat(X, msg)
/proc/ERT_Announce(var/text , var/mob/Sender)
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
msg = "\blue <b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
@@ -62,7 +56,6 @@
if(check_rights(R_EVENT,0,X.mob))
to_chat(X, msg)
/proc/Nuke_request(text , mob/Sender)
var/nuke_code = get_nuke_code()
var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
code/modules/admin/verbs/randomverbs.dm
-40
View File
@@ -40,7 +40,6 @@
prisoner.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(prisoner), slot_shoes)
spawn(50)
to_chat(M, "\red You have been sent to the prison station!")
log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
feedback_add_details("admin_verb","PRISON") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -64,7 +63,6 @@
if(usr.client.holder)
to_chat(M, "\bold You hear a voice in your head... \italic [msg]")
log_admin("SubtlePM: [key_name(usr)] -> [key_name(M)] : [msg]")
message_admins("\blue \bold SubtleMessage: [key_name_admin(usr)] -> [key_name_admin(M)] : [msg]", 1)
feedback_add_details("admin_verb","SMS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -95,14 +93,12 @@
if(missing_ages)
to_chat(src, "Some accounts did not have proper ages set in their clients. This function requires database to be present")
if(msg != "")
src << browse(msg, "window=Player_age_check")
else
to_chat(src, "No matches for that age range found.")
/client/proc/cmd_admin_world_narrate() // Allows administrators to fluff events a little easier -- TLE
set category = "Event"
set name = "Global Narrate"
@@ -115,7 +111,6 @@
if (!msg)
return
to_chat(world, "[msg]")
log_admin("GlobalNarrate: [key_name(usr)] : [msg]")
message_admins("\blue \bold GlobalNarrate: [key_name_admin(usr)]: [msg]<BR>", 1)
feedback_add_details("admin_verb","GLN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -139,7 +134,6 @@
return
to_chat(M, msg)
log_admin("DirectNarrate: [key_name(usr)] to ([key_name(M)]): [msg]")
message_admins("\blue \bold DirectNarrate: [key_name_admin(usr)] to ([key_name_admin(M)]): [msg]<BR>", 1)
feedback_add_details("admin_verb","DIRN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -154,7 +148,6 @@
M.status_flags ^= GODMODE
to_chat(usr, "\blue Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]")
log_admin("[key_name(usr)] has toggled [key_name(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]")
message_admins("[key_name_admin(usr)] has toggled [key_name_admin(M)]'s nodamage to [(M.status_flags & GODMODE) ? "On" : "Off"]", 1)
feedback_add_details("admin_verb","GOD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -169,11 +162,9 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
return
if(!check_rights(R_ADMIN|R_MOD))
to_chat(usr, "<font color='red'>Error: cmd_admin_mute: You don't have permission to do this.</font>")
return
if(!M.client)
to_chat(usr, "<font color='red'>Error: cmd_admin_mute: This mob doesn't have a client tied to it.</font>")
if(!M.client)
return
@@ -195,7 +186,6 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
log_admin("SPAM AUTOMUTE: [muteunmute] [key_name(M)] from [mute_string]")
message_admins("SPAM AUTOMUTE: [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
to_chat(M, "You have been [muteunmute] from [mute_string] by the SPAM AUTOMUTE system. Contact an admin.")
feedback_add_details("admin_verb","AUTOMUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -209,7 +199,6 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
log_admin("[key_name(usr)] has [muteunmute] [key_name(M)] from [mute_string]")
message_admins("[key_name_admin(usr)] has [muteunmute] [key_name_admin(M)] from [mute_string].", 1)
to_chat(M, "You have been [muteunmute] from [mute_string].")
feedback_add_details("admin_verb","MUTE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_add_random_ai_law()
@@ -247,10 +236,8 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
g.antagHUD = 0 // Disable it on those that have it enabled
g.has_enabled_antagHUD = 2 // We'll allow them to respawn
to_chat(g, "\red <B>The Administrator has disabled AntagHUD </B>")
config.antag_hud_allowed = 0
to_chat(src, "\red <B>AntagHUD usage has been disabled</B>")
action = "disabled"
else
for(var/mob/dead/observer/g in get_ghosts())
@@ -258,13 +245,11 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
g.verbs += /mob/dead/observer/verb/toggle_antagHUD
to_chat(g, "\blue <B>The Administrator has enabled AntagHUD </B>")// Notify all observers they can now use AntagHUD
config.antag_hud_allowed = 1
action = "enabled"
to_chat(src, "\blue <B>AntagHUD usage has been enabled</B>")
log_admin("[key_name(usr)] has [action] antagHUD usage for observers")
message_admins("Admin [key_name_admin(usr)] has [action] antagHUD usage for observers", 1)
@@ -280,24 +265,19 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
if(config.antag_hud_restricted)
for(var/mob/dead/observer/g in get_ghosts())
to_chat(g, "\blue <B>The administrator has lifted restrictions on joining the round if you use AntagHUD</B>")
action = "lifted restrictions"
config.antag_hud_restricted = 0
to_chat(src, "\blue <B>AntagHUD restrictions have been lifted</B>")
else
for(var/mob/dead/observer/g in get_ghosts())
to_chat(g, "\red <B>The administrator has placed restrictions on joining the round if you use AntagHUD</B>")
to_chat(g, "\red <B>Your AntagHUD has been disabled, you may choose to re-enabled it but will be under restrictions </B>")
g.antagHUD = 0
g.has_enabled_antagHUD = 0
action = "placed restrictions"
config.antag_hud_restricted = 1
to_chat(src, "\red <B>AntagHUD restrictions have been enabled</B>")
log_admin("[key_name(usr)] has [action] on joining the round if they use AntagHUD")
message_admins("Admin [key_name_admin(usr)] has [action] on joining the round if they use AntagHUD", 1)
@@ -326,7 +306,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!G_found)//If a ghost was not found.
to_chat(usr, "<font color='red'>There is no active key like that in the game or the person is not currently a ghost.</font>")
return
if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something
@@ -351,7 +330,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use
new_xeno.key = G_found.key
to_chat(new_xeno, "You have been fully respawned. Enjoy the game.")
message_admins("\blue [key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno.", 1)
return //all done. The ghost is auto-deleted
@@ -458,7 +436,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
to_chat(new_character, "You have been fully respawned. Enjoy the game.")
feedback_add_details("admin_verb","RSPCH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return new_character
@@ -477,7 +454,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in candidates
else
to_chat(usr, "<font color='red'>Error: create_xeno(): no suitable candidates.</font>")
if(!istext(ckey)) return 0
var/alien_caste = input(usr, "Please choose which caste to spawn.","Pick a caste",null) as null|anything in list("Queen","Hunter","Sentinel","Drone","Larva")
@@ -510,7 +486,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!any)
if(notify)
to_chat(src, "There doesn't appear to be any ghosts for you to select.")
return
for(var/mob/M in mobs)
@@ -586,7 +561,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("No")
to_chat(world, "\red [from] available at all communications consoles.")
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
@@ -607,7 +581,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("No")
to_chat(world, "\red New Nanotrasen Update available at all communication consoles.")
for (var/obj/machinery/computer/communications/C in machines)
if(! (C.stat & (BROKEN|NOPOWER) ) )
var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( C.loc )
@@ -618,7 +591,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
C.messagetext.Add(P.info)
// to_chat(world, sound('sound/AI/commandreport.ogg'))
log_admin("[key_name(src)] has created a communications report: [input]")
message_admins("[key_name_admin(src)] has created a communications report", 1)
feedback_add_details("admin_verb","CCR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -651,7 +623,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(job_master)
for(var/datum/job/job in job_master.occupations)
to_chat(src, "[job.title]: [job.total_positions]")
feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in view())
@@ -758,7 +729,6 @@ Traitors and the like can also be revived with the previous role mostly intact.
var/list/L = M.get_contents()
for(var/t in L)
to_chat(usr, "[t]")
feedback_add_details("admin_verb","CC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/toggle_view_range()
@@ -841,10 +811,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
to_chat(usr, text("\red <b>Attack Log for []</b>", mob))
for(var/t in M.attack_log)
to_chat(usr, t)
feedback_add_details("admin_verb","ATTL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -858,14 +826,12 @@ Traitors and the like can also be revived with the previous role mostly intact.
if (ticker && ticker.mode)
to_chat(usr, "Nope you can't do this, the game's already started. This only works before rounds!")
return
if(ticker.random_players)
ticker.random_players = 0
message_admins("Admin [key_name_admin(usr)] has disabled \"Everyone is Special\" mode.", 1)
to_chat(usr, "Disabled.")
return
@@ -879,10 +845,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(notifyplayers == "Yes")
to_chat(world, "\blue <b>Admin [usr.key] has forced the players to have completely random identities!")
to_chat(usr, "<i>Remember: you can always disable the randomness by using the verb again, assuming the round hasn't started yet</i>.")
ticker.random_players = 1
feedback_add_details("admin_verb","MER") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -897,12 +861,10 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!config.allow_random_events)
config.allow_random_events = 1
to_chat(usr, "Random events enabled")
message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1)
else
config.allow_random_events = 0
to_chat(usr, "Random events disabled")
message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -917,13 +879,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(ticker.mode.ert_disabled)
ticker.mode.ert_disabled = 0
to_chat(usr, "\blue ERT has been <b>Enabled</b>.")
log_admin("Admin [key_name(src)] has enabled ERT calling.")
message_admins("Admin [key_name_admin(usr)] has enabled ERT calling.", 1)
else
ticker.mode.ert_disabled = 1
to_chat(usr, "\red ERT has been <b>Disabled</b>.")
log_admin("Admin [key_name(src)] has disabled ERT calling.")
message_admins("Admin [key_name_admin(usr)] has disabled ERT calling.", 1)
code/modules/admin/verbs/striketeam.dm
-4
View File
@@ -6,11 +6,9 @@ var/global/sent_strike_team = 0
/client/proc/strike_team()
if(!ticker)
to_chat(usr, "<font color='red'>The game hasn't started yet!</font>")
return
if(sent_strike_team == 1)
to_chat(usr, "<font color='red'>CentComm is already sending a team.</font>")
return
if(alert("Do you want to send in the CentComm death squad? Once enabled, this is irreversible.",,"Yes","No")!="Yes")
return
@@ -25,7 +23,6 @@ var/global/sent_strike_team = 0
if(sent_strike_team)
to_chat(usr, "Looks like someone beat you to it.")
return
sent_strike_team = 1
@@ -76,7 +73,6 @@ var/global/sent_strike_team = 0
to_chat(new_commando, "\blue You are a Special Ops. [!leader_selected?"commando":"<B>LEADER</B>"] in the service of Central Command. Check the table ahead for detailed instructions.\nYour current mission is: \red<B>[input]</B>")
commando_number--
//Spawns the rest of the commando gear.
code/modules/admin/verbs/striketeam_syndicate.dm
-3
View File
@@ -8,7 +8,6 @@ var/global/sent_syndicate_strike_team = 0
set desc = "Spawns a squad of commandos in the Syndicate Mothership if you want to run an admin event."
if(!src.holder)
to_chat(src, "Only administrators may use this command.")
return
if(!ticker)
alert("The game hasn't started yet!")
@@ -29,7 +28,6 @@ var/global/sent_syndicate_strike_team = 0
if(sent_syndicate_strike_team)
to_chat(src, "Looks like someone beat you to it.")
return
sent_syndicate_strike_team = 1
@@ -82,7 +80,6 @@ var/global/sent_syndicate_strike_team = 0
to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: \red<B>[input]</B>")
syndicate_commando_number--
//Spawns the rest of the commando gear.
code/modules/admin/verbs/ticklag.dm
-1
View File
@@ -22,4 +22,3 @@
to_chat(src, "\red Error: ticklag(): Invalid world.ticklag value. No changes made.")
code/modules/admin/verbs/tripAI.dm
-4
View File
@@ -4,23 +4,19 @@
if(ticker.current_state > GAME_STATE_PREGAME)
to_chat(usr, "This option is currently only usable during pregame. This may change at a later date.")
return
if(job_master && ticker)
var/datum/job/job = job_master.GetJob("AI")
if(!job)
to_chat(usr, "Unable to locate the AI job")
return
if(ticker.triai)
ticker.triai = 0
to_chat(usr, "Only one AI will be spawned at round start.")
message_admins("\blue [key_name_admin(usr)] has toggled off triple AIs at round start.", 1)
else
ticker.triai = 1
to_chat(usr, "There will be an AI Triumvirate at round start.")
message_admins("\blue [key_name_admin(usr)] has toggled on triple AIs at round start.", 1)
return