From c29be22f9b01e80f3c8fc1c81f236eadcec2f474 Mon Sep 17 00:00:00 2001 From: DeltaFire Date: Mon, 8 Jun 2020 19:06:41 +0200 Subject: [PATCH] no more gamer time --- code/datums/mind.dm | 8 ++++++-- code/world.dm | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index fb91edb2c9..b07e9dce40 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -330,15 +330,19 @@ //Link a new mobs mind to the creator of said mob. They will join any team they are currently on, and will only switch teams when their creator does. /datum/mind/proc/enslave_mind_to_creator(mob/living/creator) - if(iscultist(creator)) + if(iscultist(creator, TRUE)) SSticker.mode.add_cultist(src) + else if(iscultist(creator)) + src.add_antag_datum(/datum/antagonist/cult/neutered/traitor) else if(is_revolutionary(creator)) var/datum/antagonist/rev/converter = creator.mind.has_antag_datum(/datum/antagonist/rev,TRUE) converter.add_revolutionary(src,FALSE) - else if(is_servant_of_ratvar(creator)) + else if(is_servant_of_ratvar(creator, TRUE)) add_servant_of_ratvar(current) + else if(is_servant_of_ratvar(creator)) + add_servant_of_ratvar(current, FALSE, FALSE, /datum/antagonist/clockcult/neutered/traitor) else if(is_nuclear_operative(creator)) var/datum/antagonist/nukeop/converter = creator.mind.has_antag_datum(/datum/antagonist/nukeop,TRUE) diff --git a/code/world.dm b/code/world.dm index 344ca9be79..7664a66dd3 100644 --- a/code/world.dm +++ b/code/world.dm @@ -12,3 +12,4 @@ #ifdef FIND_REF_NO_CHECK_TICK loop_checks = FALSE #endif +mind \ No newline at end of file