Should fix loading from jobs.txt

The jobs controller's list of occupations was reset during roundstart which completely undid that whole load from file thing.  It also would have undone any admin edits done while sitting in the lobby.

Also fixed a couple instances where people thought that lists get copied with the = operator instead of passing by reference.
This commit is contained in:
Vincent
2015-10-24 19:46:44 -04:00
parent 4b0fdc08b4
commit 3e6f641ec3
3 changed files with 4 additions and 5 deletions
+2 -3
View File
@@ -202,7 +202,6 @@ var/datum/subsystem/job/SSjob
/datum/subsystem/job/proc/DivideOccupations()
//Setup new player list and get the jobs list
Debug("Running DO")
SetupOccupations()
//Holder for Triumvirate is stored in the ticker, this just processes it
if(ticker)
@@ -397,8 +396,8 @@ var/datum/subsystem/job/SSjob
for(var/datum/job/J in occupations)
var/regex = "[J.title]=(-1|\\d+),(-1|\\d+)"
var/datum/regex/results = regex_find(jobstext, regex)
J.total_positions = results.str(2)
J.spawn_positions = results.str(3)
J.total_positions = text2num(results.str(2))
J.spawn_positions = text2num(results.str(3))
/datum/subsystem/job/proc/HandleFeedbackGathering()
for(var/datum/job/job in occupations)