Skip to content

Commit

Permalink
Merge pull request tgstation#5788 from Miauw62/runtime2
Browse files Browse the repository at this point in the history
Fixes some AI traitorize runtimes.
  • Loading branch information
RemieRichards committed Nov 14, 2014
2 parents 85eaae7 + 3f53f68 commit 935775b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion code/datums/mind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -966,7 +966,7 @@
log_admin("[key_name(usr)] has traitor'ed [current].")
if(isAI(current))
var/mob/living/silicon/ai/A = current
call(/datum/game_mode/proc/add_law_zero)(A)
ticker.mode.add_law_zero(A)
A.show_laws()

if("autoobjectives")
Expand Down
2 changes: 1 addition & 1 deletion code/game/gamemodes/traitor/traitor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
..()
return//Traitors will be checked as part of check_extra_completion. Leaving this here as a reminder.

/datum/game_mode/proc/give_codewords(mob/living/traitor_mob)
/proc/give_codewords(mob/living/traitor_mob)
traitor_mob << "<U><B>The Syndicate provided you with the following information on how to identify their agents:</B></U>"
traitor_mob << "<B>Code Phrase</B>: <span class='danger'>[syndicate_code_phrase]</span>"
traitor_mob << "<B>Code Response</B>: <span class='danger'>[syndicate_code_response]</span>"
Expand Down
9 changes: 4 additions & 5 deletions code/modules/admin/verbs/randomverbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -341,19 +341,18 @@ Traitors and the like can also be revived with the previous role mostly intact.
if("Death Commando")//Leaves them at late-join spawn.
new_character.equip_death_commando()
new_character.internal = new_character.s_store
new_character.internals.icon_state = "internal1"
new_character.internals.icon_state = "internal1"*/

else//They may also be a cyborg or AI.
switch(new_character.mind.assigned_role)
if("Cyborg")//More rigging to make em' work and check if they're traitor.
new_character = new_character.Robotize()
if(new_character.mind.special_role=="traitor")
call(/datum/game_mode/proc/add_law_zero)(new_character)
*/
ticker.mode.add_law_zero(new_character)
if("AI")
new_character = new_character.AIize()
if(new_character.mind.special_role=="traitor")
call(/datum/game_mode/proc/add_law_zero)(new_character)
//Add aliens.
ticker.mode.add_law_zero(new_character)
else
job_master.EquipRank(new_character, new_character.mind.assigned_role, 1)//Or we simply equip them.

Expand Down

0 comments on commit 935775b

Please sign in to comment.