From bb0194802fe07a615bb13dbd13f6628b48eef414 Mon Sep 17 00:00:00 2001 From: Robustin Date: Sat, 14 May 2016 18:13:00 -0400 Subject: [PATCH] Ends traitorling + snowflake rules, totally unrelated to #17618 (#17620) * Snowflek-b-gone * Traitorling gone --- code/game/gamemodes/changeling/traitor_chan.dm | 1 + code/modules/mob/living/simple_animal/guardian/guardian.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 2d906e37ed0..861ded33da2 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -43,6 +43,7 @@ for(var/j = 0, j < num_changelings, j++) if(!possible_changelings.len) break var/datum/mind/changeling = pick(possible_changelings) + antag_candidates -= changeling possible_changelings -= changeling changelings += changeling modePlayer += changelings diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 546e4b3a4e2..f7c69dbf8f5 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -381,7 +381,7 @@ var/global/list/parasites = list() //all currently existing/living guardians var/list/possible_guardians = list("Chaos", "Standard", "Ranged", "Support", "Explosive", "Lightning", "Protector", "Charger", "Assassin") var/random = TRUE var/allowmultiple = 0 - var/allowling = 0 + var/allowling = 1 /obj/item/weapon/guardiancreator/attack_self(mob/living/user) var/list/guardians = user.hasparasites()