Get the code running on 510

* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
This commit is contained in:
Bjorn Neergaard
2016-02-04 17:19:40 -06:00
parent ba699024ab
commit 063dd9fb84
73 changed files with 138 additions and 836 deletions
+4 -4
View File
@@ -428,10 +428,10 @@ var/datum/subsystem/job/SSjob
/datum/subsystem/job/proc/LoadJobs()
var/jobstext = return_file_text("config/jobs.txt")
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 = text2num(results.str(2))
J.spawn_positions = text2num(results.str(3))
var/regex/jobs = regex("[J.title]=(-1|\\d+),(-1|\\d+)")
jobs.Find(jobstext)
J.total_positions = text2num(jobs.group[2])
J.spawn_positions = text2num(jobs.group[3])
/datum/subsystem/job/proc/HandleFeedbackGathering()
for(var/datum/job/job in occupations)
+1 -1
View File
@@ -63,7 +63,7 @@ var/datum/subsystem/timer/SStimer
event.thingToCall = thingToCall
event.procToCall = procToCall
event.timeToRun = world.time + wait
event.hash = list2text(args)
event.hash = jointext(args, null)
if(args.len > 4)
event.argList = args.Copy(5)