cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Datumizes traitors and mindslaves (#11969)" (#12376)

Browse Source
This commit is contained in:
Dave
2019-09-21 19:32:52 -07:00
committed by variableundefined
parent f31053ddf5
commit 2230fc3227
15 changed files with 509 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/randomverbs.dm
+5 -7
View File
@@ -440,11 +440,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
//Now for special roles and equipment.
switch(new_character.mind.special_role)
if("traitor")
if(new_character.mind.has_antag_datum(/datum/antagonist/traitor))
var/datum/antagonist/traitor/T = new_character.mind.has_antag_datum(/datum/antagonist/traitor)
T.equip_traitor(src)
else
new_character.mind.add_antag_datum(/datum/antagonist/traitor)
SSjobs.AssignRank(new_character, new_character.mind.assigned_role, 0)
SSjobs.EquipRank(new_character, new_character.mind.assigned_role, 1)
SSticker.mode.equip_traitor(new_character)
if("Wizard")
new_character.loc = pick(wizardstart)
//ticker.mode.learn_basic_spells(new_character)
@@ -464,13 +462,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
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")
new_character.mind.add_antag_datum(/datum/antagonist/traitor)
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")
new_character.mind.add_antag_datum(/datum/antagonist/traitor)
call(/datum/game_mode/proc/add_law_zero)(new_character)
//Add aliens.
else
SSjobs.AssignRank(new_character, new_character.mind.assigned_role, 0)