Removes the option to join as random job. (#6886)

This commit is contained in:
Werner
2019-09-08 11:24:42 +02:00
committed by Erki
parent aa15e87049
commit 612bb40e30
5 changed files with 56 additions and 42 deletions
+2 -32
View File
@@ -1,8 +1,7 @@
/var/datum/controller/subsystem/jobs/SSjobs
#define GET_RANDOM_JOB 0
#define BE_ASSISTANT 1
#define RETURN_TO_LOBBY 2
#define BE_ASSISTANT 0
#define RETURN_TO_LOBBY 1
#define Debug(text) if (Debug2) {job_debug += text}
@@ -139,29 +138,6 @@
Debug("FOC pass, Player: [player], Level:[level]")
. += player
/datum/controller/subsystem/jobs/proc/GiveRandomJob(mob/abstract/new_player/player)
Debug("GRJ Giving random job, Player: [player]")
for(var/thing in shuffle(occupations))
var/datum/job/job = thing
if(!job)
continue
if(istype(job, GetJob("Assistant"))) // We don't want to give him assistant, that's boring!
continue
if(job in command_positions) //If you want a command position, select it!
continue
if(jobban_isbanned(player, job.title))
Debug("GRJ isbanned failed, Player: [player], Job: [job.title]")
continue
if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
Debug("GRJ Random job given, Player: [player], Job: [job]")
AssignRole(player, job.title)
unassigned -= player
break
/datum/controller/subsystem/jobs/proc/ResetOccupations()
for(var/mob/abstract/new_player/player in player_list)
if((player) && (player.mind))
@@ -306,12 +282,6 @@
unassigned -= player
break
// Hand out random jobs to the people who didn't get any in the last check
// Also makes sure that they got their preference correct
for(var/mob/abstract/new_player/player in unassigned)
if(player.client.prefs.alternate_option == GET_RANDOM_JOB)
GiveRandomJob(player)
Debug("DO, Standard Check end")
Debug("DO, Running AC2")