diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 5f2b39d1aea..b2ac32f8c31 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -891,12 +891,8 @@ message_admins("[key_name_admin(usr)] has de-culted [key_name_admin(current)]") if("cultist") if(!(src in SSticker.mode.cult)) - if(!SSticker.mode.ascend_percent) // If the rise/ascend thresholds haven't been set (non-cult rounds) - SSticker.mode.cult_objs.setup() - SSticker.mode.cult_threshold_check() - SSticker.mode.add_cultist(src) - special_role = SPECIAL_ROLE_CULTIST to_chat(current, CULT_GREETING) + SSticker.mode.add_cultist(src) to_chat(current, "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve [SSticker.cultdat.entity_title2] above all else. Bring It back.") log_and_message_admins("[key_name(usr)] has culted [key_name(current)]") if("dagger") diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 5d230014137..a3434c51e91 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -171,6 +171,10 @@ GLOBAL_LIST_EMPTY(all_cults) if(!istype(cult_mind)) return FALSE + if(!ascend_percent) // If the rise/ascend thresholds haven't been set (non-cult rounds) + cult_objs.setup() + cult_threshold_check() + if(!(cult_mind in cult)) cult += cult_mind cult_mind.current.faction |= "cult" diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 4edc94bbf5a..d13152455b7 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -161,7 +161,7 @@ var/list/mob/living/carbon/human/candidates = list() var/mob/living/carbon/human/H = null - var/antnum = input(owner, "How many cultists you want to create? Enter 0 to cancel.","Amount:", 0) as num + var/antnum = input(owner, "How many cultists do you want to create? Enter 0 to cancel.", "Amount:", 0) as num if(!antnum || antnum <= 0) // 5 because cultist can really screw balance over if spawned in high amount. return log_admin("[key_name(owner)] tried making a Cult with One-Click-Antag") @@ -171,15 +171,17 @@ if(CandCheck(ROLE_CULTIST, applicant, temp)) candidates += applicant - if(candidates.len) - var/numCultists = min(candidates.len, antnum) + if(length(candidates)) + var/numCultists = min(length(candidates), antnum) - for(var/i = 0, i