diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 84513bef214..e328aa3a773 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -5,7 +5,7 @@ faction = "Station" total_positions = -1 spawn_positions = -1 - + supervisors = "absolutely everyone" equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job/captian.dm b/code/game/jobs/job/captian.dm index 62982db550a..d570a6176ba 100644 --- a/code/game/jobs/job/captian.dm +++ b/code/game/jobs/job/captian.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "Nanotrasen officials and Space law" equip(var/mob/living/carbon/human/H) @@ -32,6 +33,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the captain" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index fac3a9671ff..58949c45eec 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -11,6 +11,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -34,6 +35,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -53,6 +55,7 @@ faction = "Station" total_positions = 3 spawn_positions = 2 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -74,6 +77,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -95,6 +99,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 + supervisors = "the quartermaster and the head of personnel" equip(var/mob/living/carbon/human/H) @@ -114,6 +119,7 @@ faction = "Station" total_positions = 3 spawn_positions = 3 + supervisors = "the quartermaster and the head of personnel" equip(var/mob/living/carbon/human/H) @@ -137,6 +143,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -164,6 +171,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -196,6 +204,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -215,6 +224,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) @@ -234,6 +244,7 @@ var/global/lawyer = 0//Checks for another lawyer faction = "Station" total_positions = 2 spawn_positions = 2 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index 5a84c6a8553..93fa0840423 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -6,6 +6,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of personnel" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index f1e442ffbfb..c5b159aaef6 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the captain" equip(var/mob/living/carbon/human/H) @@ -28,6 +29,7 @@ faction = "Station" total_positions = 5 spawn_positions = 5 + supervisors = "the chief engineer" equip(var/mob/living/carbon/human/H) @@ -51,6 +53,7 @@ faction = "Station" total_positions = 3 spawn_positions = 2 + supervisors = "the chief engineer" equip(var/mob/living/carbon/human/H) @@ -72,6 +75,7 @@ faction = "Station" total_positions = 2 spawn_positions = 1 + supervisors = "the chief engineer and research director" equip(var/mob/living/carbon/human/H) if(!H) return 0 diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm index e94dec88ebc..c8ae0945866 100644 --- a/code/game/jobs/job/job.dm +++ b/code/game/jobs/job/job.dm @@ -1,19 +1,26 @@ /datum/job - var - //The name of the job - title = "NOPE" - //Bitflags for the job - flag = 0 - department_flag = 0 - //Players will be allowed to spawn in as jobs that are set to "Station" - faction = "None" - //How many players can be this job - total_positions = 0 - //How many players can spawn in as this job - spawn_positions = 0 - //How many players have this job - current_positions = 0 + //The name of the job + var/title = "NOPE" - proc/equip(var/mob/living/carbon/human/H) - return 1 + //Bitflags for the job + var/flag = 0 + var/department_flag = 0 + + //Players will be allowed to spawn in as jobs that are set to "Station" + var/faction = "None" + + //How many players can be this job + var/total_positions = 0 + + //How many players can spawn in as this job + var/spawn_positions = 0 + + //How many players have this job + var/current_positions = 0 + + //Supervisors, who this person answers to directly + var/supervisors = "" + +/datum/job/proc/equip(var/mob/living/carbon/human/H) + return 1 diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 24ae2576f99..46484f681d2 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the captain" equip(var/mob/living/carbon/human/H) @@ -28,6 +29,7 @@ faction = "Station" total_positions = 5 spawn_positions = 3 + supervisors = "the chief medical officer" equip(var/mob/living/carbon/human/H) @@ -51,6 +53,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 + supervisors = "the chief medical officer and research director" equip(var/mob/living/carbon/human/H) @@ -73,6 +76,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the chief medical officer and research director" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 62d13733105..2aa27c4eadf 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the captain" equip(var/mob/living/carbon/human/H) @@ -26,6 +27,7 @@ faction = "Station" total_positions = 5 spawn_positions = 3 + supervisors = "the research director" equip(var/mob/living/carbon/human/H) @@ -48,6 +50,7 @@ faction = "Station" total_positions = 2 spawn_positions = 2 + supervisors = "the chief medical officer and the research director" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 2745df9a3fb..c6c6631fb96 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -5,6 +5,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the captain" equip(var/mob/living/carbon/human/H) @@ -36,6 +37,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of security" equip(var/mob/living/carbon/human/H) @@ -65,6 +67,7 @@ faction = "Station" total_positions = 1 spawn_positions = 1 + supervisors = "the head of security" equip(var/mob/living/carbon/human/H) @@ -102,6 +105,7 @@ faction = "Station" total_positions = 5 spawn_positions = 5 + supervisors = "the head of security" equip(var/mob/living/carbon/human/H) diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm index dcd631c9ee3..162ce911d77 100644 --- a/code/game/jobs/job_controller.dm +++ b/code/game/jobs/job_controller.dm @@ -209,6 +209,7 @@ var/global/datum/controller/occupations/job_master spawnId(H,rank) H << "You are the [rank]." + H << "As the [rank] you answer directly to [job.supervisors]. Special circumstances may change this." H.job = rank if(H.mind) H.mind.assigned_role = rank