cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deals with the avalanche. (#16796)

Browse Source
This commit is contained in:
MadmanMartian
2018-01-05 22:28:22 +00:00
committed by Sood
parent 9e8575f1db
commit 0507519fa3
75 changed files with 581 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
return
var/client/CLIENT = usr.client
if(href_list["makeAntag"])
/*if(href_list["makeAntag"])
switch(href_list["makeAntag"])
if("1")
log_admin("[key_name(usr)] has spawned a traitor.")
@@ -49,8 +49,8 @@
log_admin("[key_name(usr)] has spawned vox raiders.")
if(!src.makeVoxRaiders())
to_chat(usr, "<span class='warning'>Unfortunately, there weren't enough candidates available.</span>")
else if("announce_laws" in href_list)
*/
if("announce_laws" in href_list)
var/mob/living/silicon/S = locate(href_list["mob"])
log_admin("[key_name(usr)] has notified [key_name(S)] of a change to their laws.")
@@ -2086,8 +2086,8 @@
else if(href_list["emergency_shuttle_panel"])
emergency_shuttle_panel()
else if(href_list["check_antagonist"])
check_antagonists()
// else if(href_list["check_antagonist"])
// check_antagonists()
else if(href_list["cult_nextobj"])
if(alert(usr, "Validate the current Cult objective and unlock the next one?", "Cult Cheat Code", "Yes", "No") != "Yes")
@@ -2133,7 +2133,7 @@
to_chat(O, "<span class='game say'><span class='danger'>Nar-Sie</span> whispers to [M.real_name], <span class='sinister'>[input]</span></span>")
message_admins("Admin [key_name_admin(usr)] has talked with the Voice of Nar-Sie.")
*/
else if(href_list["adminplayerobservecoodjump"])
if(!check_rights(R_ADMIN))
return
@@ -2199,12 +2199,12 @@
else
location_description = "([M.loc == T ? "at coordinates " : "in [M.loc] at coordinates "] [T.x], [T.y], [T.z])"
//Job + antagonist
/*Job + antagonist
if(M.mind)
special_role_description = "Role: <b>[M.mind.assigned_role]</b>; Antagonist: <font color='red'><b>[M.mind.special_role]</b></font>; Has been rev: [(M.mind.has_been_rev)?"Yes":"No"]"
else
special_role_description = "Role: <i>Mind datum missing</i> Antagonist: <i>Mind datum missing</i>; Has been rev: <i>Mind datum missing</i>;"
*/
//Health
if(isliving(M))
var/mob/living/L = M
@@ -2820,7 +2820,7 @@
log_admin("[key_name(usr)] created a link with central command", 1)
message_admins("<span class='notice'>[key_name_admin(usr)] created a link with central command</span>", 1)
link_to_centcomm()
if("traitor_all")
/*if("traitor_all")
if(!ticker)
alert("The game hasn't started yet!")
return
@@ -2854,7 +2854,7 @@
ticker.mode.greet_traitor(A.mind)
ticker.mode.finalize_traitor(A.mind)
message_admins("<span class='notice'>[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]</span>", 1)
log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")*/
if("moveadminshuttle")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShA")
@@ -3696,8 +3696,8 @@
dat += text("<tr><td>[]</td><td>[]</td></tr>", H.name, H.get_assignment())
dat += "</table>"
usr << browse(dat, "window=manifest;size=440x410")
if("check_antagonist")
check_antagonists()
// if("check_antagonist")
// check_antagonists()
if("emergency_shuttle_panel")
emergency_shuttle_panel()
if("DNA")
@@ -4797,4 +4797,4 @@
text +="</ul>"
text += "<A HREF='?src=\ref[src];religions=global_subtle_pm&rel=\ref[R]'>Subtle PM all believers</a> <br/>"
text += "<A HREF='?src=\ref[src];religions=new'>Bus in a new religion</a> <br/>"
usr << browse(jointext(text, ""), "window=admin2;size=300x370")
usr << browse(jointext(text, ""), "window=admin2;size=300x370")