Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

Conflicts:
	code/modules/admin/topic.dm
This commit is contained in:
Giacomand
2013-06-20 21:37:30 +01:00
8 changed files with 75 additions and 39 deletions
+20 -10
View File
@@ -9,42 +9,52 @@
if(href_list["makeAntag"])
switch(href_list["makeAntag"])
if("1")
log_admin("[key_name(usr)] has spawned a traitor.")
message_admins("[key_name_admin(usr)] created traitors.")
log_admin("[key_name(usr)] created traitors.")
if(!src.makeTraitors())
usr << "\red Unfortunatly there were no candidates available"
if("2")
log_admin("[key_name(usr)] has spawned a changeling.")
message_admins("[key_name(usr)] created changelings.")
log_admin("[key_name(usr)] created changelings.")
if(!src.makeChanglings())
usr << "\red Unfortunatly there were no candidates available"
if("3")
log_admin("[key_name(usr)] has spawned revolutionaries.")
message_admins("[key_name(usr)] started a revolution.")
log_admin("[key_name(usr)] started a revolution.")
if(!src.makeRevs())
usr << "\red Unfortunatly there were no candidates available"
if("4")
log_admin("[key_name(usr)] has spawned a cultists.")
message_admins("[key_name(usr)] created cultists.")
log_admin("[key_name(usr)] created cultists.")
if(!src.makeCult())
usr << "\red Unfortunatly there were no candidates available"
if("5")
log_admin("[key_name(usr)] has spawned a malf AI.")
message_admins("[key_name(usr)] caused an AI to malfunction.")
log_admin("[key_name(usr)] caused an AI to malfunction.")
if(!src.makeMalfAImode())
usr << "\red Unfortunatly there were no candidates available"
if("6")
log_admin("[key_name(usr)] has spawned a wizard.")
message_admins("[key_name(usr)] created a wizard.")
log_admin("[key_name(usr)] created a wizard.")
if(!src.makeWizard())
usr << "\red Unfortunatly there were no candidates available"
if("7")
log_admin("[key_name(usr)] has spawned a nuke team.")
message_admins("[key_name(usr)] created a nuke team.")
log_admin("[key_name(usr)] created a nuke team.")
if(!src.makeNukeTeam())
usr << "\red Unfortunatly there were no candidates available"
if("8")
log_admin("[key_name(usr)] has spawned a ninja.")
message_admins("[key_name(usr)] spawned a ninja.")
log_admin("[key_name(usr)] spawned a ninja.")
src.makeSpaceNinja()
if("9")
log_admin("[key_name(usr)] has spawned aliens.")
message_admins("[key_name(usr)] started an alien infestation.")
log_admin("[key_name(usr)] started an alien infestation.")
src.makeAliens()
/* DEATH SQUADS
if("10")
log_admin("[key_name(usr)] has spawned a death squad.")
message_admins("[key_name(usr)] created a death squad.")
log_admin("[key_name(usr)] created a death squad.")
if(!src.makeDeathsquad())
usr << "\red Unfortunatly there were no candidates available"
*/