Skip to content

Commit

Permalink
reeeeeeeeeeeeeeeee
Browse files Browse the repository at this point in the history
  • Loading branch information
tichys committed Oct 23, 2020
1 parent 4a9f315 commit f820ed4
Show file tree
Hide file tree
Showing 38 changed files with 72,688 additions and 300,764 deletions.
17,470 changes: 9,142 additions & 8,328 deletions _maps/map_files/Mining/Lavaland.dmm

Large diffs are not rendered by default.

251 changes: 134 additions & 117 deletions _maps/map_files/Pahrump/Dungeons.dmm

Large diffs are not rendered by default.

887 changes: 441 additions & 446 deletions _maps/map_files/Pahrump/Pahrump.dmm

Large diffs are not rendered by default.

173,250 changes: 5,474 additions & 167,776 deletions _maps/map_files/Pahrump/Pahrump_Original.dmm

Large diffs are not rendered by default.

67,260 changes: 0 additions & 67,260 deletions _maps/map_files/PossumMap/Dungeons.dmm

This file was deleted.

773 changes: 511 additions & 262 deletions _maps/map_files/StJeromes/StJeromesValley.dmm

Large diffs are not rendered by default.

1,327 changes: 378 additions & 949 deletions _maps/map_files/debug/runtimestation.dmm

Large diffs are not rendered by default.

110,929 changes: 55,480 additions & 55,449 deletions _maps/map_files/generic/City_of_Cogs.dmm

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions code/__HELPERS/sanitize_values.dm
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,9 @@
HSL[3] = min(HSL[3],0.4)
var/list/RGB = hsl2rgb(arglist(HSL))
return "#[num2hex(RGB[1],2)][num2hex(RGB[2],2)][num2hex(RGB[3],2)]"

/proc/sanitize_color(color)
var/list/HSL = rgb2hsl(hex2num(copytext(color,2,4)),hex2num(copytext(color,4,6)),hex2num(copytext(color,6,8)))
HSL[3] = min(HSL[3],0.4)
var/list/RGB = hsl2rgb(arglist(HSL))
return "#[num2hex(RGB[1],2)][num2hex(RGB[2],2)][num2hex(RGB[3],2)]"
23 changes: 16 additions & 7 deletions code/controllers/subsystem/job.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ SUBSYSTEM_DEF(job)
var/list/type_occupations = list() //Dict of all jobs, keys are types
var/list/unassigned = list() //Players who need jobs
var/initial_players_to_assign = 0 //used for checking against population caps
var/list/factionless_jobs = list()

var/list/prioritized_jobs = list()
var/list/latejoin_trackers = list() //Don't read this list, use GetLateJoinTurfs() instead

var/overflow_role = "Assistant"
var/overflow_role = "Wastelander" //CHANGE

var/list/level_order = list(JP_HIGH,JP_MEDIUM,JP_LOW)

Expand Down Expand Up @@ -43,28 +44,36 @@ SUBSYSTEM_DEF(job)
/datum/controller/subsystem/job/proc/SetupOccupations(faction = "Station")
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)

if(!all_jobs.len)
to_chat(world, "<span class='boldannounce'>Error setting up jobs, no job datums found</span>")
return 0

for(var/J in all_jobs)
var/datum/job/job = new J()

if(!job)
continue
if(job.faction != faction)
continue
if(!job.config_check())

//if(job.faction != faction) //TGCLAW Change: Any faction can now join and have the appropriate faction tag IE BoS and Den -ma44
// continue

if(job.faction == "None") //This is checked later for map config
factionless_jobs[job.title] = job
continue
if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new
testing("Removed [job.type] due to map config");

if(!job.config_check()) //Checks for AI allowed and shit. Barely used
continue

// if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new (obsolete)
// testing("Removed [job.type] due to map config");
// continue
occupations += job
name_occupations[job.title] = job
type_occupations[J] = job

return 1


/datum/controller/subsystem/job/proc/GetJob(rank)
RETURN_TYPE(/datum/job)
if(!occupations.len)
Expand Down
Loading

0 comments on commit f820ed4

Please sign in to comment.