cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 04:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hopefully this works (#14948)

Browse Source
This commit is contained in:
SabreML
2020-12-16 15:02:58 -05:00
committed by GitHub
parent c456b89952
commit 08e6575504
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mind.dm
+1 -5
View File
@@ -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, "<span class='cultitalic'>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.</span>")
log_and_message_admins("[key_name(usr)] has culted [key_name(current)]")
if("dagger")
code/game/gamemodes/cult/cult.dm
+4
View File
@@ -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"
code/modules/admin/verbs/one_click_antag.dm
+8 -6
View File
@@ -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<numCultists, i++)
for(var/I in 1 to numCultists)
H = pick(candidates)
to_chat(H, CULT_GREETING)
SSticker.mode.add_cultist(H.mind)
SSticker.mode.equip_cultist(H)
candidates.Remove(H)
return 1
return 0
return TRUE
return FALSE