Fixed the rev end round message reporting everyone as dead.

Reverted the assistant job-priority update as it apparently causes runtimes WHERE THEY SHOULDN'T EXIST

for(var/occ in assistant_occupations)
	if(assistant_occupations[occ])

HOW DOES THAT PRODUCE AN INDEX OUT OF BOUNDS ERROR
HOWWWWWWWWWWWWW

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2094 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2011-09-03 08:26:08 +00:00
parent 4d55d107cb
commit db3a2988aa
3 changed files with 14 additions and 21 deletions
+11 -7
View File
@@ -345,9 +345,11 @@
var/list/names = new
for(var/datum/mind/i in revolutionaries)
if(i.current)
var/hstatus = "Dead"
if((i.current.z != 1) && (i.current.stat!=2))
hstatus = "Abandoned the station"
var/hstatus = ""
if(i.current.stat == 2)
hstatus = " Dead"
else if(i.current.z != 1)
hstatus = " Abandoned the station"
names += i.current.real_name + " [hstatus]"
else
names += "[i.key] (character destroyed)"
@@ -368,10 +370,12 @@
var/list/names = new
for(var/datum/mind/i in heads)
if(i.current)
var/hstatus = "Dead"
if((i.current.z != 1) && (i.current.stat!=2))
hstatus = "Abandoned the station"
names += i.current.real_name + " [hstatus] " + ((i in targets)?"(target)":"")
var/hstatus = ""
if(i.current.stat == 2)
hstatus = " Dead"
else if(i.current.z != 1)
hstatus = " Abandoned the station"
names += i.current.real_name + " [hstatus]" + ((i in targets)?"(target)":"")
else
names += "[i.key] (character destroyed)" + ((i in targets)?"(target)":"")
if (heads.len!=0)
+2 -9
View File
@@ -83,9 +83,7 @@
if (unassigned.len == 0)
break
var/list/candidates = FindOccupationCandidates(unassigned, occupation, level)
while (candidates.len && assistant_occupations[occupation])
assistant_occupations[occupation]--
var/mob/new_player/candidate = pick_n_take(candidates)
for (var/mob/new_player/candidate in candidates)
candidate.mind.assigned_role = occupation
unassigned -= candidate
//Now everyone else
@@ -118,12 +116,7 @@
for(var/mob/new_player/player in unassigned)
if (unassigned.len == 0)
break
var/list/occupationsPossible = list()
for(var/occ in assistant_occupations)
if(assistant_occupations[occ])
occupationsPossible += assistant_occupations[occ]
player.mind.assigned_role = pick(occupationsPossible)
assistant_occupations[player.mind.assigned_role]--
player.mind.assigned_role = pick(assistant_occupations)
return 1
+1 -5
View File
@@ -336,11 +336,7 @@ var/list/occupations = list(
)
var/list/assistant_occupations = list(
"Assistant" = -1, //infinite assistants
"Chaplain" = 1,
"Librarian" = 1,
"Lawyer" = 1,
"Atmospheric Technician" = 4,
"Assistant",
//"Tourist", //I am not going to implement these jobs at the moment. Just listed it as examples. --rastaf0
//"Monkey",
//"Prisoneer",