mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
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:
@@ -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)
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user