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 3a260e367df..5aed4ee603f 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)
@@ -34,6 +35,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 5a1271e0ea4..2a598bbda96 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)
@@ -35,6 +36,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -54,6 +56,7 @@
faction = "Station"
total_positions = 3
spawn_positions = 2
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -75,6 +78,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -97,6 +101,7 @@
faction = "Station"
total_positions = 2
spawn_positions = 2
+ supervisors = "the quartermaster and the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -117,6 +122,7 @@
faction = "Station"
total_positions = 3
spawn_positions = 3
+ supervisors = "the quartermaster and the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -141,6 +147,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -168,6 +175,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -199,6 +207,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -218,6 +227,7 @@
faction = "Station"
total_positions = 1
spawn_positions = 1
+ supervisors = "the head of personnel"
equip(var/mob/living/carbon/human/H)
@@ -237,6 +247,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 2a26e147daf..c33deecd11c 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)
@@ -29,6 +30,7 @@
faction = "Station"
total_positions = 5
spawn_positions = 5
+ supervisors = "the chief engineer"
equip(var/mob/living/carbon/human/H)
@@ -53,6 +55,7 @@
faction = "Station"
total_positions = 3
spawn_positions = 2
+ supervisors = "the chief engineer"
equip(var/mob/living/carbon/human/H)
@@ -75,6 +78,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 24096fcdb1a..8e1db23afcd 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)
@@ -29,6 +30,7 @@
faction = "Station"
total_positions = 5
spawn_positions = 3
+ supervisors = "the chief medical officer"
equip(var/mob/living/carbon/human/H)
@@ -53,6 +55,7 @@
faction = "Station"
total_positions = 2
spawn_positions = 2
+ supervisors = "the chief medical officer and research director"
equip(var/mob/living/carbon/human/H)
@@ -76,6 +79,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 283501e2ca8..c54b3e7a86c 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 7bc066e7649..0d4e17ccaa8 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)
@@ -67,6 +69,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 df35f882a3d..d5871a94223 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -205,6 +205,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
diff --git a/html/changelog.html b/html/changelog.html
index f6c23d072ec..b279f8bd883 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -63,6 +63,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
+17 December 2011
+
+ - Erro updated:
+
+ - Your direct supervisors are now displayed when you are assigned a job at round start or late join.
+
+
+
+
14 December 2011