Merge pull request #1231 from Neerti/3/22/2016_self_objectives

Adds a new optional 'ambitions' system.
This commit is contained in:
EmperorJon
2016-03-27 17:38:22 +01:00
4 changed files with 31 additions and 2 deletions
+5 -2
View File
@@ -61,10 +61,13 @@
//put this here for easier tracking ingame
var/datum/money_account/initial_account
//used for antag tcrystal trading, more info in code\game\objects\items\telecrystals.dm
var/accept_tcrystals = 0
//used for optional self-objectives that antagonists can give themselves, which are displayed at the end of the round.
var/ambitions
/datum/mind/New(var/key)
src.key = key
@@ -147,7 +150,7 @@
if(href_list["add_antagonist"])
var/datum/antagonist/antag = all_antag_types[href_list["add_antagonist"]]
if(antag)
if(antag)
if(antag.add_antagonist(src, 1, 1, 0, 1, 1)) // Ignore equipment and role type for this.
log_admin("[key_name_admin(usr)] made [key_name(src)] into a [antag.role_text].")
else