Merge pull request #11438 from Emanthealmighty/AdminCultist-change

Admin created cultists can now properly summon their Gods.
This commit is contained in:
variableundefined
2019-05-17 19:15:39 +08:00
committed by GitHub
2 changed files with 11 additions and 0 deletions
+6
View File
@@ -18,6 +18,7 @@
However if you want that mind to have any special properties like being a traitor etc you will have to do that
yourself.
*/
#define SUMMON_POSSIBILITIES 3
/datum/mind
var/key
@@ -824,6 +825,11 @@
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_admin("[key_name(usr)] has culted [key_name(current)]")
message_admins("[key_name_admin(usr)] has culted [key_name_admin(current)]")
if(!summon_spots.len)
while(summon_spots.len < SUMMON_POSSIBILITIES)
var/area/summon = pick(return_sorted_areas() - summon_spots)
if(summon && is_station_level(summon.z) && summon.valid_territory)
summon_spots += summon
if("tome")
var/mob/living/carbon/human/H = current
if(istype(H))
@@ -177,6 +177,11 @@ client/proc/one_click_antag()
H = pick(candidates)
SSticker.mode.add_cultist(H.mind)
candidates.Remove(H)
if(!summon_spots.len)
while(summon_spots.len < SUMMON_POSSIBILITIES)
var/area/summon = pick(return_sorted_areas() - summon_spots)
if(summon && is_station_level(summon.z) && summon.valid_territory)
summon_spots += summon
return 1
return 0