shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Why did you check if the gamemode's type is an antagonist datum?

Browse Source 
And why did it sort of work too?
I don't understand.
Pooj's copypasting this black magic, smh.
This commit is contained in:
Ghommie
2019-05-22 06:09:18 +02:00
parent d40d9791c4
commit 6bb70297ec
3 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/game/machinery/cryopod.dm
+6 -36
View File
@@ -245,43 +245,13 @@
// This function can not be undone; do not call this unless you are sure
/obj/machinery/cryopod/proc/despawn_occupant()
var/mob/living/mob_occupant = occupant
var/list/target_candidates = list()
if(istype(SSticker.mode, /datum/antagonist/cult))//thank
if("sacrifice" in SSticker.mode.cult)
for(var/mob/living/carbon/human/player in GLOB.player_list)
if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && !is_convertable_to_cult(player) && player.stat != DEAD)
target_candidates += player.mind
target_candidates -= mob_occupant.mind
if(target_candidates.len == 0)
message_admins("Cult Sacrifice: Could not find unconvertable target, checking for convertable target.")
for(var/mob/living/carbon/human/player in GLOB.player_list)
if(player.mind && !player.mind.has_antag_datum(/datum/antagonist/cult) && player.stat != DEAD)
target_candidates += player.mind
listclearnulls(target_candidates)
if(LAZYLEN(target_candidates))
var/datum/objective/sacrifice/sac_objective = locate() in GLOB.objectives
sac_objective.target = pick(target_candidates)
sac_objective.update_explanation_text()
var/datum/job/sacjob = SSjob.GetJob(sac_objective.target.assigned_role)
var/datum/preferences/sacface = sac_objective.target.current.client.prefs
var/icon/reshape = get_flat_human_icon(null, sacjob, sacface)
reshape.Shift(SOUTH, 4)
reshape.Shift(EAST, 1)
reshape.Crop(7,4,26,31)
reshape.Crop(-5,-3,26,30)
sac_objective.sac_image = reshape
for(var/datum/mind/H in SSticker.mode.cult)
if(H.current)
to_chat(H.current, "<span class='danger'>Nar'Sie</span> murmurs, <span class='cultlarge'>[occupant] is beyond your reach. Sacrifice [sac_objective.target.current] instead...</span></span>")
else
message_admins("Cult Sacrifice: Could not find unconvertable or convertable target after cryopod. WELP!")
if(istype(SSticker.mode, /datum/game_mode/cult))
var/datum/game_mode/cult/M = SSticker.mode
var/datum/team/cult/C = M.main_cult
var/datum/objective/sacrifice/S = locate() in C.objectives
if(S.target == mob_occupant.mind)
C.sort_sacrifice(TRUE)
//Update any existing objectives involving this mob.
for(var/datum/objective/O in GLOB.objectives)