cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stage only files without broken filediff

Browse Source
This commit is contained in:
Rykka
2019-10-28 15:39:32 -06:00
parent 59fa7c2899
commit 5219c1f97f
71 changed files with 416 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/admin/ToRban.dm
View File

@@ -72,16 +72,16 @@
var/choice = input(src,"Please select an IP address to remove from the ToR banlist:","Remove ToR ban",null) as null|anything in F.dir
if(choice)
F.dir.Remove(choice)
src << "<b>Address removed</b>"
to_chat(src, "<b>Address removed</b>")
if("remove all")
src << "<b>[TORFILE] was [fdel(TORFILE)?"":"not "]removed.</b>"
to_chat(src, "<b>[TORFILE] was [fdel(TORFILE)?"":"not "]removed.</b>")
if("find")
var/input = input(src,"Please input an IP address to search for:","Find ToR ban",null) as null|text
if(input)
if(ToRban_isbanned(input))
src << "<font color='green'><b>Address is a known ToR address</b></font>"
to_chat(src, "<font color='green'><b>Address is a known ToR address</b></font>")
else
src << "<font color='red'><b>Address is not a known ToR address</b></font>"
to_chat(src, "<font color='red'><b>Address is not a known ToR address</b></font>")
return
#undef TORFILE

2
code/modules/admin/admin.dm
View File

@@ -1305,7 +1305,7 @@ var/datum/announcement/minor/admin_min_announcer = new
set desc = "Should fix any mob sprite update errors."
if (!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(istype(H))

8
code/modules/admin/admin_report.dm
View File

@@ -149,7 +149,8 @@ client/proc/mark_report_done(ID as num)
for(var/datum/admin_report/N in reports)
if(N.ID == ID)
found = N
if(!found) src << "<b>* An error occured, sorry.</b>"
if(!found)
to_chat(src, "<b>* An error occured, sorry.</b>")
found.done = 1
@@ -158,7 +159,7 @@ client/proc/mark_report_done(ID as num)
client/proc/edit_report(ID as num)
if(!src.holder || src.holder.level < 0)
src << "<b>You tried to modify the news, but you're not an admin!</b>"
to_chat(src, "<b>You tried to modify the news, but you're not an admin!</b>")
return
var/savefile/Reports = new("data/reports.sav")
@@ -170,7 +171,8 @@ client/proc/edit_report(ID as num)
for(var/datum/admin_report/N in reports)
if(N.ID == ID)
found = N
if(!found) src << "<b>* An error occured, sorry.</b>"
if(!found)
to_chat(src, "<b>* An error occured, sorry.</b>")
var/body = input(src.mob, "Enter a body for the news", "Body") as null|message
if(!body) return

26
code/modules/admin/admin_verbs.dm
View File

@@ -451,7 +451,7 @@ var/list/admin_verbs_event_manager = list(
verbs.Remove(/client/proc/hide_most_verbs, admin_verbs_hideable)
verbs += /client/proc/show_verbs
src << "<span class='interface'>Most of your adminverbs have been hidden.</span>"
to_chat(src, "<span class='interface'>Most of your adminverbs have been hidden.</span>")
feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -462,7 +462,7 @@ var/list/admin_verbs_event_manager = list(
remove_admin_verbs()
verbs += /client/proc/show_verbs
src << "<span class='interface'>Almost all of your adminverbs have been hidden.</span>"
to_chat(src, "<span class='interface'>Almost all of your adminverbs have been hidden.</span>")
feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return
@@ -473,7 +473,7 @@ var/list/admin_verbs_event_manager = list(
verbs -= /client/proc/show_verbs
add_admin_verbs()
src << "<span class='interface'>All of your adminverbs are now visible.</span>"
to_chat(src, "<span class='interface'>All of your adminverbs are now visible.</span>")
feedback_add_details("admin_verb","TAVVS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -493,7 +493,7 @@ var/list/admin_verbs_event_manager = list(
feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
else if(istype(mob,/mob/new_player))
src << "<font color='red'>Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.</font>"
to_chat(src, "<font color='red'>Error: Aghost: Can't admin-ghost whilst in the lobby. Join or Observe first.</font>")
else
//ghostize
var/mob/body = mob
@@ -655,7 +655,7 @@ var/list/admin_verbs_event_manager = list(
else D = preferences_datums[warned_ckey]
if(!D)
src << "<font color='red'>Error: warn(): No such ckey found.</font>"
to_chat(src, "<font color='red'>Error: warn(): No such ckey found.</font>")
return
if(++D.warns >= MAX_WARNS) //uh ohhhh...you'reee iiiiin trouuuubble O:)
@@ -818,7 +818,7 @@ var/list/admin_verbs_event_manager = list(
deadmin_holder.reassociate()
log_admin("[src] re-admined themself.")
message_admins("[src] re-admined themself.", 1)
src << "<span class='interface'>You now have the keys to control the planet, or atleast a small space station</span>"
to_chat(src, "<span class='interface'>You now have the keys to control the planet, or atleast a small space station</span>")
verbs -= /client/proc/readmin_self
/client/proc/deadmin_self()
@@ -830,7 +830,7 @@ var/list/admin_verbs_event_manager = list(
log_admin("[src] deadmined themself.")
message_admins("[src] deadmined themself.", 1)
deadmin()
src << "<span class='interface'>You are now a normal player.</span>"
to_chat(src, "<span class='interface'>You are now a normal player.</span>")
verbs |= /client/proc/readmin_self
feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -841,10 +841,10 @@ var/list/admin_verbs_event_manager = list(
if(config)
if(config.log_hrefs)
config.log_hrefs = 0
src << "<b>Stopped logging hrefs</b>"
to_chat(src, "<b>Stopped logging hrefs</b>")
else
config.log_hrefs = 1
src << "<b>Started logging hrefs</b>"
to_chat(src, "<b>Started logging hrefs</b>")
/client/proc/check_ai_laws()
set name = "Check AI Laws"
@@ -1039,11 +1039,11 @@ var/list/admin_verbs_event_manager = list(
if(config)
if(config.cult_ghostwriter)
config.cult_ghostwriter = 0
src << "<b>Disallowed ghost writers.</b>"
to_chat(src, "<b>Disallowed ghost writers.</b>")
message_admins("Admin [key_name_admin(usr)] has disabled ghost writers.", 1)
else
config.cult_ghostwriter = 1
src << "<b>Enabled ghost writers.</b>"
to_chat(src, "<b>Enabled ghost writers.</b>")
message_admins("Admin [key_name_admin(usr)] has enabled ghost writers.", 1)
/client/proc/toggledrones()
@@ -1053,11 +1053,11 @@ var/list/admin_verbs_event_manager = list(
if(config)
if(config.allow_drone_spawn)
config.allow_drone_spawn = 0
src << "<b>Disallowed maint drones.</b>"
to_chat(src, "<b>Disallowed maint drones.</b>")
message_admins("Admin [key_name_admin(usr)] has disabled maint drones.", 1)
else
config.allow_drone_spawn = 1
src << "<b>Enabled maint drones.</b>"
to_chat(src, "<b>Enabled maint drones.</b>")
message_admins("Admin [key_name_admin(usr)] has enabled maint drones.", 1)
/client/proc/man_up(mob/T as mob in mob_list)

2
code/modules/admin/verbs/adminjump.dm
View File

@@ -91,7 +91,7 @@
keys += M.client
var/selection = input("Please, select a player!", "Admin Jumping", null, null) as null|anything in sortKey(keys)
if(!selection)
src << "No keys found."
to_chat(src, "No keys found.")
return
var/mob/M = selection:mob
log_admin("[key_name(usr)] jumped to [key_name(M)]")

4
code/modules/admin/verbs/atmosdebug.dm
View File

@@ -3,7 +3,7 @@
set name = "Check Piping"
set background = 1
if(!src.holder)
src << "Only administrators may use this command."
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!
@@ -44,7 +44,7 @@
set category = "Mapping"
set name = "Check Power"
if(!src.holder)
src << "Only administrators may use this command."
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!

6
code/modules/admin/verbs/deadsay.dm
View File

@@ -3,16 +3,16 @@
set name = "Dsay" //Gave this shit a shorter name so you only have to time out "dsay" rather than "dead say" to use it --NeoFite
set hidden = 1
if(!src.holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(!src.mob)
return
if(prefs.muted & MUTE_DEADCHAT)
src << "<span class='warning'>You cannot send DSAY messages (muted).</span>"
to_chat(src, "<span class='warning'>You cannot send DSAY messages (muted).</span>")
return
if(!is_preference_enabled(/datum/client_preference/show_dsay))
src << "<span class='warning'>You have deadchat muted.</span>"
to_chat(src, "<span class='warning'>You have deadchat muted.</span>")
return
var/stafftype = uppertext(holder.rank)

2
code/modules/admin/verbs/debug.dm
View File

@@ -562,7 +562,7 @@
SMES.output_level = 75000
if(!found_the_pump && response == "Setup Completely")
src << "<font color='red'>Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter</font>"
to_chat(src, "<font color='red'>Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter</font>")
var/turf/simulated/T = SM.loc
T.zone.air.gas["nitrogen"] += 450
T.zone.air.temperature = 50

4
code/modules/admin/verbs/diagnostics.dm
View File

@@ -124,7 +124,7 @@
set category = "Debug"
/*
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(!air_master)
@@ -146,7 +146,7 @@
set category = "Debug"
/*
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(!air_master)

64
code/modules/admin/verbs/randomverbs.dm
View File

@@ -2,7 +2,7 @@
set category = null
set name = "Drop Everything"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/confirm = alert(src, "Make [M] drop everything?", "Message", "Yes", "No")
@@ -20,7 +20,7 @@
set category = "Admin"
set name = "Prison"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if (ismob(M))
if(istype(M, /mob/living/silicon/ai))
@@ -48,7 +48,7 @@
set category = "Admin"
set name = "Check new Players"
if(!holder)
src << "Only staff members may use this command."
to_chat(src, "Only staff members may use this command.")
var/age = alert(src, "Age check", "Show accounts yonger then _____ days","7", "30" , "All")
@@ -70,12 +70,12 @@
msg += "[key_name(C, 1, 1, highlight_special_characters)]: account is [C.player_age] days old<br>"
if(missing_ages)
src << "Some accounts did not have proper ages set in their clients. This function requires database to be present."
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
src << "No matches for that age range found."
to_chat(src, "No matches for that age range found.")
/client/proc/cmd_admin_subtle_message(mob/M as mob in mob_list)
set category = "Special Verbs"
@@ -83,7 +83,7 @@
if(!ismob(M)) return
if (!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/msg = sanitize(input("Message:", text("Subtle PM to [M.key]")) as text)
@@ -106,7 +106,7 @@
set name = "Global Narrate"
if (!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/msg = sanitize(input("Message:", text("Enter the text you wish to appear to everyone:")) as text)
@@ -123,7 +123,7 @@
set name = "Direct Narrate"
if(!holder)
src << "Only administrators and moderators may use this command."
to_chat(src, "Only administrators and moderators may use this command.")
return
if(!M)
@@ -148,7 +148,7 @@
set category = "Special Verbs"
set name = "Godmode"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
M.status_flags ^= GODMODE
usr << "<font color='blue'> Toggled [(M.status_flags & GODMODE) ? "ON" : "OFF"]</font>"
@@ -216,7 +216,7 @@ proc/cmd_admin_mute(mob/M as mob, mute_type, automute = 0)
set category = "Fun"
set name = "Add Random AI Law"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/confirm = alert(src, "You sure?", "Confirm", "Yes", "No")
if(confirm != "Yes") return
@@ -248,7 +248,7 @@ Ccomp's first proc.
any = 1 //if no ghosts show up, any will just be 0
if(!any)
if(notify)
src << "There doesn't appear to be any ghosts for you to select."
to_chat(src, "There doesn't appear to be any ghosts for you to select.")
return
for(var/mob/M in mobs)
@@ -265,12 +265,12 @@ Ccomp's first proc.
set name = "Allow player to respawn"
set desc = "Let's the player bypass the wait to respawn or allow them to re-enter their corpse."
if(!holder)
src << "Only administrators and moderators may use this command."
to_chat(src, "Only administrators and moderators may use this command.")
var/list/ghosts= get_ghosts(1,1)
var/target = input("Please, select a ghost!", "COME BACK TO LIFE!", null, null) as null|anything in ghosts
if(!target)
src << "Hrm, appears you didn't select a ghost" // Sanity check, if no ghosts in the list we don't want to edit a null variable and cause a runtime error.
to_chat(src, "Hrm, appears you didn't select a ghost") // Sanity check, if no ghosts in the list we don't want to edit a null variable and cause a runtime error.
return
var/mob/observer/dead/G = ghosts[target]
@@ -295,7 +295,7 @@ Ccomp's first proc.
set desc = "Toggles antagHUD usage for observers"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
var/action=""
if(config.antag_hud_allowed)
for(var/mob/observer/dead/g in get_ghosts())
@@ -306,7 +306,7 @@ Ccomp's first proc.
g.has_enabled_antagHUD = 2 // We'll allow them to respawn
g << "<font color='red'><B>The Administrator has disabled AntagHUD </B></font>"
config.antag_hud_allowed = 0
src << "<font color='red'><B>AntagHUD usage has been disabled</B></font>"
to_chat(src, "<font color='red'><B>AntagHUD usage has been disabled</B></font>")
action = "disabled"
else
for(var/mob/observer/dead/g in get_ghosts())
@@ -315,7 +315,7 @@ Ccomp's first proc.
g << "<font color='blue'><B>The Administrator has enabled AntagHUD </B></font>" // Notify all observers they can now use AntagHUD
config.antag_hud_allowed = 1
action = "enabled"
src << "<font color='blue'><B>AntagHUD usage has been enabled</B></font>"
to_chat(src, "<font color='blue'><B>AntagHUD usage has been enabled</B></font>")
log_admin("[key_name(usr)] has [action] antagHUD usage for observers")
@@ -328,14 +328,14 @@ Ccomp's first proc.
set name = "Toggle antagHUD Restrictions"
set desc = "Restricts players that have used antagHUD from being able to join this round."
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
var/action=""
if(config.antag_hud_restricted)
for(var/mob/observer/dead/g in get_ghosts())
g << "<font color='blue'><B>The administrator has lifted restrictions on joining the round if you use AntagHUD</B></font>"
action = "lifted restrictions"
config.antag_hud_restricted = 0
src << "<font color='blue'><B>AntagHUD restrictions have been lifted</B></font>"
to_chat(src, "<font color='blue'><B>AntagHUD restrictions have been lifted</B></font>")
else
for(var/mob/observer/dead/g in get_ghosts())
g << "<font color='red'><B>The administrator has placed restrictions on joining the round if you use AntagHUD</B></font>"
@@ -344,7 +344,7 @@ Ccomp's first proc.
g.has_enabled_antagHUD = 0
action = "placed restrictions"
config.antag_hud_restricted = 1
src << "<font color='red'><B>AntagHUD restrictions have been enabled</B></font>"
to_chat(src, "<font color='red'><B>AntagHUD restrictions have been enabled</B></font>")
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)
@@ -359,7 +359,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Spawn Character"
set desc = "(Re)Spawn a client's loaded character."
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
//I frontload all the questions so we don't have a half-done process while you're reading.
@@ -443,7 +443,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
switch(location)
if("Right Here") //Spawn them on your turf
if(!src.mob)
src << "You can't use 'Right Here' when you are not 'Right Anywhere'!"
to_chat(src, "You can't use 'Right Here' when you are not 'Right Anywhere'!")
return
spawnloc = get_turf(src.mob)
@@ -452,19 +452,19 @@ Traitors and the like can also be revived with the previous role mostly intact.
spawnloc = pick(latejoin)
else //I have no idea how you're here
src << "Invalid spawn location choice."
to_chat(src, "Invalid spawn location choice.")
return
//Did we actually get a loc to spawn them?
if(!spawnloc)
src << "Couldn't get valid spawn location."
to_chat(src, "Couldn't get valid spawn location.")
return
new_character = new(spawnloc)
//We were able to spawn them, right?
if(!new_character)
src << "Something went wrong and spawning failed."
to_chat(src, "Something went wrong and spawning failed.")
return
//Write the appearance and whatnot out to the character
@@ -517,7 +517,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Fun"
set name = "Add Custom AI law"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/input = sanitize(input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", "") as text|null)
if(!input)
@@ -545,7 +545,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Rejuvenate"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(!mob)
return
@@ -567,7 +567,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Special Verbs"
set name = "Create Command Report"
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/input = sanitize(input(usr, "Please enter anything you want. Anything. Serious.", "What?", "") as message|null, extra = 0)
var/customname = sanitizeSafe(input(usr, "Pick a title for the report.", "Title") as text|null)
@@ -595,7 +595,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Delete"
if (!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
admin_delete(O)
@@ -604,11 +604,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "List free slots"
if (!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(job_master)
for(var/datum/job/job in job_master.occupations)
src << "[job.title]: [job.total_positions]"
to_chat(src, "[job.title]: [job.total_positions]")
feedback_add_details("admin_verb","LFS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/cmd_admin_explosion(atom/O as obj|mob|turf in world)
@@ -705,7 +705,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set name = "Manual Ban"
set category = "Special Verbs"
if(!authenticated || !holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
var/mob/M = null
switch(alert("How would you like to ban someone today?", "Manual Ban", "Key List", "Enter Manually", "Cancel"))
@@ -777,7 +777,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Debug"
set name = "Stabilize Atmos."
if(!holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
feedback_add_details("admin_verb","STATM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
// DEFERRED

2
code/modules/admin/verbs/striketeam.dm
View File

@@ -7,7 +7,7 @@ var/const/commandos_possible = 6 //if more Commandos are needed in the future
set desc = "Spawns a strike team if you want to run an admin event."
if(!src.holder)
src << "Only administrators may use this command."
to_chat(src, "Only administrators may use this command.")
return
if(!ticker)

2
code/modules/admin/verbs/ticklag.dm
View File

@@ -19,6 +19,6 @@
if("Yes") config.Tickcomp = 1
else config.Tickcomp = 0
else
src << "<font color='red'>Error: ticklag(): Invalid world.ticklag value. No changes made.</font>"
to_chat(src, "<font color='red'>Error: ticklag(): Invalid world.ticklag value. No changes made.</font>")