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

Merge pull request #13046 from Ty-Omaha/cult-offstation

Browse Source 
Fixes cult sacrifice targeting offstation roles
This commit is contained in:
Fox McCloud
2020-05-01 18:37:24 -04:00
committed by GitHub
parent c87e4bd5c7 a9bcea83aa
commit 04a5e32005
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/cult/cult_objectives.dm
+2 -2
View File
@@ -155,12 +155,12 @@
/datum/game_mode/cult/proc/get_possible_sac_targets()
var/list/possible_sac_targets = list()
for(var/mob/living/carbon/human/player in GLOB.player_list)
if(player.mind && !is_convertable_to_cult(player.mind) && (player.stat != DEAD))
if(player.mind && !is_convertable_to_cult(player.mind) && (player.stat != DEAD) && (!player.mind.offstation_role) )
possible_sac_targets += player.mind
if(!possible_sac_targets.len)
//There are no living Unconvertables on the station. Looking for a Sacrifice Target among the ordinary crewmembers
for(var/mob/living/carbon/human/player in GLOB.player_list)
if(is_secure_level(player.z)) //We can't sacrifice people that are on the centcom z-level
if(is_secure_level(player.z) || player.mind.offstation_role) //We can't sacrifice people that are on the centcom z-level or offstation roles
continue
if(player.mind && !(player.mind in cult) && (player.stat != DEAD))//make DAMN sure they are not dead
possible_sac_targets += player.mind