Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

This commit is contained in:
Aurorablade
2016-08-24 20:49:20 -04:00
53 changed files with 604 additions and 142 deletions
+2 -1
View File
@@ -1416,7 +1416,8 @@
message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(H)]!", 1)
log_admin("[key_name(usr)] AIized [key_name(H)]")
H.AIize()
var/mob/living/silicon/ai/ai_character = H.AIize()
ai_character.moveToAILandmark()
else if(href_list["makealien"])
if(!check_rights(R_SPAWN)) return
+2
View File
@@ -416,6 +416,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
call(/datum/game_mode/proc/add_law_zero)(new_character)
if("AI")
new_character = new_character.AIize()
var/mob/living/silicon/ai/ai_character = new_character
ai_character.moveToAILandmark()
if(new_character.mind.special_role=="traitor")
call(/datum/game_mode/proc/add_law_zero)(new_character)
//Add aliens.