cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-added the default-vote config option for voting. For every client connected more than the total votes, it will add 1 to the default vote option (No restart or the current game-mode).

Browse Source 
/obj/admins is now /datum/admins because that's what datums are for you silly people
Moved var/datum/marked_datum from /obj/ to /datum/admins
admin datums are persistent throughout the round. They are stored in the var/list/admins rather than the ranks. This is so admin preferences may be moved into the datum to have them persist even after Login/Logout/Disconnects.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4749 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
elly1989@rocketmail.com
2012-09-24 11:40:41 +00:00
parent c2c5f3aa49
commit f8da06db13
20 changed files with 2735 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/controllers/voting.dm
View File

@@ -53,10 +53,25 @@ datum/controller/vote
proc/get_result() proc/get_result()
//get the highest number of votes //get the highest number of votes
var/greatest_votes = 0 var/greatest_votes = 0
var/total_votes = 0
for(var/option in choices) for(var/option in choices)
var/votes = choices[option] var/votes = choices[option]
total_votes += votes
if(votes > greatest_votes) if(votes > greatest_votes)
greatest_votes = votes greatest_votes = votes
//default-vote for everyone who didn't vote
if(!config.vote_no_default && choices.len)
var/non_voters = (client_list.len - total_votes)
if(non_voters > 0)
if(mode == "restart")
choices["Continue Playing"] += non_voters
if(choices["Continue Playing"] >= greatest_votes)
greatest_votes = choices["Continue Playing"]
else if(mode == "gamemode")
if(master_mode in choices)
choices[master_mode] += non_voters
if(choices[master_mode] >= greatest_votes)
greatest_votes = choices[master_mode]
//get all options with that many votes and return them in a list //get all options with that many votes and return them in a list
. = list() . = list()
if(greatest_votes) if(greatest_votes)

1
code/game/objects/objs.dm
View File

@@ -7,7 +7,6 @@
var/reliability = 100 //Used by SOME devices to determine how reliable they are. var/reliability = 100 //Used by SOME devices to determine how reliable they are.
var/crit_fail = 0 var/crit_fail = 0
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
var/datum/marked_datum
animate_movement = 2 animate_movement = 2
var/throwforce = 1 var/throwforce = 1
var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]" var/list/attack_verb = list() //Used in attackby() to say how something was attacked "[x] has been [z.attack_verb] by [y] with [z]"

6
code/modules/admin/DB ban/functions.dm
View File

@@ -1,5 +1,5 @@
obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0) datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0)
var/user = sqlfdbklogin var/user = sqlfdbklogin
var/pass = sqlfdbkpass var/pass = sqlfdbkpass
var/db = sqlfdbkdb var/db = sqlfdbkdb
@@ -79,7 +79,7 @@ obj/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1
obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
var/user = sqlfdbklogin var/user = sqlfdbklogin
var/pass = sqlfdbkpass var/pass = sqlfdbkpass
var/db = sqlfdbkdb var/db = sqlfdbkdb
@@ -149,7 +149,7 @@ obj/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
DB_ban_unban_by_id(ban_id) DB_ban_unban_by_id(ban_id)
obj/admins/proc/DB_ban_unban_by_id(var/id) datum/admins/proc/DB_ban_unban_by_id(var/id)
var/user = sqlfdbklogin var/user = sqlfdbklogin
var/pass = sqlfdbkpass var/pass = sqlfdbkpass
var/db = sqlfdbkdb var/db = sqlfdbkdb

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

@@ -163,7 +163,7 @@ var/savefile/Banlist
timeleftstring = "[exp] Minutes" timeleftstring = "[exp] Minutes"
return timeleftstring return timeleftstring
/obj/admins/proc/unbanpanel() /datum/admins/proc/unbanpanel()
var/count = 0 var/count = 0
var/dat var/dat
//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >" //var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"

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

@@ -19,7 +19,7 @@ var/global/floorIsLava = 0
///////////////////////////////////////////////////////////////////////////////////////////////Panels ///////////////////////////////////////////////////////////////////////////////////////////////Panels
/obj/admins/proc/show_player_panel(var/mob/M in mob_list) /datum/admins/proc/show_player_panel(var/mob/M in mob_list)
set category = "Admin" set category = "Admin"
set name = "Show Player Panel" set name = "Show Player Panel"
set desc="Edit player (respawn, ban, heal, etc)" set desc="Edit player (respawn, ban, heal, etc)"
@@ -27,9 +27,9 @@ var/global/floorIsLava = 0
if(!M) if(!M)
usr << "You seem to be selecting a mob that doesn't exist anymore." usr << "You seem to be selecting a mob that doesn't exist anymore."
return return
if (!istype(src,/obj/admins)) if (!istype(src,/datum/admins))
src = usr.client.holder src = usr.client.holder
if (!istype(src,/obj/admins)) if (!istype(src,/datum/admins))
usr << "Error: you are not an admin!" usr << "Error: you are not an admin!"
return return
@@ -157,14 +157,14 @@ var/global/floorIsLava = 0
feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","SPP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/access_news_network() //MARKER /datum/admins/proc/access_news_network() //MARKER
set category = "Fun" set category = "Fun"
set name = "Access Newscaster Network" set name = "Access Newscaster Network"
set desc = "Allows you to view, add and edit news feeds." set desc = "Allows you to view, add and edit news feeds."
if (!istype(src,/obj/admins)) if (!istype(src,/datum/admins))
src = usr.client.holder src = usr.client.holder
if (!istype(src,/obj/admins)) if (!istype(src,/datum/admins))
usr << "Error: you are not an admin!" usr << "Error: you are not an admin!"
return return
var/dat var/dat
@@ -350,7 +350,7 @@ var/global/floorIsLava = 0
/obj/admins/proc/Jobbans() /datum/admins/proc/Jobbans()
if ((src.rank in list( "Game Admin", "Game Master" ))) if ((src.rank in list( "Game Admin", "Game Master" )))
var/dat = "<B>Job Bans!</B><HR><table>" var/dat = "<B>Job Bans!</B><HR><table>"
@@ -362,7 +362,7 @@ var/global/floorIsLava = 0
dat += "</table>" dat += "</table>"
usr << browse(dat, "window=ban;size=400x400") usr << browse(dat, "window=ban;size=400x400")
/obj/admins/proc/Game() /datum/admins/proc/Game()
var/dat var/dat
var/lvl = 0 var/lvl = 0
@@ -404,21 +404,21 @@ var/global/floorIsLava = 0
usr << browse(dat, "window=admin2;size=210x180") usr << browse(dat, "window=admin2;size=210x180")
return return
/* /*
/obj/admins/proc/goons() /datum/admins/proc/goons()
var/dat = "<HR><B>GOOOOOOONS</B><HR><table cellspacing=5><tr><th>Key</th><th>SA Username</th></tr>" var/dat = "<HR><B>GOOOOOOONS</B><HR><table cellspacing=5><tr><th>Key</th><th>SA Username</th></tr>"
for(var/t in goon_keylist) for(var/t in goon_keylist)
dat += text("<tr><td><A href='?src=\ref[src];remove=[ckey(t)]'><B>[t]</B></A></td><td>[goon_keylist[ckey(t)]]</td></tr>") dat += text("<tr><td><A href='?src=\ref[src];remove=[ckey(t)]'><B>[t]</B></A></td><td>[goon_keylist[ckey(t)]]</td></tr>")
dat += "</table>" dat += "</table>"
usr << browse(dat, "window=ban;size=300x400") usr << browse(dat, "window=ban;size=300x400")
/obj/admins/proc/beta_testers() /datum/admins/proc/beta_testers()
var/dat = "<HR><B>Beta testers</B><HR><table cellspacing=5><tr><th>Key</th></tr>" var/dat = "<HR><B>Beta testers</B><HR><table cellspacing=5><tr><th>Key</th></tr>"
for(var/t in beta_tester_keylist) for(var/t in beta_tester_keylist)
dat += text("<tr><td>[t]</td></tr>") dat += text("<tr><td>[t]</td></tr>")
dat += "</table>" dat += "</table>"
usr << browse(dat, "window=ban;size=300x400") usr << browse(dat, "window=ban;size=300x400")
*/ */
/obj/admins/proc/Secrets() /datum/admins/proc/Secrets()
if (!usr.client.holder) if (!usr.client.holder)
return return
@@ -533,7 +533,7 @@ var/global/floorIsLava = 0
//i.e. buttons/verbs //i.e. buttons/verbs
/obj/admins/proc/restart() /datum/admins/proc/restart()
set category = "Server" set category = "Server"
set name = "Restart" set name = "Restart"
set desc="Restarts the world" set desc="Restarts the world"
@@ -556,7 +556,7 @@ var/global/floorIsLava = 0
world.Reboot() world.Reboot()
/obj/admins/proc/announce() /datum/admins/proc/announce()
set category = "Special Verbs" set category = "Special Verbs"
set name = "Announce" set name = "Announce"
set desc="Announce your desires to the world" set desc="Announce your desires to the world"
@@ -568,7 +568,7 @@ var/global/floorIsLava = 0
log_admin("Announce: [key_name(usr)] : [message]") log_admin("Announce: [key_name(usr)] : [message]")
feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggleooc() /datum/admins/proc/toggleooc()
set category = "Server" set category = "Server"
set desc="Toggle dis bitch" set desc="Toggle dis bitch"
set name="Toggle OOC" set name="Toggle OOC"
@@ -581,7 +581,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled OOC.", 1) message_admins("[key_name_admin(usr)] toggled OOC.", 1)
feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggleoocdead() /datum/admins/proc/toggleoocdead()
set category = "Server" set category = "Server"
set desc="Toggle dis bitch" set desc="Toggle dis bitch"
set name="Toggle Dead OOC" set name="Toggle Dead OOC"
@@ -591,7 +591,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1) message_admins("[key_name_admin(usr)] toggled Dead OOC.", 1)
feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TDOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggletraitorscaling() /datum/admins/proc/toggletraitorscaling()
set category = "Server" set category = "Server"
set desc="Toggle traitor scaling" set desc="Toggle traitor scaling"
set name="Toggle Traitor Scaling" set name="Toggle Traitor Scaling"
@@ -600,7 +600,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].", 1) message_admins("[key_name_admin(usr)] toggled Traitor Scaling [traitor_scaling ? "on" : "off"].", 1)
feedback_add_details("admin_verb","TTS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TTS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/startnow() /datum/admins/proc/startnow()
set category = "Server" set category = "Server"
set desc="Start the round RIGHT NOW" set desc="Start the round RIGHT NOW"
set name="Start Now" set name="Start Now"
@@ -617,7 +617,7 @@ var/global/floorIsLava = 0
usr << "<font color='red'>Error: Start Now: Game has already started.</font>" usr << "<font color='red'>Error: Start Now: Game has already started.</font>"
return 0 return 0
/obj/admins/proc/toggleenter() /datum/admins/proc/toggleenter()
set category = "Server" set category = "Server"
set desc="People can't enter" set desc="People can't enter"
set name="Toggle Entering" set name="Toggle Entering"
@@ -631,7 +631,7 @@ var/global/floorIsLava = 0
world.update_status() world.update_status()
feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggleAI() /datum/admins/proc/toggleAI()
set category = "Server" set category = "Server"
set desc="People can't be AI" set desc="People can't be AI"
set name="Toggle AI" set name="Toggle AI"
@@ -644,7 +644,7 @@ var/global/floorIsLava = 0
world.update_status() world.update_status()
feedback_add_details("admin_verb","TAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TAI") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggleaban() /datum/admins/proc/toggleaban()
set category = "Server" set category = "Server"
set desc="Respawn basically" set desc="Respawn basically"
set name="Toggle Respawn" set name="Toggle Respawn"
@@ -658,7 +658,7 @@ var/global/floorIsLava = 0
world.update_status() world.update_status()
feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggle_aliens() /datum/admins/proc/toggle_aliens()
set category = "Server" set category = "Server"
set desc="Toggle alien mobs" set desc="Toggle alien mobs"
set name="Toggle Aliens" set name="Toggle Aliens"
@@ -667,7 +667,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1) message_admins("[key_name_admin(usr)] toggled Aliens [aliens_allowed ? "on" : "off"].", 1)
feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggle_space_ninja() /datum/admins/proc/toggle_space_ninja()
set category = "Server" set category = "Server"
set desc="Toggle space ninjas spawning." set desc="Toggle space ninjas spawning."
set name="Toggle Space Ninjas" set name="Toggle Space Ninjas"
@@ -676,7 +676,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled Space Ninjas [toggle_space_ninja ? "on" : "off"].", 1) message_admins("[key_name_admin(usr)] toggled Space Ninjas [toggle_space_ninja ? "on" : "off"].", 1)
feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TSN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/delay() /datum/admins/proc/delay()
set category = "Server" set category = "Server"
set desc="Delay the game start" set desc="Delay the game start"
set name="Delay" set name="Delay"
@@ -691,7 +691,7 @@ var/global/floorIsLava = 0
log_admin("[key_name(usr)] removed the delay.") log_admin("[key_name(usr)] removed the delay.")
feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","DELAY") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/adjump() /datum/admins/proc/adjump()
set category = "Server" set category = "Server"
set desc="Toggle admin jumping" set desc="Toggle admin jumping"
set name="Toggle Jump" set name="Toggle Jump"
@@ -699,7 +699,7 @@ var/global/floorIsLava = 0
message_admins("\blue Toggled admin jumping to [config.allow_admin_jump].") message_admins("\blue Toggled admin jumping to [config.allow_admin_jump].")
feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TJ") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/adspawn() /datum/admins/proc/adspawn()
set category = "Server" set category = "Server"
set desc="Toggle admin spawning" set desc="Toggle admin spawning"
set name="Toggle Spawn" set name="Toggle Spawn"
@@ -707,7 +707,7 @@ var/global/floorIsLava = 0
message_admins("\blue Toggled admin item spawning to [config.allow_admin_spawning].") message_admins("\blue Toggled admin item spawning to [config.allow_admin_spawning].")
feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/adrev() /datum/admins/proc/adrev()
set category = "Server" set category = "Server"
set desc="Toggle admin revives" set desc="Toggle admin revives"
set name="Toggle Revive" set name="Toggle Revive"
@@ -715,7 +715,7 @@ var/global/floorIsLava = 0
message_admins("\blue Toggled reviving to [config.allow_admin_rev].") message_admins("\blue Toggled reviving to [config.allow_admin_rev].")
feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TAR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/immreboot() /datum/admins/proc/immreboot()
set category = "Server" set category = "Server"
set desc="Reboots the server post haste" set desc="Reboots the server post haste"
set name="Immediate Reboot" set name="Immediate Reboot"
@@ -756,7 +756,7 @@ var/global/floorIsLava = 0
usr << "Prayer visibility turned off" usr << "Prayer visibility turned off"
feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/unprison(var/mob/M in mob_list) /datum/admins/proc/unprison(var/mob/M in mob_list)
set category = "Admin" set category = "Admin"
set name = "Unprison" set name = "Unprison"
if (M.z == 2) if (M.z == 2)
@@ -817,7 +817,7 @@ var/global/floorIsLava = 0
return 0 return 0
/* /*
/obj/admins/proc/get_sab_desc(var/target) /datum/admins/proc/get_sab_desc(var/target)
switch(target) switch(target)
if(1) if(1)
return "Destroy at least 70% of the plasma canisters on the station" return "Destroy at least 70% of the plasma canisters on the station"
@@ -834,7 +834,7 @@ var/global/floorIsLava = 0
else else
return "Error: Invalid sabotage target: [target]" return "Error: Invalid sabotage target: [target]"
*/ */
/obj/admins/proc/spawn_atom(var/object as text) /datum/admins/proc/spawn_atom(var/object as text)
set category = "Debug" set category = "Debug"
set desc= "(atom path) Spawn an atom" set desc= "(atom path) Spawn an atom"
set name= "Spawn" set name= "Spawn"
@@ -869,7 +869,7 @@ var/global/floorIsLava = 0
feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","SA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/show_traitor_panel(var/mob/M in sortmobs()) /datum/admins/proc/show_traitor_panel(var/mob/M in sortmobs())
set category = "Admin" set category = "Admin"
set desc = "Edit mobs's memory and role" set desc = "Edit mobs's memory and role"
set name = "Show Traitor Panel" set name = "Show Traitor Panel"
@@ -881,7 +881,7 @@ var/global/floorIsLava = 0
feedback_add_details("admin_verb","STP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","STP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggletintedweldhelmets() /datum/admins/proc/toggletintedweldhelmets()
set category = "Debug" set category = "Debug"
set desc="Reduces view range when wearing welding helmets" set desc="Reduces view range when wearing welding helmets"
set name="Toggle tinted welding helmes" set name="Toggle tinted welding helmes"
@@ -894,7 +894,7 @@ var/global/floorIsLava = 0
message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1) message_admins("[key_name_admin(usr)] toggled tinted_weldhelh.", 1)
feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TTWH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/obj/admins/proc/toggleguests() /datum/admins/proc/toggleguests()
set category = "Server" set category = "Server"
set desc="Guests can't enter" set desc="Guests can't enter"
set name="Toggle guests" set name="Toggle guests"
@@ -915,7 +915,7 @@ var/global/floorIsLava = 0
feedback_add_details("admin_verb","UJBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","UJBP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return return
/obj/admins/proc/output_ai_laws() /datum/admins/proc/output_ai_laws()
var/ai_number = 0 var/ai_number = 0
for(var/mob/living/silicon/S in mob_list) for(var/mob/living/silicon/S in mob_list)
ai_number++ ai_number++

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

@@ -18,7 +18,9 @@
/client/proc/update_admins(var/rank) /client/proc/update_admins(var/rank)
if(!holder) if(!holder)
holder = new /obj/admins(src) holder = new /datum/admins(rank)
admin_list |= src
admins[ckey] = holder
var/need_update = 0 var/need_update = 0
//check if our rank has changed //check if our rank has changed
@@ -73,7 +75,7 @@
holder.level = 2 holder.level = 2
if(holder.state == 2) // if observing if(holder.state == 2) // if observing
deadchat = 1 deadchat = 1
verbs += /obj/admins/proc/toggleaban //abandon mob verbs += /datum/admins/proc/toggleaban //abandon mob
verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/deadchat //toggles deadchat
verbs += /client/proc/cmd_admin_check_contents verbs += /client/proc/cmd_admin_check_contents
verbs += /client/proc/Jump verbs += /client/proc/Jump
@@ -112,14 +114,14 @@
//Moderator //Moderator
if (holder.level >= 0) if (holder.level >= 0)
verbs += /obj/admins/proc/announce verbs += /datum/admins/proc/announce
verbs += /obj/admins/proc/startnow verbs += /datum/admins/proc/startnow
verbs += /obj/admins/proc/toggleAI //Toggle the AI verbs += /datum/admins/proc/toggleAI //Toggle the AI
verbs += /obj/admins/proc/toggleenter //Toggle enterting verbs += /datum/admins/proc/toggleenter //Toggle enterting
verbs += /obj/admins/proc/toggleguests //Toggle guests entering verbs += /datum/admins/proc/toggleguests //Toggle guests entering
verbs += /obj/admins/proc/toggleooc //toggle ooc verbs += /datum/admins/proc/toggleooc //toggle ooc
verbs += /obj/admins/proc/toggleoocdead //toggle ooc for dead/unc verbs += /datum/admins/proc/toggleoocdead //toggle ooc for dead/unc
verbs += /obj/admins/proc/show_player_panel verbs += /datum/admins/proc/show_player_panel
verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/deadchat //toggles deadchat
//verbs += /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro //verbs += /client/proc/cmd_admin_mute --was never used (according to stats trackind) - use show player panel --erro
verbs += /client/proc/cmd_admin_pm_context verbs += /client/proc/cmd_admin_pm_context
@@ -140,14 +142,14 @@
verbs += /client/proc/deadmin_self verbs += /client/proc/deadmin_self
verbs += /client/proc/check_ai_laws verbs += /client/proc/check_ai_laws
//verbs += /client/proc/cmd_admin_prison --Merged with player panel //verbs += /client/proc/cmd_admin_prison --Merged with player panel
//verbs += /obj/admins/proc/unprison --Merged with player panel //verbs += /datum/admins/proc/unprison --Merged with player panel
else return else return
//Temporary Admin //Temporary Admin
if (holder.level >= 1) if (holder.level >= 1)
verbs += /obj/admins/proc/delay //game start delay verbs += /datum/admins/proc/delay //game start delay
verbs += /obj/admins/proc/immreboot //immediate reboot verbs += /datum/admins/proc/immreboot //immediate reboot
verbs += /obj/admins/proc/restart //restart verbs += /datum/admins/proc/restart //restart
verbs += /client/proc/cmd_admin_check_contents verbs += /client/proc/cmd_admin_check_contents
verbs += /client/proc/cmd_admin_create_centcom_report verbs += /client/proc/cmd_admin_create_centcom_report
verbs += /client/proc/toggle_hear_deadcast verbs += /client/proc/toggle_hear_deadcast
@@ -172,10 +174,10 @@
seeprayers = 1 seeprayers = 1
verbs += /client/proc/invisimin verbs += /client/proc/invisimin
verbs += /obj/admins/proc/view_txt_log verbs += /datum/admins/proc/view_txt_log
verbs += /obj/admins/proc/view_atk_log verbs += /datum/admins/proc/view_atk_log
verbs += /obj/admins/proc/toggleaban //abandon mob verbs += /datum/admins/proc/toggleaban //abandon mob
verbs += /obj/admins/proc/show_traitor_panel verbs += /datum/admins/proc/show_traitor_panel
verbs += /client/proc/getserverlog //fetch an old serverlog to look at verbs += /client/proc/getserverlog //fetch an old serverlog to look at
//verbs += /client/proc/cmd_admin_remove_plasma --This proc is outdated, does not do anything //verbs += /client/proc/cmd_admin_remove_plasma --This proc is outdated, does not do anything
verbs += /client/proc/admin_call_shuttle verbs += /client/proc/admin_call_shuttle
@@ -195,10 +197,10 @@
//Badmin //Badmin
if (holder.level >= 4) if (holder.level >= 4)
verbs += /obj/admins/proc/adrev //toggle admin revives verbs += /datum/admins/proc/adrev //toggle admin revives
verbs += /obj/admins/proc/adspawn //toggle admin item spawning verbs += /datum/admins/proc/adspawn //toggle admin item spawning
verbs += /client/proc/debug_variables verbs += /client/proc/debug_variables
verbs += /obj/admins/proc/access_news_network //Admin access to the newscaster network verbs += /datum/admins/proc/access_news_network //Admin access to the newscaster network
verbs += /client/proc/cmd_modify_ticker_variables verbs += /client/proc/cmd_modify_ticker_variables
verbs += /client/proc/Debug2 //debug toggle switch verbs += /client/proc/Debug2 //debug toggle switch
verbs += /client/proc/toggle_view_range verbs += /client/proc/toggle_view_range
@@ -226,7 +228,7 @@
//Game Admin //Game Admin
if (holder.level >= 5) if (holder.level >= 5)
verbs += /obj/admins/proc/spawn_atom verbs += /datum/admins/proc/spawn_atom
verbs += /client/proc/cmd_admin_list_open_jobs verbs += /client/proc/cmd_admin_list_open_jobs
verbs += /client/proc/cmd_admin_direct_narrate verbs += /client/proc/cmd_admin_direct_narrate
verbs += /client/proc/colorooc verbs += /client/proc/colorooc
@@ -264,9 +266,9 @@
//Game Master //Game Master
if (holder.level >= 6) if (holder.level >= 6)
verbs += /obj/admins/proc/toggle_aliens //toggle aliens verbs += /datum/admins/proc/toggle_aliens //toggle aliens
verbs += /obj/admins/proc/toggle_space_ninja //toggle ninjas verbs += /datum/admins/proc/toggle_space_ninja //toggle ninjas
verbs += /obj/admins/proc/adjump verbs += /datum/admins/proc/adjump
verbs += /client/proc/callproc verbs += /client/proc/callproc
verbs += /client/proc/triple_ai verbs += /client/proc/triple_ai
verbs += /client/proc/get_admin_state verbs += /client/proc/get_admin_state
@@ -289,27 +291,27 @@
/client/proc/clear_admin_verbs() /client/proc/clear_admin_verbs()
deadchat = 0 deadchat = 0
verbs.Remove( verbs.Remove(
/obj/admins/proc/announce, /datum/admins/proc/announce,
/obj/admins/proc/startnow, /datum/admins/proc/startnow,
/obj/admins/proc/toggleAI, /*Toggle the AI*/ /datum/admins/proc/toggleAI, /*Toggle the AI*/
/obj/admins/proc/toggleenter, /*Toggle enterting*/ /datum/admins/proc/toggleenter, /*Toggle enterting*/
/obj/admins/proc/toggleguests, /*Toggle guests entering*/ /datum/admins/proc/toggleguests, /*Toggle guests entering*/
/obj/admins/proc/toggleooc, /*toggle ooc*/ /datum/admins/proc/toggleooc, /*toggle ooc*/
/obj/admins/proc/toggleoocdead, /*toggle ooc for dead/unc*/ /datum/admins/proc/toggleoocdead, /*toggle ooc for dead/unc*/
/obj/admins/proc/delay, /*game start delay*/ /datum/admins/proc/delay, /*game start delay*/
/obj/admins/proc/immreboot, /*immediate reboot*/ /datum/admins/proc/immreboot, /*immediate reboot*/
/obj/admins/proc/restart, /*restart*/ /datum/admins/proc/restart, /*restart*/
/obj/admins/proc/show_traitor_panel, /datum/admins/proc/show_traitor_panel,
/obj/admins/proc/show_player_panel, /datum/admins/proc/show_player_panel,
/obj/admins/proc/toggle_aliens, /*toggle aliens*/ /datum/admins/proc/toggle_aliens, /*toggle aliens*/
/obj/admins/proc/toggle_space_ninja,/*toggle ninjas*/ /datum/admins/proc/toggle_space_ninja,/*toggle ninjas*/
/obj/admins/proc/adjump, /datum/admins/proc/adjump,
/obj/admins/proc/view_txt_log, /datum/admins/proc/view_txt_log,
/obj/admins/proc/view_atk_log, /datum/admins/proc/view_atk_log,
/obj/admins/proc/spawn_atom, /datum/admins/proc/spawn_atom,
/obj/admins/proc/adrev, /*toggle admin revives*/ /datum/admins/proc/adrev, /*toggle admin revives*/
/obj/admins/proc/adspawn, /*toggle admin item spawning*/ /datum/admins/proc/adspawn, /*toggle admin item spawning*/
/obj/admins/proc/toggleaban, /*abandon mob*/ /datum/admins/proc/toggleaban, /*abandon mob*/
/client/proc/hide_verbs, /client/proc/hide_verbs,
/client/proc/hide_most_verbs, /client/proc/hide_most_verbs,
/client/proc/show_verbs, /client/proc/show_verbs,
@@ -408,7 +410,7 @@
/client/proc/startSinglo, /client/proc/startSinglo,
/client/proc/check_ai_laws, /client/proc/check_ai_laws,
/client/proc/cmd_debug_mob_lists, /client/proc/cmd_debug_mob_lists,
/obj/admins/proc/access_news_network, /datum/admins/proc/access_news_network,
/client/proc/one_click_antag, /client/proc/one_click_antag,
/client/proc/invisimin /client/proc/invisimin
) )
@@ -425,7 +427,7 @@
//verbs -= /client/proc/cmd_admin_attack_log --Merged with view variables //verbs -= /client/proc/cmd_admin_attack_log --Merged with view variables
//verbs -= /proc/togglebuildmode --Merged with view variables //verbs -= /proc/togglebuildmode --Merged with view variables
//verbs -= /client/proc/cmd_admin_prison --Merged with player panel //verbs -= /client/proc/cmd_admin_prison --Merged with player panel
//verbs -= /obj/admins/proc/unprison --Merged with player panel //verbs -= /datum/admins/proc/unprison --Merged with player panel
//verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying //verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying
// verbs -= /client/proc/Blobize // verbs -= /client/proc/Blobize
// verbs -= /client/proc/Blobcount // verbs -= /client/proc/Blobcount
@@ -444,7 +446,9 @@
ghost.can_reenter_corpse = 1 //just in-case. ghost.can_reenter_corpse = 1 //just in-case.
ghost.reenter_corpse() ghost.reenter_corpse()
feedback_add_details("admin_verb","P") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! 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)) 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>"
else
//ghostize //ghostize
var/mob/body = mob var/mob/body = mob
body.ghostize(1) body.ghostize(1)
@@ -731,12 +735,9 @@
if(src.holder) if(src.holder)
if(alert("Confirm self-deadmin for the round? You can't re-admin yourself without someont promoting you.",,"Yes","No") == "Yes") if(alert("Confirm self-deadmin for the round? You can't re-admin yourself without someont promoting you.",,"Yes","No") == "Yes")
del(holder)
log_admin("[src] deadmined themself.") log_admin("[src] deadmined themself.")
message_admins("[src] deadmined themself.", 1) message_admins("[src] deadmined themself.", 1)
src.clear_admin_verbs() deadmin()
admins.Remove(src.ckey)
admin_list -= src
usr << "You are now a normal player." usr << "You are now a normal player."
feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","DAS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -773,7 +774,7 @@
verbs += /client/proc/cmd_admin_gib_self verbs += /client/proc/cmd_admin_gib_self
verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/deadchat //toggles deadchat
verbs += /obj/admins/proc/toggleooc //toggle ooc verbs += /datum/admins/proc/toggleooc //toggle ooc
verbs += /client/proc/cmd_admin_say//asay verbs += /client/proc/cmd_admin_say//asay
verbs += /client/proc/toggleadminhelpsound verbs += /client/proc/toggleadminhelpsound
feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","HMV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -793,7 +794,7 @@
verbs += /client/proc/show_verbs verbs += /client/proc/show_verbs
verbs += /client/proc/deadchat //toggles deadchat verbs += /client/proc/deadchat //toggles deadchat
verbs += /obj/admins/proc/toggleooc //toggle ooc verbs += /datum/admins/proc/toggleooc //toggle ooc
verbs += /client/proc/cmd_admin_say//asay verbs += /client/proc/cmd_admin_say//asay
feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TAVVH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
return return

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

@@ -1,5 +1,5 @@
/var/create_mob_html = null /var/create_mob_html = null
/obj/admins/proc/create_mob(var/mob/user) /datum/admins/proc/create_mob(var/mob/user)
if (!create_mob_html) if (!create_mob_html)
var/mobjs = null var/mobjs = null
mobjs = dd_list2text(typesof(/mob), ";") mobjs = dd_list2text(typesof(/mob), ";")

4
code/modules/admin/create_object.dm
View File

@@ -1,6 +1,6 @@
/var/create_object_html = null /var/create_object_html = null
/obj/admins/proc/create_object(var/mob/user) /datum/admins/proc/create_object(var/mob/user)
if (!create_object_html) if (!create_object_html)
var/objectjs = null var/objectjs = null
objectjs = dd_list2text(typesof(/obj), ";") objectjs = dd_list2text(typesof(/obj), ";")
@@ -10,7 +10,7 @@
user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475") user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475")
/obj/admins/proc/quick_create_object(var/mob/user) /datum/admins/proc/quick_create_object(var/mob/user)
var/quick_create_object_html = null var/quick_create_object_html = null
var/pathtext = null var/pathtext = null

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

@@ -1,5 +1,5 @@
/var/create_turf_html = null /var/create_turf_html = null
/obj/admins/proc/create_turf(var/mob/user) /datum/admins/proc/create_turf(var/mob/user)
if (!create_turf_html) if (!create_turf_html)
var/turfjs = null var/turfjs = null
turfjs = dd_list2text(typesof(/turf), ";") turfjs = dd_list2text(typesof(/turf), ";")

2587
code/modules/admin/holder2.dm Normal file
View File

File diff suppressed because it is too large Load Diff

6
code/modules/admin/newbanjob.dm
View File

@@ -205,7 +205,7 @@ var/savefile/Banlistjob
timeleftstring = "[exp] Minutes" timeleftstring = "[exp] Minutes"
return timeleftstring return timeleftstring
/obj/admins/proc/unjobbanpanel() /datum/admins/proc/unjobbanpanel()
var/count = 0 var/count = 0
var/dat var/dat
//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >" //var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"
@@ -219,7 +219,7 @@ var/savefile/Banlistjob
dat = "<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , </FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]" dat = "<HR><B>Bans:</B> <FONT COLOR=blue>(U) = Unban , </FONT> - <FONT COLOR=green>([count] Bans)</FONT><HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >[dat]"
usr << browse(dat, "window=unbanp;size=875x400") usr << browse(dat, "window=unbanp;size=875x400")
/*/obj/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank) /*/datum/admins/proc/permjobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job)) if(AddBanjob(ckey, computerid, reason, usr.ckey, 0, 0, job))
M << "\red<BIG><B>You have been banned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>" M << "\red<BIG><B>You have been banned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>"
M << "\red This is a permanent ban." M << "\red This is a permanent ban."
@@ -229,7 +229,7 @@ var/savefile/Banlistjob
M << "\red No ban appeals URL has been set." M << "\red No ban appeals URL has been set."
log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") log_admin("[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.") message_admins("\blue[usr.client.ckey] has banned from [job] [ckey].\nReason: [reason]\nThis is a permanent ban.")
/obj/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank) /datum/admins/proc/timejobban(ckey, computerid, reason, bannedby, temp, minutes, rank)
if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job)) if(AddBanjob(ckey, computerid, reason, usr.ckey, 1, mins, job))
M << "\red<BIG><B>You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>" M << "\red<BIG><B>You have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason].</B></BIG>"
M << "\red This is a temporary ban, it will be removed in [mins] minutes." M << "\red This is a temporary ban, it will be removed in [mins] minutes."

4
code/modules/admin/player_notes.dm
View File

@@ -4,11 +4,11 @@
#define NOTESFILE "data/player_notes.sav" //where the player notes are saved #define NOTESFILE "data/player_notes.sav" //where the player notes are saved
obj/admins/proc/notes_show(var/ckey) datum/admins/proc/notes_show(var/ckey)
usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400") usr << browse("<head><title>Player Notes</title></head><body>[notes_gethtml(ckey)]</body>","window=player_notes;size=700x400")
obj/admins/proc/notes_gethtml(var/ckey) datum/admins/proc/notes_gethtml(var/ckey)
var/savefile/notesfile = new(NOTESFILE) var/savefile/notesfile = new(NOTESFILE)
if(!notesfile) return "<font color='red'>Error: Cannot access [NOTESFILE]</font>" if(!notesfile) return "<font color='red'>Error: Cannot access [NOTESFILE]</font>"
if(ckey) if(ckey)

6
code/modules/admin/player_panel.dm
View File

@@ -1,4 +1,4 @@
/obj/admins/proc/player_panel_new()//The new one /datum/admins/proc/player_panel_new()//The new one
if (!usr.client.holder) if (!usr.client.holder)
return return
var/dat = "<html><head><title>Player Panel</title></head>" var/dat = "<html><head><title>Player Panel</title></head>"
@@ -318,7 +318,7 @@
usr << browse(dat, "window=players;size=600x480") usr << browse(dat, "window=players;size=600x480")
//The old one //The old one
/obj/admins/proc/player_panel_old() /datum/admins/proc/player_panel_old()
if (!usr.client.holder) if (!usr.client.holder)
return return
var/dat = "<html><head><title>Player Menu</title></head>" var/dat = "<html><head><title>Player Menu</title></head>"
@@ -377,7 +377,7 @@
/obj/admins/proc/check_antagonists() /datum/admins/proc/check_antagonists()
if (ticker && ticker.current_state >= GAME_STATE_PLAYING) if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>" var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>" dat += "Current Game Mode: <B>[ticker.mode.name]</B><BR>"

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

@@ -112,7 +112,7 @@
//Other log stuff put here for the sake of organisation //Other log stuff put here for the sake of organisation
//Shows today's server log //Shows today's server log
/obj/admins/proc/view_txt_log() /datum/admins/proc/view_txt_log()
set category = "Admin" set category = "Admin"
set name = "Show Server Log" set name = "Show Server Log"
set desc = "Shows today's server log." set desc = "Shows today's server log."
@@ -127,7 +127,7 @@
return return
//Shows today's attack log //Shows today's attack log
/obj/admins/proc/view_atk_log() /datum/admins/proc/view_atk_log()
set category = "Admin" set category = "Admin"
set name = "Show Server Attack Log" set name = "Show Server Attack Log"
set desc = "Shows today's server attack log." set desc = "Shows today's server attack log."

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

@@ -1,5 +1,5 @@
var/list/forbidden_varedit_object_types = list( var/list/forbidden_varedit_object_types = list(
/obj/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea. /datum/admins, //Admins editing their own admin-power object? Yup, sounds like a good idea.
/obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering /obj/machinery/blackbox_recorder, //Prevents people messing with feedback gathering
/datum/feedback_variable //Prevents people messing with feedback gathering /datum/feedback_variable //Prevents people messing with feedback gathering
) )

26
code/modules/admin/verbs/one_click_antag.dm
View File

@@ -8,7 +8,7 @@ client/proc/one_click_antag()
return return
/obj/admins/proc/one_click_antag() /datum/admins/proc/one_click_antag()
var/dat = {"<B>One-click Antagonist</B><br> var/dat = {"<B>One-click Antagonist</B><br>
<a href='?src=\ref[src];makeAntag=1'>Make Tratiors</a><br> <a href='?src=\ref[src];makeAntag=1'>Make Tratiors</a><br>
@@ -32,7 +32,7 @@ client/proc/one_click_antag()
return return
/obj/admins/proc/makeMalfAImode() /datum/admins/proc/makeMalfAImode()
var/list/mob/living/silicon/AIs = list() var/list/mob/living/silicon/AIs = list()
var/mob/living/silicon/malfAI = null var/mob/living/silicon/malfAI = null
@@ -53,7 +53,7 @@ client/proc/one_click_antag()
return 0 return 0
/obj/admins/proc/makeTratiors() /datum/admins/proc/makeTratiors()
var/datum/game_mode/traitor/temp = new var/datum/game_mode/traitor/temp = new
if(config.protect_roles_from_antagonist) if(config.protect_roles_from_antagonist)
@@ -89,7 +89,7 @@ client/proc/one_click_antag()
return 0 return 0
/obj/admins/proc/makeChanglings() /datum/admins/proc/makeChanglings()
var/datum/game_mode/changeling/temp = new var/datum/game_mode/changeling/temp = new
if(config.protect_roles_from_antagonist) if(config.protect_roles_from_antagonist)
@@ -124,7 +124,7 @@ client/proc/one_click_antag()
return 0 return 0
/obj/admins/proc/makeRevs() /datum/admins/proc/makeRevs()
var/datum/game_mode/revolution/temp = new var/datum/game_mode/revolution/temp = new
if(config.protect_roles_from_antagonist) if(config.protect_roles_from_antagonist)
@@ -158,7 +158,7 @@ client/proc/one_click_antag()
return 0 return 0
/obj/admins/proc/makeWizard() /datum/admins/proc/makeWizard()
var/list/mob/dead/observer/candidates = list() var/list/mob/dead/observer/candidates = list()
var/mob/dead/observer/theghost = null var/mob/dead/observer/theghost = null
var/time_passed = world.time var/time_passed = world.time
@@ -194,7 +194,7 @@ client/proc/one_click_antag()
return 0 return 0
/obj/admins/proc/makeCult() /datum/admins/proc/makeCult()
var/datum/game_mode/cult/temp = new var/datum/game_mode/cult/temp = new
if(config.protect_roles_from_antagonist) if(config.protect_roles_from_antagonist)
@@ -232,7 +232,7 @@ client/proc/one_click_antag()
/obj/admins/proc/makeNukeTeam() /datum/admins/proc/makeNukeTeam()
var/list/mob/dead/observer/candidates = list() var/list/mob/dead/observer/candidates = list()
var/mob/dead/observer/theghost = null var/mob/dead/observer/theghost = null
@@ -325,15 +325,15 @@ client/proc/one_click_antag()
/obj/admins/proc/makeAliens() /datum/admins/proc/makeAliens()
alien_infestation(3) alien_infestation(3)
return 1 return 1
/obj/admins/proc/makeSpaceNinja() /datum/admins/proc/makeSpaceNinja()
space_ninja_arrival() space_ninja_arrival()
return 1 return 1
/obj/admins/proc/makeDeathsquad() /datum/admins/proc/makeDeathsquad()
var/list/mob/dead/observer/candidates = list() var/list/mob/dead/observer/candidates = list()
var/mob/dead/observer/theghost = null var/mob/dead/observer/theghost = null
var/time_passed = world.time var/time_passed = world.time
@@ -401,7 +401,7 @@ client/proc/one_click_antag()
return 1 return 1
/obj/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character /datum/admins/proc/makeBody(var/mob/dead/observer/G_found) // Uses stripped down and bastardized code from respawn character
if(!G_found || !G_found.key) return if(!G_found || !G_found.key) return
//First we spawn a dude. //First we spawn a dude.
@@ -423,7 +423,7 @@ client/proc/one_click_antag()
return new_character return new_character
/obj/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0) /datum/admins/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0)
var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc) var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc)
var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major") var/syndicate_commando_leader_rank = pick("Lieutenant", "Captain", "Major")
var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major") var/syndicate_commando_rank = pick("Corporal", "Sergeant", "Staff Sergeant", "Sergeant 1st Class", "Master Sergeant", "Sergeant Major")

2
code/modules/client/client defines.dm
View File

@@ -3,7 +3,7 @@
//////////////// ////////////////
//ADMIN THINGS// //ADMIN THINGS//
//////////////// ////////////////
var/obj/admins/holder = null var/datum/admins/holder = null
var/buildmode = 0 var/buildmode = 0
var/stealth = 0 var/stealth = 0
var/fakekey = null var/fakekey = null

17
code/modules/client/client procs.dm
View File

@@ -98,11 +98,12 @@
world.update_status() world.update_status()
//Admin Authorisation //Admin Authorisation
if( ckey in admins ) var/datum/admins/Admin_Obj = admins[ckey]
holder = new /obj/admins(src) if(istype(Admin_Obj))
holder.rank = admins[ckey]
admin_list += src admin_list += src
// update_admins(admins[ckey]) //handled by Login holder = Admin_Obj
holder.owner = src
holder.state = null
..() //calls mob.Login() ..() //calls mob.Login()
@@ -116,11 +117,9 @@
//DISCONNECT// //DISCONNECT//
////////////// //////////////
/client/Del() /client/Del()
if(holder)
spawn(0) holder.state = null
if(holder) admin_list -= src
admin_list -= src
del(holder)
client_list -= src client_list -= src
return ..() return ..()

2
code/world.dm
View File

@@ -207,7 +207,7 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")]
if (pos) if (pos)
var/m_key = copytext(line, 1, pos) var/m_key = copytext(line, 1, pos)
var/a_lev = copytext(line, pos + 3, length(line) + 1) var/a_lev = copytext(line, pos + 3, length(line) + 1)
admins[m_key] = a_lev admins[m_key] = new /datum/admins(a_lev)
diary << ("ADMIN: [m_key] = [a_lev]") diary << ("ADMIN: [m_key] = [a_lev]")

2
tgstation.dme
View File

@@ -813,7 +813,7 @@
#include "code\modules\admin\create_mob.dm" #include "code\modules\admin\create_mob.dm"
#include "code\modules\admin\create_object.dm" #include "code\modules\admin\create_object.dm"
#include "code\modules\admin\create_turf.dm" #include "code\modules\admin\create_turf.dm"
#include "code\modules\admin\holder.dm" #include "code\modules\admin\holder2.dm"
#include "code\modules\admin\IsBanned.dm" #include "code\modules\admin\IsBanned.dm"
#include "code\modules\admin\NewBan.dm" #include "code\modules\admin\NewBan.dm"
#include "code\modules\admin\newbanjob.dm" #include "code\modules\admin\newbanjob.dm"