makes it compile. should work. hopefully

This commit is contained in:
deathride58
2018-07-02 15:35:11 -04:00
parent 6873a7c065
commit f986f9c9f2
19 changed files with 37 additions and 32 deletions
+5 -2
View File
@@ -362,7 +362,7 @@ SUBSYSTEM_DEF(job)
var/allowed_to_be_a_loser = !jobban_isbanned(player, SSjob.overflow_role)
if(QDELETED(player) || !allowed_to_be_a_loser)
RejectPlayer(player)
else
else
if(!AssignRole(player, SSjob.overflow_role))
RejectPlayer(player)
else if(player.client.prefs.joblessrole == BERANDOMJOB)
@@ -437,7 +437,10 @@ SUBSYSTEM_DEF(job)
to_chat(M, "<FONT color='blue'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></font>")
if(job && H)
if(job.dresscodecompliant)// CIT CHANGE - dress code compliance
equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
job.after_spawn(H, M, joined_late) // note: this happens before the mob has a key! M will always have a client, H might not.
equip_loadout(N, H, TRUE)//CIT CHANGE - makes players spawn with in-backpack loadout items properly. A little hacky but it works
return H
@@ -631,4 +634,4 @@ SUBSYSTEM_DEF(job)
. |= player.mind
/datum/controller/subsystem/job/proc/JobDebug(message)
log_job_debug(message)
log_job_debug(message)
+3
View File
@@ -512,6 +512,9 @@ SUBSYSTEM_DEF(timer)
return TRUE
return FALSE
/datum/controller/subsystem/timer/proc/tump_buckets()
reset_buckets()
SSticker.tumpedbuckets = TRUE
#undef BUCKET_LEN
#undef BUCKET_POS