cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 01:53:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #447 from Bone-White/master

Browse Source 
Civilian round-start fix (2)
This commit is contained in:
Fox-McCloud
2014-10-27 22:56:55 -04:00
parent 5322d94be8 6cd660874c
commit 28b752b502
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/jobs/job/civilian.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/datum/job/civilian
title = "Civilian"
flag = CIVILIAN
department_flag = CIVILIAN
department_flag = SUPPORT
total_positions = -1
spawn_positions = -1
supervisors = "absolutely everyone"
code/game/jobs/job_controller.dm
+2 -4
View File
@@ -100,7 +100,7 @@ var/global/datum/controller/occupations/job_master
Debug("Running FOC, Job: [job], Level: [level], Flag: [flag]")
var/list/candidates = list()
for(var/mob/new_player/player in unassigned)
//Debug("Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Special: [flag && (!player.client.prefs.be_special & flag)] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
Debug(" - Player: [player] Banned: [jobban_isbanned(player, job.title)] Old Enough: [!job.player_old_enough(player.client)] Flag && Be Special: [flag] && [player.client.prefs.be_special] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Flag: [job.flag] Job Department Flag = [job.department_flag]")
if(jobban_isbanned(player, job.title))
Debug("FOC isbanned failed, Player: [player]")
continue
@@ -113,9 +113,6 @@ var/global/datum/controller/occupations/job_master
if(player.client.prefs.GetJobDepartment(job, level) & job.flag)
Debug("FOC pass, Player: [player], Level:[level]")
candidates += player
else if(job.flag == CIVILIAN)
Debug("FOC pass, Player: [player], Level: **Civilian Autopass**")
candidates += player
return candidates
proc/GiveRandomJob(var/mob/new_player/player)
@@ -335,6 +332,7 @@ var/global/datum/controller/occupations/job_master
// If the job isn't filled
if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
Debug("DO pass, Player: [player], Level:[level], Job:[job.title]")
Debug(" - Job Flag: [job.flag] Job Department: [player.client.prefs.GetJobDepartment(job, level)] Job Current Pos: [job.current_positions] Job Spawn Positions = [job.spawn_positions]")
AssignRole(player, job.title)
unassigned -= player
break
code/global.dm
+1 -1
View File
@@ -201,7 +201,7 @@ var/list/adminlog = list()
var/list/powernets = list()
var/Debug = 0 // global debug switch
var/Debug2 = 0
var/Debug2 = 1 // enables detailed job debug file in secrets
var/datum/debug/debugobj