cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes multiple runtimes in mutiny mode.

Browse Source 
Example runtime:

runtime error: Cannot read null.assigned_role
proc name: get crew to terminate (/datum/directive/terminations/financial_crisis/get_crew_to_terminate)
  source file: financial_crisis_directive.dm,11
  usr: null
  src: /datum/directive/terminations/... (/datum/directive/terminations/financial_crisis)
  call stack:
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): get crew to terminate()
/datum/directive/terminations/... (/datum/directive/terminations/financial_crisis): meets prerequisites()
mutiny (/datum/game_mode/mutiny): get directive candidates()
mutiny (/datum/game_mode/mutiny): pre setup()
/datum/controller/gameticker (/datum/controller/gameticker): setup()
/datum/controller/gameticker (/datum/controller/gameticker): pregame()
/datum/controller/game_control... (/datum/controller/game_controller): setup()
This commit is contained in:
alex-gh
2014-06-25 21:20:54 +02:00
parent 335880062d
commit 8810d3db71
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
View File

@@ -11,7 +11,7 @@ datum/directive/terminations/alien_fraud
datum/directive/terminations/alien_fraud/get_crew_to_terminate() datum/directive/terminations/alien_fraud/get_crew_to_terminate()
var/list/aliens[0] var/list/aliens[0]
for(var/mob/M in player_list) for(var/mob/M in player_list)
if (is_alien(M) && M.is_ready()) if (M.is_ready() && is_alien(M))
aliens.Add(M) aliens.Add(M)
return aliens return aliens

2
code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
View File

@@ -6,7 +6,7 @@ datum/directive/bluespace_contagion
proc/get_infection_candidates() proc/get_infection_candidates()
var/list/candidates[0] var/list/candidates[0]
for(var/mob/M in player_list) for(var/mob/M in player_list)
if (!M.is_mechanical() && M.is_ready()) if (M.is_ready() && !M.is_mechanical())
candidates.Add(M) candidates.Add(M)
return candidates return candidates

2
code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
View File

@@ -8,7 +8,7 @@ datum/directive/terminations/financial_crisis/get_crew_to_terminate()
var/list/civilians[0] var/list/civilians[0]
var/list/candidates = civilian_positions - "Head of Personnel" var/list/candidates = civilian_positions - "Head of Personnel"
for(var/mob/M in player_list) 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.Add(M) civilians.Add(M)
return civilians return civilians

4
code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
View File

@@ -16,14 +16,14 @@ datum/directive/ipc_virus
proc/get_ipcs() proc/get_ipcs()
var/list/machines[0] var/list/machines[0]
for(var/mob/M in player_list) for(var/mob/M in player_list)
if (M.get_species() == "Machine" && M.is_ready()) if (M.is_ready() && M.get_species() == "Machine")
machines.Add(M) machines.Add(M)
return machines return machines
proc/get_roboticists() proc/get_roboticists()
var/list/roboticists[0] var/list/roboticists[0]
for(var/mob/M in player_list) 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.Add(M) roboticists.Add(M)
return roboticists return roboticists

2
code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
View File

@@ -10,7 +10,7 @@ datum/directive/research_to_ripleys
proc/get_researchers() proc/get_researchers()
var/list/researchers[0] var/list/researchers[0]
for(var/mob/M in player_list) for(var/mob/M in player_list)
if (is_researcher(M) && M.is_ready()) if (M.is_ready() && is_researcher(M))
researchers.Add(M) researchers.Add(M)
return researchers return researchers

4
code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
View File

@@ -13,7 +13,7 @@ datum/directive/tau_ceti_needs_women
proc/get_crew_of_target_gender() proc/get_crew_of_target_gender()
var/list/targets[0] var/list/targets[0]
for(var/mob/M in player_list) 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.Add(M) targets.Add(M)
return targets return targets
@@ -63,7 +63,7 @@ datum/directive/tau_ceti_needs_women/meets_prerequisites()
var/females = 0 var/females = 0
var/males = 0 var/males = 0
for(var/mob/M in player_list) 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() var/gender = M.get_gender()
if(gender == MALE) if(gender == MALE)
males++ males++