Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the virologist (I accidentally nuked the last one) #9901

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion _maps/RandomRuins/SpaceRuins/Fast_Food.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions _maps/map_files/BoxStation/BoxStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions _maps/map_files/CorgStation/CorgStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions _maps/map_files/FlandStation/FlandStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions _maps/map_files/KiloStation/KiloStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions _maps/map_files/MetaStation/MetaStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions _maps/map_files/RadStation/RadStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2721,7 +2721,6 @@
#include "code\modules\jobs\job_types\security_officer.dm"
#include "code\modules\jobs\job_types\shaft_miner.dm"
#include "code\modules\jobs\job_types\station_engineer.dm"
#include "code\modules\jobs\job_types\virologist.dm"
#include "code\modules\jobs\job_types\warden.dm"
#include "code\modules\keybindings\bindings_atom.dm"
#include "code\modules\keybindings\bindings_client.dm"
Expand Down
31 changes: 13 additions & 18 deletions code/__DEFINES/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
#define CMO_JF (1<<4)
#define DOCTOR (1<<5)
#define GENETICIST (1<<6)
#define VIROLOGIST (1<<7)
#define PARAMEDIC (1<<8)
#define PARAMEDIC (1<<7)


#define CIVILIAN (1<<2)
Expand Down Expand Up @@ -86,19 +85,18 @@
#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
#define JOB_DISPLAY_ORDER_CHEMIST 21
#define JOB_DISPLAY_ORDER_GENETICIST 22
#define JOB_DISPLAY_ORDER_VIROLOGIST 23
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
#define JOB_DISPLAY_ORDER_SCIENTIST 25
#define JOB_DISPLAY_ORDER_EXPLORATION 26
#define JOB_DISPLAY_ORDER_ROBOTICIST 27
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 28
#define JOB_DISPLAY_ORDER_WARDEN 29
#define JOB_DISPLAY_ORDER_DETECTIVE 30
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 31
#define JOB_DISPLAY_ORDER_BRIG_PHYS 32
#define JOB_DISPLAY_ORDER_DEPUTY 33
#define JOB_DISPLAY_ORDER_AI 34
#define JOB_DISPLAY_ORDER_CYBORG 35
#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 23
#define JOB_DISPLAY_ORDER_SCIENTIST 24
#define JOB_DISPLAY_ORDER_EXPLORATION 25
#define JOB_DISPLAY_ORDER_ROBOTICIST 26
#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
#define JOB_DISPLAY_ORDER_WARDEN 28
#define JOB_DISPLAY_ORDER_DETECTIVE 29
#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
#define JOB_DISPLAY_ORDER_BRIG_PHYS 31
#define JOB_DISPLAY_ORDER_DEPUTY 32
#define JOB_DISPLAY_ORDER_AI 33
#define JOB_DISPLAY_ORDER_CYBORG 34


#define DEPT_BITFLAG_COM (1<<0)
Expand Down Expand Up @@ -160,7 +158,6 @@
#define JOB_NAME_MEDICALDOCTOR "Medical Doctor"
#define JOB_NAME_PARAMEDIC "Paramedic"
#define JOB_NAME_CHEMIST "Chemist"
#define JOB_NAME_VIROLOGIST "Virologist"
#define JOB_NAME_GENETICIST "Geneticist"
#define JOB_NAME_BRIGPHYSICIAN "Brig Physician"
#define JOB_NAME_PSYCHIATRIST "Psychiatrist" // gimmick
Expand Down Expand Up @@ -255,7 +252,6 @@
#define JOB_HUD_CHEIFMEDICALOFFICIER "chiefmedicalofficer"
#define JOB_HUD_MEDICALDOCTOR "medicaldoctor"
#define JOB_HUD_PARAMEDIC "paramedic"
#define JOB_HUD_VIROLOGIST "virologist"
#define JOB_HUD_CHEMIST "chemist"
#define JOB_HUD_GENETICIST "geneticist"
#define JOB_HUD_PSYCHIATRIST "psychiatrist"
Expand Down Expand Up @@ -329,7 +325,6 @@
#define JOB_CHATCOLOR_CHEIFMEDICALOFFICIER "#7A97DA"
#define JOB_CHATCOLOR_MEDICALDOCTOR "#6CB1C5"
#define JOB_CHATCOLOR_PARAMEDIC "#8FBEB4"
#define JOB_CHATCOLOR_VIROLOGIST "#75AEA3"
#define JOB_CHATCOLOR_CHEMIST "#82BDCE"
#define JOB_CHATCOLOR_GENETICIST "#83BBBF"
#define JOB_CHATCOLOR_PSYCHIATRIST "#A2DFDC"
Expand Down
3 changes: 0 additions & 3 deletions code/__HELPERS/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
JOB_NAME_CHIEFMEDICALOFFICER = "cmo",
JOB_NAME_MEDICALDOCTOR = "med",
JOB_NAME_PARAMEDIC = "paramed",
JOB_NAME_VIROLOGIST = "viro",
JOB_NAME_GENETICIST = "gene",
JOB_NAME_CHEMIST = "chemist",
JOB_NAME_PSYCHIATRIST = "med",
Expand Down Expand Up @@ -121,7 +120,6 @@ GLOBAL_LIST_INIT(id_to_hud, list(
JOB_NAME_CHIEFMEDICALOFFICER = JOB_HUD_CHEIFMEDICALOFFICIER,
JOB_NAME_MEDICALDOCTOR = JOB_HUD_MEDICALDOCTOR,
JOB_NAME_PARAMEDIC = JOB_HUD_PARAMEDIC,
JOB_NAME_VIROLOGIST = JOB_HUD_VIROLOGIST,
JOB_NAME_CHEMIST = JOB_HUD_CHEMIST,
JOB_NAME_GENETICIST = JOB_HUD_GENETICIST,
JOB_NAME_PSYCHIATRIST = JOB_HUD_PSYCHIATRIST,
Expand Down Expand Up @@ -222,7 +220,6 @@ GLOBAL_LIST_INIT(command_huds, list(
JOB_HUD_CHEIFMEDICALOFFICIER = JOB_CHATCOLOR_CHEIFMEDICALOFFICIER,
JOB_HUD_MEDICALDOCTOR = JOB_CHATCOLOR_MEDICALDOCTOR,
JOB_HUD_PARAMEDIC = JOB_CHATCOLOR_PARAMEDIC,
JOB_HUD_VIROLOGIST = JOB_CHATCOLOR_VIROLOGIST,
JOB_HUD_CHEMIST = JOB_CHATCOLOR_CHEMIST,
JOB_HUD_GENETICIST = JOB_CHATCOLOR_GENETICIST,
JOB_HUD_PSYCHIATRIST = JOB_CHATCOLOR_PSYCHIATRIST,
Expand Down
4 changes: 2 additions & 2 deletions code/datums/diseases/advance/advance.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*

Advance Disease is a system for Virologist to Engineer their own disease with symptoms that have effects and properties
Advance Disease is a system for CMOS to Engineer their own disease with symptoms that have effects and properties
which add onto the overall disease.

If you need help with creating new symptoms or expanding the advance disease, ask for Giacom on #coderbus.
Expand All @@ -17,7 +17,7 @@
*/

/datum/disease/advance
name = "Unknown" // We will always let our Virologist name our disease.
name = "Unknown" // We will always let our CMO name our disease.
desc = "An engineered disease which can contain a multitude of symptoms."
form = "Advance Disease" // Will let med-scanners know that this disease was engineered.
agent = "advance microbes"
Expand Down
2 changes: 1 addition & 1 deletion code/datums/diseases/advance/symptoms/flesh_eating.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Bonus
/datum/symptom/flesh_death

name = "Autophagocytosis Necrosis"
desc = "The virus rapidly consumes infected cells, leading to heavy and widespread damage. Contains dormant prions- expert virologists believe it to be the precursor to Romerol, though the mechanism through which they are activated is largely unknown"
desc = "The virus rapidly consumes infected cells, leading to heavy and widespread damage. Contains dormant prions- expert epidemiologists believe it to be the precursor to Romerol, though the mechanism through which they are activated is largely unknown"
stealth = -2
resistance = -2
stage_speed = 1
Expand Down
2 changes: 0 additions & 2 deletions code/datums/traits/negative_quirk.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@
heirloom_type = pick(/obj/item/bodybag)
if(JOB_NAME_CHEMIST)
heirloom_type = /obj/item/reagent_containers/glass/chem_heirloom
if(JOB_NAME_VIROLOGIST)
heirloom_type = /obj/item/reagent_containers/dropper
if(JOB_NAME_GENETICIST)
heirloom_type = /obj/item/clothing/under/shorts/purple
//Engineering
Expand Down
4 changes: 1 addition & 3 deletions code/game/machinery/PDApainter.dm
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
"Medical: Chemist" = "pda-chemistry",
"Medical: Paramedic" = "pda-paramedical",
"Medical: Geneticist" = "pda-genetics",
"Medical: Virologist" = "pda-virology",
"Security (Standard)" = "pda-security",
"Security: Head of Security" = "pda-hos",
"Security: Warden" = "pda-warden",
Expand Down Expand Up @@ -252,8 +251,7 @@
"----Cargo----","Cargo (Custom)",JOB_NAME_QUARTERMASTER, JOB_NAME_CARGOTECHNICIAN,JOB_NAME_SHAFTMINER,
"----Engineering----","Engineering (Custom)",JOB_NAME_CHIEFENGINEER, JOB_NAME_STATIONENGINEER, JOB_NAME_ATMOSPHERICTECHNICIAN,
"----Science----","Science (Custom)",JOB_NAME_RESEARCHDIRECTOR, JOB_NAME_SCIENTIST, JOB_NAME_ROBOTICIST, JOB_NAME_EXPLORATIONCREW,
"----Medical----","Medical (Custom)",JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST,
JOB_NAME_VIROLOGIST, JOB_NAME_PARAMEDIC, JOB_NAME_PSYCHIATRIST,
"----Medical----","Medical (Custom)",JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_PARAMEDIC, JOB_NAME_PSYCHIATRIST,
"----Security----","Security (Custom)",JOB_NAME_HEADOFSECURITY, JOB_NAME_WARDEN, JOB_NAME_DETECTIVE, JOB_NAME_SECURITYOFFICER,
JOB_NAME_BRIGPHYSICIAN, JOB_NAME_DEPUTY,
"----MISC----","Unassigned",JOB_NAME_PRISONER
Expand Down
1 change: 0 additions & 1 deletion code/game/machinery/computer/crew.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
JOB_HUD_CHEIFMEDICALOFFICIER = 20,
JOB_HUD_CHEMIST = 21,
JOB_HUD_GENETICIST = 22,
JOB_HUD_VIROLOGIST = 23,
JOB_HUD_MEDICALDOCTOR = 24,
JOB_HUD_PARAMEDIC = 25,
JOB_HUD_PSYCHIATRIST = 26,
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/effects/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark)
name = "Chief Medical Officer"
icon_state = "Chief Medical Officer"

/obj/effect/landmark/start/virologist
name = "Virologist"
icon_state = "Virologist"

/obj/effect/landmark/start/chaplain
name = "Chaplain"
icon_state = "Chaplain"
Expand Down
Loading