cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts Supervisors Variable into Defines (mostly) (#68883)

Browse Source 
* Converts Supervisors Variable into Defines (mostly)

Hey there,

We used this naming scheme pretty consistently throughout the majority of the jobs, so I decided to go through and make a quick define macro for all of the generic ones. This doesn't cover the Captain, Silicons, Assistants, Psychologists, and Security Officers, since they all have their own custom entry field (which will continue to be supported). This should help with the broad number of them though.

* grammar update

consistency's sake
This commit is contained in:
san7890
2022-08-02 01:34:06 -04:00
committed by GitHub
parent d15ac36961
commit d17e8d33be
32 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/jobs.dm
+9 -1
View File
@@ -180,6 +180,14 @@
/// Whether this job can be an intern.
#define JOB_CAN_BE_INTERN (1<<8)
#define FACTION_NONE "None"
#define FACTION_STATION "Station"
// Variable macros used to declare who is the supervisor for a given job, announced to the player when they join as any given job.
#define SUPERVISOR_CAPTAIN "the Captain"
#define SUPERVISOR_CE "the Chief Engineer"
#define SUPERVISOR_CMO "the Chief Medical Officer"
#define SUPERVISOR_HOP "the Head of Personnel"
#define SUPERVISOR_HOS "the Head of Security"
#define SUPERVISOR_QM "the Quartermaster"
#define SUPERVISOR_RD "the Research Director"
code/modules/jobs/job_types/atmospheric_technician.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the chief engineer"
supervisors = SUPERVISOR_CE
selection_color = "#fff5cc"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/bartender.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/botanist.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/captain.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "Nanotrasen officials and Space law"
supervisors = "Nanotrasen officials and Space Law"
selection_color = "#ccccff"
req_admin_notify = 1
minimal_player_age = 14
code/modules/jobs/job_types/cargo_technician.dm
+1 -1
View File
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 2
supervisors = "the quartermaster"
supervisors = SUPERVISOR_QM
selection_color = "#dcba97"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/chaplain.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/chemist.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer"
supervisors = SUPERVISOR_CMO
selection_color = "#ffeef0"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/chief_engineer.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
supervisors = SUPERVISOR_CAPTAIN
selection_color = "#ffeeaa"
req_admin_notify = 1
minimal_player_age = 7
code/modules/jobs/job_types/chief_medical_officer.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
supervisors = SUPERVISOR_CAPTAIN
selection_color = "#ffddf0"
req_admin_notify = 1
minimal_player_age = 7
code/modules/jobs/job_types/clown.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/cook.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
var/cooks = 0 //Counts cooks amount
code/modules/jobs/job_types/curator.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/detective.dm
+1 -1
View File
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of security"
supervisors = SUPERVISOR_HOS
selection_color = "#ffeeee"
minimal_player_age = 7
exp_requirements = 300
code/modules/jobs/job_types/geneticist.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the research director"
supervisors = SUPERVISOR_RD
selection_color = "#ffeeff"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/head_of_personnel.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
supervisors = SUPERVISOR_HOP
selection_color = "#ddddff"
req_admin_notify = 1
minimal_player_age = 10
code/modules/jobs/job_types/head_of_security.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
supervisors = SUPERVISOR_CAPTAIN
selection_color = "#ffdddd"
req_admin_notify = 1
minimal_player_age = 14
code/modules/jobs/job_types/janitor.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/lawyer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/medical_doctor.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
supervisors = "the chief medical officer"
supervisors = SUPERVISOR_CMO
selection_color = "#ffeef0"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/mime.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel"
supervisors = SUPERVISOR_HOP
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/paramedic.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the chief medical officer"
supervisors = SUPERVISOR_CMO
selection_color = "#ffeef0"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/psychologist.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of personnel and the chief medical officer"
supervisors = "the Head of Personnel and the Chief Medical Officer"
selection_color = "#bbe291"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/quartermaster.dm
+1 -1
View File
@@ -9,7 +9,7 @@
total_positions = 1
spawn_positions = 1
minimal_player_age = 7
supervisors = "the captain"
supervisors = SUPERVISOR_CAPTAIN
selection_color = "#d7b088"
exp_required_type_department = EXP_TYPE_SUPPLY
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/research_director.dm
+1 -1
View File
@@ -9,7 +9,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the captain"
supervisors = SUPERVISOR_CAPTAIN
selection_color = "#ffddff"
req_admin_notify = 1
minimal_player_age = 7
code/modules/jobs/job_types/roboticist.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 2
spawn_positions = 2
supervisors = "the research director"
supervisors = SUPERVISOR_RD
selection_color = "#ffeeff"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/scientist.dm
+1 -1
View File
@@ -5,7 +5,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 3
supervisors = "the research director"
supervisors = SUPERVISOR_RD
selection_color = "#ffeeff"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/security_officer.dm
+1 -1
View File
@@ -7,7 +7,7 @@
faction = FACTION_STATION
total_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
spawn_positions = 5 //Handled in /datum/controller/occupations/proc/setup_officer_positions()
supervisors = "the head of security, and the head of your assigned department (if applicable)"
supervisors = "the Head of Security, and the head of your assigned department (if applicable)"
selection_color = "#ffeeee"
minimal_player_age = 7
exp_requirements = 300
code/modules/jobs/job_types/shaft_miner.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 3
spawn_positions = 3
supervisors = "the quartermaster"
supervisors = SUPERVISOR_QM
selection_color = "#dcba97"
exp_granted_type = EXP_TYPE_CREW
code/modules/jobs/job_types/station_engineer.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 5
spawn_positions = 5
supervisors = "the chief engineer"
supervisors = SUPERVISOR_CE
selection_color = "#fff5cc"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/virologist.dm
+1 -1
View File
@@ -6,7 +6,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the chief medical officer"
supervisors = SUPERVISOR_CMO
selection_color = "#ffeef0"
exp_requirements = 60
exp_required_type = EXP_TYPE_CREW
code/modules/jobs/job_types/warden.dm
+1 -1
View File
@@ -8,7 +8,7 @@
faction = FACTION_STATION
total_positions = 1
spawn_positions = 1
supervisors = "the head of security"
supervisors = SUPERVISOR_HOS
selection_color = "#ffeeee"
minimal_player_age = 7
exp_requirements = 300