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

Merge branch 'master' of https://github.com/ZomgPonies/Paradise

Browse Source
This commit is contained in:
ZomgPonies
2014-06-25 16:29:46 -04:00
parent bded19984f 3e9ac8727e
commit 1b34c52806
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
+1 -1
View File
@@ -11,7 +11,7 @@ datum/directive/terminations/alien_fraud
datum/directive/terminations/alien_fraud/get_crew_to_terminate()
var/list/aliens[0]
for(var/mob/M in player_list)
if (is_alien(M) && M.is_ready())
if (M.is_ready() && is_alien(M))
aliens+=(M)
return aliens
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
+1 -1
View File
@@ -6,7 +6,7 @@ datum/directive/bluespace_contagion
proc/get_infection_candidates()
var/list/candidates[0]
for(var/mob/M in player_list)
if (!M.is_mechanical() && M.is_ready())
if (M.is_ready() && !M.is_mechanical())
candidates+=(M)
return candidates
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
+1 -1
View File
@@ -8,7 +8,7 @@ datum/directive/terminations/financial_crisis/get_crew_to_terminate()
var/list/civilians[0]
var/list/candidates = civilian_positions - "Head of Personnel"
for(var/mob/M in player_list)
if (candidates.Find(M.mind.assigned_role) && M.is_ready())
if (M.is_ready() && candidates.Find(M.mind.assigned_role))
civilians+=(M)
return civilians
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
+2 -2
View File
@@ -16,14 +16,14 @@ datum/directive/ipc_virus
proc/get_ipcs()
var/list/machines[0]
for(var/mob/M in player_list)
if (M.get_species() == "Machine" && M.is_ready())
if (M.is_ready() && M.get_species() == "Machine")
machines+=(M)
return machines
proc/get_roboticists()
var/list/roboticists[0]
for(var/mob/M in player_list)
if (roboticist_roles.Find(M.mind.assigned_role) && M.is_ready())
if (M.is_ready() && roboticist_roles.Find(M.mind.assigned_role))
roboticists+=(M)
return roboticists
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
+1 -1
View File
@@ -10,7 +10,7 @@ datum/directive/research_to_ripleys
proc/get_researchers()
var/list/researchers[0]
for(var/mob/M in player_list)
if (is_researcher(M) && M.is_ready())
if (M.is_ready() && is_researcher(M))
researchers+=(M)
return researchers
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
+2 -2
View File
@@ -13,7 +13,7 @@ datum/directive/tau_ceti_needs_women
proc/get_crew_of_target_gender()
var/list/targets[0]
for(var/mob/M in player_list)
if(is_target_gender(M) && !M.is_mechanical() && M.is_ready())
if(M.is_ready() && is_target_gender(M) && !M.is_mechanical())
targets+=(M)
return targets
@@ -63,7 +63,7 @@ datum/directive/tau_ceti_needs_women/meets_prerequisites()
var/females = 0
var/males = 0
for(var/mob/M in player_list)
if(!M.is_mechanical() && M.get_species() != "Diona" && M.is_ready())
if(M.is_ready() && !M.is_mechanical() && M.get_species() != "Diona")
var/gender = M.get_gender()
if(gender == MALE)
males++