From 977939de22508567a125edbc90e25090de5b2fa3 Mon Sep 17 00:00:00 2001 From: Haliris Date: Sun, 10 Sep 2023 20:35:44 +0200 Subject: [PATCH 1/7] Removes virologist job. Removes the virologist job role and all references of it. --- _maps/RandomRuins/SpaceRuins/Fast_Food.dmm | 1 - _maps/map_files/BoxStation/BoxStation.dmm | 10 +--- _maps/map_files/CorgStation/CorgStation.dmm | 3 - .../map_files/Deltastation/DeltaStation2.dmm | 4 -- _maps/map_files/FlandStation/FlandStation.dmm | 4 -- _maps/map_files/KiloStation/KiloStation.dmm | 3 - _maps/map_files/MetaStation/MetaStation.dmm | 4 -- _maps/map_files/RadStation/RadStation.dmm | 2 - beestation.dme | 1 - code/__DEFINES/jobs.dm | 31 ++++------ code/__HELPERS/jobs.dm | 3 - code/datums/diseases/advance/advance.dm | 4 +- .../diseases/advance/symptoms/flesh_eating.dm | 2 +- code/datums/traits/negative_quirk.dm | 2 - code/game/machinery/PDApainter.dm | 4 +- code/game/machinery/computer/crew.dm | 1 - code/game/objects/effects/landmarks.dm | 4 -- code/game/objects/items/bedsheets.dm | 4 +- code/game/objects/items/cards_ids.dm | 6 -- code/game/objects/items/religion.dm | 2 +- code/game/objects/items/storage/backpack.dm | 4 +- code/game/objects/items/toys.dm | 6 -- code/modules/cargo/packs.dm | 5 +- code/modules/client/loadout/loadout_suit.dm | 4 +- code/modules/clothing/outfits/plasmaman.dm | 9 --- .../crew_objectives/medical_objectives.dm | 4 -- .../modules/events/wizard/departmentrevolt.dm | 2 +- code/modules/jobs/access.dm | 2 +- code/modules/jobs/job_mail.dm | 16 ----- .../jobs/job_types/chief_medical_officer.dm | 4 +- code/modules/jobs/job_types/medical_doctor.dm | 2 +- code/modules/jobs/job_types/virologist.dm | 60 ------------------- code/modules/jobs/jobs.dm | 2 - .../mob/living/silicon/ai/vox_sounds.dm | 1 - .../living/simple_animal/friendly/hamster.dm | 2 +- .../computers/item/role_tablet_presets.dm | 5 -- .../reagents/reagent_containers/bottle.dm | 2 +- code/modules/uplink/uplink_items.dm | 6 +- config/jobs.txt | 1 - strings/ion_laws.json | 1 - strings/medieval_speech.json | 2 - strings/owo_talk.json | 7 +-- strings/phobia.json | 1 - strings/tips.txt | 6 +- strings/valentines.json | 1 - tgui/packages/tgui-panel/chat/renderer.js | 1 - .../tgui-panel/styles/goon/chat-dark.scss | 3 - .../tgui-panel/styles/goon/chat-light.scss | 3 - .../UpdatePaths/Scripts/7550_pdas_to_tabs.txt | 1 - 49 files changed, 43 insertions(+), 215 deletions(-) delete mode 100644 code/modules/jobs/job_types/virologist.dm diff --git a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm index 60a5ec2124166..b3992ba732c51 100644 --- a/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm +++ b/_maps/RandomRuins/SpaceRuins/Fast_Food.dmm @@ -1003,7 +1003,6 @@ /obj/structure/chair/wood/wings{ dir = 8 }, -/obj/item/toy/figure/virologist, /turf/open/floor/plasteel/cafeteria, /area/ruin/space/has_grav/powered/macspace) "Av" = ( diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e87735ce70704..f8eb33ddafefe 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -22308,7 +22308,6 @@ /turf/open/floor/plasteel, /area/science/storage) "eaM" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 4 }, @@ -26918,11 +26917,6 @@ }, /turf/open/floor/plasteel, /area/science/nanite) -"gwt" = ( -/obj/structure/closet/emcloset, -/obj/item/toy/figure/virologist, -/turf/open/floor/plating, -/area/maintenance/aft) "gxm" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -46114,7 +46108,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 1 }, @@ -56239,7 +56232,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, @@ -101779,7 +101771,7 @@ tsY bNd bNd vJz -gwt +clf cfj qwH cmZ diff --git a/_maps/map_files/CorgStation/CorgStation.dmm b/_maps/map_files/CorgStation/CorgStation.dmm index 9fdd35f0f9e2d..d9388868064c6 100644 --- a/_maps/map_files/CorgStation/CorgStation.dmm +++ b/_maps/map_files/CorgStation/CorgStation.dmm @@ -52608,7 +52608,6 @@ /turf/open/floor/plasteel/dark, /area/science/robotics/lab) "rcs" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -53671,7 +53670,6 @@ /turf/open/floor/plasteel, /area/science/shuttle) "rtL" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 1 }, @@ -67810,7 +67808,6 @@ /turf/open/floor/plasteel/dark, /area/hallway/primary/central) "wbI" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light, /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index c89c5a1247a83..3f35e8d0c96ab 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -47047,7 +47047,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -56853,7 +56852,6 @@ /area/crew_quarters/heads/captain) "lbL" = ( /obj/effect/spawner/lootdrop/maintenance/two, -/obj/item/toy/figure/virologist, /obj/structure/closet, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -63508,7 +63506,6 @@ /area/science/server) "nje" = ( /obj/effect/landmark/blobstart, -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 4 }, @@ -70722,7 +70719,6 @@ /turf/open/floor/plasteel, /area/hallway/secondary/service) "pJI" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 1 }, diff --git a/_maps/map_files/FlandStation/FlandStation.dmm b/_maps/map_files/FlandStation/FlandStation.dmm index e4868b67e3722..ea93f671340de 100644 --- a/_maps/map_files/FlandStation/FlandStation.dmm +++ b/_maps/map_files/FlandStation/FlandStation.dmm @@ -3066,7 +3066,6 @@ /turf/open/floor/plasteel/techmaint, /area/maintenance/port/fore) "aLY" = ( -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, @@ -5266,7 +5265,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid, /area/medical/virology) "bkZ" = ( @@ -10038,7 +10036,6 @@ dir = 1; pixel_y = 3 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid/steel, /area/medical/virology) "cGJ" = ( @@ -68979,7 +68976,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid, /area/medical/virology) "rLf" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 6932bc748f61e..0b3135bb23b95 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -45327,7 +45327,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 10 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/showroomfloor, /area/medical/virology) "fas" = ( @@ -72529,7 +72528,6 @@ /obj/effect/turf_decal/stripes/end{ dir = 1 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/showroomfloor, /area/medical/virology) "qDF" = ( @@ -80637,7 +80635,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 6 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/showroomfloor, /area/medical/virology) "tUa" = ( diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a7440ababd37c..f3d676857da7a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -28812,7 +28812,6 @@ /turf/open/floor/plasteel/dark, /area/tcommsat/computer) "dle" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 1 }, @@ -30722,7 +30721,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, @@ -36326,7 +36324,6 @@ /area/maintenance/starboard/fore) "gpX" = ( /obj/structure/closet/l3closet/virology, -/obj/item/toy/figure/virologist, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -43365,7 +43362,6 @@ /turf/open/floor/plasteel/techmaint, /area/science/shuttledock) "jqv" = ( -/obj/effect/landmark/start/virologist, /obj/structure/chair/office/light{ dir = 4 }, diff --git a/_maps/map_files/RadStation/RadStation.dmm b/_maps/map_files/RadStation/RadStation.dmm index f620c692b18cf..91b27578e7089 100644 --- a/_maps/map_files/RadStation/RadStation.dmm +++ b/_maps/map_files/RadStation/RadStation.dmm @@ -30325,7 +30325,6 @@ dir = 8; pixel_y = 3 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid/steel, /area/medical/virology) "jsk" = ( @@ -36343,7 +36342,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/plasteel/grid/steel, /area/medical/virology) "loM" = ( diff --git a/beestation.dme b/beestation.dme index 7413cf204f3fb..29ca9559b7965 100644 --- a/beestation.dme +++ b/beestation.dme @@ -2684,7 +2684,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" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 281ad8ab25e3a..37e88b452b3ce 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -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) @@ -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) @@ -176,7 +174,6 @@ GLOBAL_LIST_INIT(dept_bitflag_to_name, list( #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 @@ -271,7 +268,6 @@ GLOBAL_LIST_INIT(dept_bitflag_to_name, list( #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" @@ -345,7 +341,6 @@ GLOBAL_LIST_INIT(dept_bitflag_to_name, list( #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" diff --git a/code/__HELPERS/jobs.dm b/code/__HELPERS/jobs.dm index b50576932ede8..c6af5c999cd31 100644 --- a/code/__HELPERS/jobs.dm +++ b/code/__HELPERS/jobs.dm @@ -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", @@ -126,7 +125,6 @@ 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, @@ -209,7 +207,6 @@ 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, diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 4b316f1be4a5d..804fa280f2dcd 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -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. @@ -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" diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm index 7b2b4bf33dc54..ecf236b2fb1ae 100644 --- a/code/datums/diseases/advance/symptoms/flesh_eating.dm +++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm @@ -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 diff --git a/code/datums/traits/negative_quirk.dm b/code/datums/traits/negative_quirk.dm index 9428d68dbbb58..ed4b430d53b97 100644 --- a/code/datums/traits/negative_quirk.dm +++ b/code/datums/traits/negative_quirk.dm @@ -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 diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 39251bad41906..c74237b6b06ef 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -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", @@ -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 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 3b6e335252130..c8f6ebeb372ab 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -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, diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 64cf9db346cc3..3cd46e8701d9d 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -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" diff --git a/code/game/objects/items/bedsheets.dm b/code/game/objects/items/bedsheets.dm index ba6ba688e78d9..6ff59dd621cec 100644 --- a/code/game/objects/items/bedsheets.dm +++ b/code/game/objects/items/bedsheets.dm @@ -153,7 +153,7 @@ /obj/item/bedsheet/medical name = "medical blanket" - desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station." + desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization if someone is working in virology." icon_state = "sheetmedical" item_state = "sheetmedical" dream_messages = list("healing", "life", "surgery", "a doctor") @@ -398,7 +398,7 @@ icon_state = "double_sheetmedical" item_state = "sheetmedical" dream_messages = list("healing", "life", "surgery", "a doctor") - desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station." + desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if someone is working in virology." /obj/item/bedsheet/double/cmo name = "double chief medical officer's bedsheet" diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index ba58b6702cfec..36a0cfbaa30e2 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1111,12 +1111,6 @@ update_label("John Doe", "Clowny") assignment = JOB_NAME_PARAMEDIC hud_state = JOB_HUD_PARAMEDIC -/obj/item/card/id/job/virologist - name = "Job card (Med) - Virologist" - icon_state = "viro" - assignment = JOB_NAME_VIROLOGIST - hud_state = JOB_HUD_VIROLOGIST - /obj/item/card/id/job/chemist name = "Job card (Med) - Chemist" icon_state = "chemist" diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 316e537f4ce54..5eda0783b8c57 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -102,7 +102,7 @@ item_state = "banner_medical" lefthand_file = 'icons/mob/inhands/equipment/banners_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/banners_righthand.dmi' - job_loyalties = list(JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_VIROLOGIST, JOB_NAME_PARAMEDIC, JOB_NAME_CHIEFMEDICALOFFICER) + job_loyalties = list(JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_PARAMEDIC, JOB_NAME_CHIEFMEDICALOFFICER) warcry = "No wounds cannot be healed!" /obj/item/banner/medical/mundane diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 52860b184c7e9..28480a323d87a 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -300,8 +300,8 @@ item_state = "satchel-med" /obj/item/storage/backpack/satchel/vir - name = "virologist satchel" - desc = "A sterile satchel with virologist colours." + name = "virology satchel" + desc = "A sterile satchel with virology colours." icon_state = "satchel-vir" item_state = "satchel-vir" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 41c3dd6466be3..dc14e3cf4a94d 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1459,12 +1459,6 @@ toysay = "I am the law!" toysound = 'sound/voice/complionator/dredd.ogg' -/obj/item/toy/figure/virologist - name = "Virologist action figure" - icon_state = "virologist" - toysay = "It's beneficial! Mostly." - toysound = 'sound/ambience/antag/ling_aler.ogg' - /obj/item/toy/figure/warden name = "Warden action figure" icon_state = "warden" diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index f1af71f291ef3..d397bdf892872 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1793,7 +1793,7 @@ /datum/supply_pack/medical/virology name = "Junior Epidemiology Kit" - desc = "Contains the necessary supplies to start an epidemiological research lab. P.A.N.D.E.M.I.C. not included. Comes with a free virologist action figure!" + desc = "Contains the necessary supplies to start an epidemiological research lab. P.A.N.D.E.M.I.C. not included." cost = 1500 max_supply = 4 access = ACCESS_VIROLOGY @@ -1802,8 +1802,7 @@ /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/item/reagent_containers/glass/bottle/synaptizine, - /obj/item/storage/box/beakers, - /obj/item/toy/figure/virologist) + /obj/item/storage/box/beakers,) crate_name = "Junior Epidemiology Kit" dangerous = TRUE diff --git a/code/modules/client/loadout/loadout_suit.dm b/code/modules/client/loadout/loadout_suit.dm index bb283f993e3a2..482b3ec6b0a4b 100644 --- a/code/modules/client/loadout/loadout_suit.dm +++ b/code/modules/client/loadout/loadout_suit.dm @@ -47,7 +47,7 @@ /datum/gear/suit/wintercoat/medical display_name = "medical winter coat" path = /obj/item/clothing/suit/hooded/wintercoat/medical - allowed_roles = list(JOB_NAME_PARAMEDIC, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_VIROLOGIST, JOB_NAME_BRIGPHYSICIAN) + allowed_roles = list(JOB_NAME_PARAMEDIC, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_BRIGPHYSICIAN) /datum/gear/suit/wintercoat/science display_name = "science winter coat" @@ -98,7 +98,7 @@ /datum/gear/suit/oldwintercoat/medical display_name = "nostalgic medical winter coat" path = /obj/item/clothing/suit/hooded/wintercoat/medical/old - allowed_roles = list(JOB_NAME_PARAMEDIC, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_VIROLOGIST, JOB_NAME_BRIGPHYSICIAN) + allowed_roles = list(JOB_NAME_PARAMEDIC, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_BRIGPHYSICIAN) /datum/gear/suit/oldwintercoat/science display_name = "nostalgic science winter coat" diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index 840e0fbe60893..ec34bf1a683e0 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -146,15 +146,6 @@ helmet_variants = list(HELMET_MK2 = /obj/item/clothing/head/helmet/space/plasmaman/mark2/medical, HELMET_PROTECTIVE = /obj/item/clothing/head/helmet/space/plasmaman/protective/medical) -/datum/outfit/plasmaman/virologist - name = "Virology Plasmaman" - - head = /obj/item/clothing/head/helmet/space/plasmaman/viro - uniform = /obj/item/clothing/under/plasmaman/viro - - helmet_variants = list(HELMET_MK2 = /obj/item/clothing/head/helmet/space/plasmaman/mark2/viro, - HELMET_PROTECTIVE = /obj/item/clothing/head/helmet/space/plasmaman/protective/viro) - /datum/outfit/plasmaman/chemist name = "Chemist Plasmaman" diff --git a/code/modules/crew_objectives/medical_objectives.dm b/code/modules/crew_objectives/medical_objectives.dm index c156e4c565135..4908c9305eb77 100644 --- a/code/modules/crew_objectives/medical_objectives.dm +++ b/code/modules/crew_objectives/medical_objectives.dm @@ -86,10 +86,6 @@ units_total += container.reagents?.get_reagent_amount(target_chemical) return units_total >= target_amount -/datum/objective/crew/noinfections - explanation_text = "Make sure there are no living crew members with harmful diseases at the end of the shift." - jobs = JOB_NAME_VIROLOGIST - /datum/objective/crew/noinfections/check_completion() if(..()) return TRUE diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index 26390919f5302..bf0e97b2abfed 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -18,7 +18,7 @@ jobs_to_revolt = list(JOB_NAME_ASSISTANT) nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi") if("white") - jobs_to_revolt = list(JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_VIROLOGIST, JOB_NAME_PARAMEDIC) + jobs_to_revolt = list(JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_PARAMEDIC) nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Geneti", "Viro", "Psych") if("yellow") jobs_to_revolt = list(JOB_NAME_CHIEFENGINEER, JOB_NAME_STATIONENGINEER, JOB_NAME_ATMOSPHERICTECHNICIAN) diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index 436a728e6ba99..3185df873b10a 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -326,7 +326,7 @@ GLOBAL_LIST_INIT(access_desc_list, list( \ // Engineering JOB_NAME_CHIEFENGINEER, JOB_NAME_STATIONENGINEER, JOB_NAME_ATMOSPHERICTECHNICIAN, // Medical - JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_VIROLOGIST, JOB_NAME_PARAMEDIC, JOB_NAME_PSYCHIATRIST, + JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_CHEMIST, JOB_NAME_GENETICIST, JOB_NAME_PARAMEDIC, JOB_NAME_PSYCHIATRIST, // Security JOB_NAME_HEADOFSECURITY, JOB_NAME_WARDEN, JOB_NAME_DETECTIVE, JOB_NAME_SECURITYOFFICER, JOB_NAME_BRIGPHYSICIAN, JOB_NAME_DEPUTY) // Each job is supposed to be in their department due to the HoP console. diff --git a/code/modules/jobs/job_mail.dm b/code/modules/jobs/job_mail.dm index f8aaefd96ba68..e297248476d5f 100644 --- a/code/modules/jobs/job_mail.dm +++ b/code/modules/jobs/job_mail.dm @@ -408,22 +408,6 @@ /obj/item/clothing/gloves/color/yellow = 4, ) -//VIROLOGIST -/datum/job/virologist - mail_goodies = list( - /obj/item/reagent_containers/syringe/used = 15, - //keep your workplace clean, please. - /obj/item/reagent_containers/spray/cleaner = 15, - /obj/item/reagent_containers/food/snacks/monkeycube = 10, - /obj/item/reagent_containers/glass/bottle/formaldehyde = 10, - /obj/item/reagent_containers/glass/bottle/random_virus/minor = 10, - /obj/item/reagent_containers/glass/bottle/random_virus = 5, - /obj/item/stock_parts/scanning_module/phasic = 5, - //hampter. - /obj/item/choice_beacon/pet/hamster = 5, - - ) - //VIP / VIP GIMMICK /datum/job/gimmick/vip mail_goodies = list( diff --git a/code/modules/jobs/job_types/chief_medical_officer.dm b/code/modules/jobs/job_types/chief_medical_officer.dm index 957e2c688c2ee..dd360a3e58c59 100644 --- a/code/modules/jobs/job_types/chief_medical_officer.dm +++ b/code/modules/jobs/job_types/chief_medical_officer.dm @@ -1,9 +1,9 @@ /datum/job/chief_medical_officer title = JOB_NAME_CHIEFMEDICALOFFICER flag = CMO_JF - description = "Oversee paramedics, doctors, chemists, geneticists and the virologist. \ + description = "Oversee paramedics, doctors, chemists, and the geneticists. \ Ensure doctors and paramedicts are treating people in a timely manner, request medicine and other concoctions from chemists, \ - and ensure geneticists and the virologist are following appropriate safety precautions while performing their research." + and ensure geneticists are following appropriate safety precautions while performing their research." department_for_prefs = DEPT_BITFLAG_MED department_head = list(JOB_NAME_CAPTAIN) supervisors = "the captain" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index fd4822379eb17..f56b4df28e7ca 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -14,7 +14,7 @@ outfit = /datum/outfit/job/medical_doctor access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CLONING, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) department_flag = MEDSCI departments = DEPT_BITFLAG_MED diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm deleted file mode 100644 index f08be796a457c..0000000000000 --- a/code/modules/jobs/job_types/virologist.dm +++ /dev/null @@ -1,60 +0,0 @@ -/datum/job/virologist - title = JOB_NAME_VIROLOGIST - flag = VIROLOGIST - description = "Collect virus samples from dormant viruses, old blood, and crusty vomit from around the station, isolate the symptoms and use them to create useful healing viruses for the crew." - department_for_prefs = DEPT_BITFLAG_MED - department_head = list(JOB_NAME_CHIEFMEDICALOFFICER) - supervisors = "the chief medical officer" - faction = "Station" - total_positions = 2 - spawn_positions = 2 - selection_color = "#d4ebf2" - exp_requirements = 180 - exp_type = EXP_TYPE_MEDICAL - exp_type_department = EXP_TYPE_MEDICAL - outfit = /datum/outfit/job/virologist - - access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_GENETICS, ACCESS_CLONING, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) - minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MECH_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS) - - department_flag = MEDSCI - departments = DEPT_BITFLAG_MED - bank_account_department = ACCOUNT_MED_BITFLAG - payment_per_department = list(ACCOUNT_MED_ID = PAYCHECK_MEDIUM) - mind_traits = list(TRAIT_MEDICAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_VIROLOGIST - rpg_title = "Plague Doctor" - - species_outfits = list( - SPECIES_PLASMAMAN = /datum/outfit/plasmaman/virologist - ) - biohazard = 75 //duh - - lightup_areas = list( - /area/medical/morgue, - /area/medical/surgery, - /area/medical/genetics, - /area/medical/chemistry, - /area/medical/apothecary - ) - minimal_lightup_areas = list(/area/medical/virology) - -/datum/outfit/job/virologist - name = JOB_NAME_VIROLOGIST - jobtype = /datum/job/virologist - - id = /obj/item/card/id/job/virologist - belt = /obj/item/extrapolator - ears = /obj/item/radio/headset/headset_med - uniform = /obj/item/clothing/under/rank/medical/virologist - mask = /obj/item/clothing/mask/surgical - shoes = /obj/item/clothing/shoes/sneakers/white - suit = /obj/item/clothing/suit/toggle/labcoat/virologist - suit_store = /obj/item/flashlight/pen - r_pocket = /obj/item/modular_computer/tablet/pda/virologist - - backpack = /obj/item/storage/backpack/virology - satchel = /obj/item/storage/backpack/satchel/vir - duffelbag = /obj/item/storage/backpack/duffelbag/med - pda_slot = ITEM_SLOT_RPOCKET diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 08d8da75aa13a..e8ab5e9c905b2 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -40,7 +40,6 @@ GLOBAL_LIST_INIT(medical_positions, list( JOB_NAME_CHIEFMEDICALOFFICER, JOB_NAME_MEDICALDOCTOR, JOB_NAME_GENETICIST, - JOB_NAME_VIROLOGIST, JOB_NAME_PARAMEDIC, JOB_NAME_CHEMIST, JOB_NAME_BRIGPHYSICIAN @@ -181,7 +180,6 @@ GLOBAL_LIST_INIT(medical_positions_hud, list( JOB_HUD_CHEIFMEDICALOFFICIER, JOB_HUD_MEDICALDOCTOR, JOB_HUD_GENETICIST, - JOB_HUD_VIROLOGIST, JOB_HUD_PARAMEDIC, JOB_HUD_CHEMIST, JOB_HUD_BRIGPHYSICIAN, diff --git a/code/modules/mob/living/silicon/ai/vox_sounds.dm b/code/modules/mob/living/silicon/ai/vox_sounds.dm index b90e425100811..4c78999055fb4 100644 --- a/code/modules/mob/living/silicon/ai/vox_sounds.dm +++ b/code/modules/mob/living/silicon/ai/vox_sounds.dm @@ -912,7 +912,6 @@ GLOBAL_LIST_INIT(vox_sounds, list("abduction" = 'sound/vox_fem/abduction.ogg', "victor" = 'sound/vox_fem/victor.ogg', "violated" = 'sound/vox_fem/violated.ogg', "violation" = 'sound/vox_fem/violation.ogg', -"virologist" = 'sound/vox_fem/virologist.ogg', "virology" = 'sound/vox_fem/virology.ogg', "virus" = 'sound/vox_fem/virus.ogg', "vitals" = 'sound/vox_fem/vitals.ogg', diff --git a/code/modules/mob/living/simple_animal/friendly/hamster.dm b/code/modules/mob/living/simple_animal/friendly/hamster.dm index dc4c18b8ae858..82324f9072f45 100644 --- a/code/modules/mob/living/simple_animal/friendly/hamster.dm +++ b/code/modules/mob/living/simple_animal/friendly/hamster.dm @@ -45,7 +45,7 @@ if(prob(5)) var/datum/disease/disease = pick(/datum/disease/cold, /datum/disease/flu, /datum/disease/fluspanish) vector_disease = new disease - message_admins("Vector was roundstart infected with [vector_disease.name]. Don't lynch the virologist!") + message_admins("Vector was roundstart infected with [vector_disease.name].") log_game("Vector was roundstart infected with [vector_disease.name].") var/list/potential_guaranteed_symptoms = list() for(var/datum/symptom/symptom as anything in subtypesof(/datum/symptom)) diff --git a/code/modules/modular_computers/computers/item/role_tablet_presets.dm b/code/modules/modular_computers/computers/item/role_tablet_presets.dm index 8743e952f101b..9d56f8264f436 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -54,11 +54,6 @@ default_disk = /obj/item/computer_hardware/hard_drive/role/medical icon_state = "pda-paramedical" -/obj/item/modular_computer/tablet/pda/virologist - name = "virology PDA" - default_disk = /obj/item/computer_hardware/hard_drive/role/medical - icon_state = "pda-virology" - /obj/item/modular_computer/tablet/pda/station_engineer name = "engineering PDA" default_disk = /obj/item/computer_hardware/hard_drive/role/engineering diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index abe81edc6c854..14b6919f4b0bd 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -382,7 +382,7 @@ /obj/item/reagent_containers/glass/bottle/necropolis_seed name = "bowl of blood" label_name = "blood" - desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust virologist may be able to unlock its full potential..." + desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust medical staff may be able to unlock its full potential..." icon_state = "mortar" spawned_disease = /datum/disease/advance/random/necropolis label_icon = null diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 70b8d8c0995c7..cccd7bfd9e664 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -2170,7 +2170,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) At least. thats what the label says" item = /obj/item/reagent_containers/glass/bottle/fluspanish cost = 12 - restricted_roles = list(JOB_NAME_CHAPLAIN, JOB_NAME_VIROLOGIST) + restricted_roles = list(JOB_NAME_CHAPLAIN) /datum/uplink_item/role_restricted/retrovirus name = "Retrovirus Culture Bottle" @@ -2178,7 +2178,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) At least, that's what the label says." item = /obj/item/reagent_containers/glass/bottle/retrovirus cost = 12 - restricted_roles = list(JOB_NAME_VIROLOGIST, JOB_NAME_GENETICIST) + restricted_roles = list(JOB_NAME_GENETICIST) /datum/uplink_item/role_restricted/anxiety name = "Anxiety Culture Bottle" @@ -2186,7 +2186,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) At least, that's what the label says" item = /obj/item/reagent_containers/glass/bottle/anxiety cost = 4 - restricted_roles = list(JOB_NAME_VIROLOGIST) + restricted_roles = list(JOB_NAME_MEDICALDOCTOR) /datum/uplink_item/role_restricted/explosive_hot_potato name = "Exploding Hot Potato" diff --git a/config/jobs.txt b/config/jobs.txt index c40beba692865..44201d6241665 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -34,7 +34,6 @@ Medical Doctor=8,6 Paramedic=2,1 Chemist=3,2 Geneticist=3,2 -Virologist=1,1 Scientist=8,6 Roboticist=2,2 diff --git a/strings/ion_laws.json b/strings/ion_laws.json index 6185f7a761d98..30ac3c0106214 100644 --- a/strings/ion_laws.json +++ b/strings/ion_laws.json @@ -459,7 +459,6 @@ "MEDICAL DOCTORS", "CHEMISTS", "GENETICISTS", - "VIROLOGISTS", "ROBOTICISTS", "SCIENTISTS", "ASSISTANTS", diff --git a/strings/medieval_speech.json b/strings/medieval_speech.json index 3327994adfb8b..c6d94b730fcd7 100644 --- a/strings/medieval_speech.json +++ b/strings/medieval_speech.json @@ -45,8 +45,6 @@ "virus": "plague", "sick": "diseased", "medbay": "physician's tent", - "virologist": "plague doctor", - "viro": "plague doctor", "doctor": "doct'r", "paramedic": "doct'r", "cmo": "royal physician", diff --git a/strings/owo_talk.json b/strings/owo_talk.json index b62484a20e26c..82ee755350af9 100644 --- a/strings/owo_talk.json +++ b/strings/owo_talk.json @@ -1,5 +1,5 @@ { - + "wowds": { "id": "furball", "fuck": "OwO", @@ -8,7 +8,6 @@ "weed": "catnip", "arrested": "nuzzled", "arrest": "pounce", - "virologist": "good kitty", "viro": ["kittie","neko"], "virology": ["kittie","neko"], "sec":"battle cats", @@ -71,6 +70,6 @@ "th": "f", "ove": "uv" } - - + + } diff --git a/strings/phobia.json b/strings/phobia.json index 601228eb14c17..18411f9220abe 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -133,7 +133,6 @@ "doc", "md", "viro", - "virologist", "chem", "chemist", "geneticist", diff --git a/strings/tips.txt b/strings/tips.txt index bd673a2b76251..a89da5567413e 100644 --- a/strings/tips.txt +++ b/strings/tips.txt @@ -66,9 +66,9 @@ As a Geneticist, you can obtain chromosomes by activating mutations by recycling As a Paramedic, it is a good idea to keep your handheld crew monitor's interface open at all times. As a Paramedic, you have access to EVA. Use it to save people who received grievous injuries in space. As a Paramedic, you should use other methods of transporting bodies that aren't dragging them on the floor : fireman carrying, roller beds, body bags, lockers, etc. Simply dragging the body around drains its blood and leaves a bloody trail behind. -As the Virologist, your viruses can range from healing powers so great that you can heal out of critical status, or diseases so dangerous they can kill the entire crew with highly contagious spontaneous combustion. Experiment! -As the Virologist, you only require small amounts of vaccine to heal a sick patient. Work with the Chemist to distribute your cures more efficiently. -As the Virologist, you can massively boost the stage progression speed of a virus inside a person by injecting them with pure virus food. +When working in Virology, your viruses can range from healing powers so great that you can heal out of critical status, or diseases so dangerous they can kill the entire crew with highly contagious spontaneous combustion. Experiment! +When working in Virology, you only require small amounts of vaccine to heal a sick patient. Work with the Chemist to distribute your cures more efficiently. +When working in Virology, you can massively boost the stage progression speed of a virus inside a person by injecting them with pure virus food. As the Brig Physician, you can provide your help to Medbay if there are no people to treat at Security. As the Research Director, you can take AIs out of their cores by loading them into an intelliCard, which lets you see their laws, even ion/syndicate ones. It can then be placed into an AI system integrity restorer computer to revive and/or repair them. As the Research Director, you can lock down cyborgs instead of blowing them up. Then you can have their laws reset or if that doesn't work, safely dismantled. diff --git a/strings/valentines.json b/strings/valentines.json index d0096344302bc..c5d06aa06a6e6 100644 --- a/strings/valentines.json +++ b/strings/valentines.json @@ -21,7 +21,6 @@ "You're always valid to my heart.", "You look as beautiful now as the last time you were cloned.", "Someone check the gravitational generator, because I'm only attracted to you.", - "The virologist is rogue, and the only cure is a kiss from you.", "You must be a silicon, because you've unbolted my heart.", "Are you Nar'Sie? Because there's nar-one else I sie.", "If you were a taser, you'd be set to stunning.", diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js index f3bd057c286c8..21f3325243ea3 100644 --- a/tgui/packages/tgui-panel/chat/renderer.js +++ b/tgui/packages/tgui-panel/chat/renderer.js @@ -102,7 +102,6 @@ const formatHighContrast = (inputHtml) => { 'shaftminer', 'explorationcrew', 'stationengineer', - 'virologist', 'warden', 'centcom', 'prisoner', diff --git a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss index 6a95b62c0307b..3af6d0b56992e 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-dark.scss @@ -1219,9 +1219,6 @@ em { .paramedic { color: #8fbeb4; } -.virologist { - color: #5ac5b0; -} .chemist { color: #82bdce; } diff --git a/tgui/packages/tgui-panel/styles/goon/chat-light.scss b/tgui/packages/tgui-panel/styles/goon/chat-light.scss index 169e60296b960..dcb08c0f7c453 100644 --- a/tgui/packages/tgui-panel/styles/goon/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/goon/chat-light.scss @@ -1227,9 +1227,6 @@ h2.alert { .chemist { color: #82bdce; } -.virologist { - color: #5ac5b0; -} .geneticist { color: #83bbbf; } diff --git a/tools/UpdatePaths/Scripts/7550_pdas_to_tabs.txt b/tools/UpdatePaths/Scripts/7550_pdas_to_tabs.txt index 05a3a1976df76..12e831b2eefe9 100644 --- a/tools/UpdatePaths/Scripts/7550_pdas_to_tabs.txt +++ b/tools/UpdatePaths/Scripts/7550_pdas_to_tabs.txt @@ -25,7 +25,6 @@ /obj/item/pda : /obj/item/modular_computer/tablet/pda /obj/item/pda/medical : /obj/item/modular_computer/tablet/pda/medical /obj/item/pda/paramedic : /obj/item/modular_computer/tablet/pda/paramedic -/obj/item/pda/virologist : /obj/item/modular_computer/tablet/pda/virologist /obj/item/pda/engineering : /obj/item/modular_computer/tablet/pda/engineering /obj/item/pda/security : /obj/item/modular_computer/tablet/pda/security /obj/item/pda/detective : /obj/item/modular_computer/tablet/pda/detective From 7eca5d37981edc8297e637faffa93236cae7309b Mon Sep 17 00:00:00 2001 From: Haliris Date: Sun, 10 Sep 2023 21:20:48 +0200 Subject: [PATCH 2/7] Removes leftover noinfections code from medical objectives. --- code/modules/crew_objectives/medical_objectives.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/crew_objectives/medical_objectives.dm b/code/modules/crew_objectives/medical_objectives.dm index 4908c9305eb77..ec2cebec78750 100644 --- a/code/modules/crew_objectives/medical_objectives.dm +++ b/code/modules/crew_objectives/medical_objectives.dm @@ -86,13 +86,3 @@ units_total += container.reagents?.get_reagent_amount(target_chemical) return units_total >= target_amount -/datum/objective/crew/noinfections/check_completion() - if(..()) - return TRUE - for(var/mob/living/carbon/human/H in GLOB.mob_list) - if(H.stat == DEAD || (!is_station_level(H.z) && !SSshuttle.emergency.shuttle_areas[get_area(H)])) - continue - for(var/datum/disease/D as anything in H.diseases) - if(get_disease_danger_value(D.danger) >= 6) // >= DISEASE_HARMFUL - return FALSE - return TRUE From 0cb0a36c7199251088b6715fd32f098cb2374e07 Mon Sep 17 00:00:00 2001 From: Haliris Date: Sun, 10 Sep 2023 22:25:54 +0200 Subject: [PATCH 3/7] Fixes typo --- code/game/objects/items/bedsheets.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/bedsheets.dm b/code/game/objects/items/bedsheets.dm index 6ff59dd621cec..2c652bfa0888f 100644 --- a/code/game/objects/items/bedsheets.dm +++ b/code/game/objects/items/bedsheets.dm @@ -153,7 +153,7 @@ /obj/item/bedsheet/medical name = "medical blanket" - desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization if someone is working in virology." + desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if someone is working in virology." icon_state = "sheetmedical" item_state = "sheetmedical" dream_messages = list("healing", "life", "surgery", "a doctor") From a24dd7ca7a99e918b78dc1770f693a1367b81fc6 Mon Sep 17 00:00:00 2001 From: Haliris Date: Mon, 25 Sep 2023 16:12:00 +0200 Subject: [PATCH 4/7] Adressed itsmeowdev requests Gives noinfections to doctors Reverts removal of virologist vox sound Reverts change to pdas_t_tabs script Removed viro_hud icon --- .../crew_objectives/medical_objectives.dm | 14 ++++++++++++++ .../mob/living/silicon/ai/vox_sounds.dm | 1 + icons/mob/hud.dmi | Bin 20084 -> 19859 bytes .../UpdatePaths/Scripts/7550_pdas_to_tabs.txt | 1 + 4 files changed, 16 insertions(+) diff --git a/code/modules/crew_objectives/medical_objectives.dm b/code/modules/crew_objectives/medical_objectives.dm index ec2cebec78750..97c41a8c88e17 100644 --- a/code/modules/crew_objectives/medical_objectives.dm +++ b/code/modules/crew_objectives/medical_objectives.dm @@ -86,3 +86,17 @@ units_total += container.reagents?.get_reagent_amount(target_chemical) return units_total >= target_amount +/datum/objective/crew/noinfections + explanation_text = "Make sure there are no living crew members with harmful diseases at the end of the shift." + jobs = JOB_NAME_MEDICALDOCTOR + +/datum/objective/crew/noinfections/check_completion() + if(..()) + return TRUE + for(var/mob/living/carbon/human/H in GLOB.mob_list) + if(H.stat == DEAD || (!is_station_level(H.z) && !SSshuttle.emergency.shuttle_areas[get_area(H)])) + continue + for(var/datum/disease/D as anything in H.diseases) + if(get_disease_danger_value(D.danger) >= 6) // >= DISEASE_HARMFUL + return FALSE + return TRUE diff --git a/code/modules/mob/living/silicon/ai/vox_sounds.dm b/code/modules/mob/living/silicon/ai/vox_sounds.dm index 4c78999055fb4..b90e425100811 100644 --- a/code/modules/mob/living/silicon/ai/vox_sounds.dm +++ b/code/modules/mob/living/silicon/ai/vox_sounds.dm @@ -912,6 +912,7 @@ GLOBAL_LIST_INIT(vox_sounds, list("abduction" = 'sound/vox_fem/abduction.ogg', "victor" = 'sound/vox_fem/victor.ogg', "violated" = 'sound/vox_fem/violated.ogg', "violation" = 'sound/vox_fem/violation.ogg', +"virologist" = 'sound/vox_fem/virologist.ogg', "virology" = 'sound/vox_fem/virology.ogg', "virus" = 'sound/vox_fem/virus.ogg', "vitals" = 'sound/vox_fem/vitals.ogg', diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index cd708071faf3879ff46b3143056f829aa8e41e99..5a84b744f333871bd019212aed3c5ab1a0126be5 100644 GIT binary patch literal 19859 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 LpNkdeL+}3slB>Cv literal 20084 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 Date: Mon, 25 Sep 2023 16:14:04 +0200 Subject: [PATCH 5/7] Updated bottle.dm text --- code/modules/reagents/reagent_containers/bottle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 14b6919f4b0bd..39ee9d586fcdd 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -382,7 +382,7 @@ /obj/item/reagent_containers/glass/bottle/necropolis_seed name = "bowl of blood" label_name = "blood" - desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust medical staff may be able to unlock its full potential..." + desc = "A clay bowl containing a fledgling Necropolis, preserved in blood. A robust member of medical staff may be able to unlock its full potential..." icon_state = "mortar" spawned_disease = /datum/disease/advance/random/necropolis label_icon = null From 922f6ec2fbda2456881ce3fa57edb6d734bfe2a1 Mon Sep 17 00:00:00 2001 From: Penwin Date: Mon, 25 Sep 2023 18:57:54 +0200 Subject: [PATCH 6/7] a --- code/__HELPERS/jobs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/__HELPERS/jobs.dm b/code/__HELPERS/jobs.dm index cdeac01a28089..21488dfcf3206 100644 --- a/code/__HELPERS/jobs.dm +++ b/code/__HELPERS/jobs.dm @@ -120,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, From 72ff10515c6fd36028d94328033efb1f8a3c914c Mon Sep 17 00:00:00 2001 From: Haliris Date: Wed, 27 Sep 2023 15:19:44 +0200 Subject: [PATCH 7/7] "viro" strings removed, fixed typo in cargo\packs --- code/modules/cargo/packs.dm | 2 +- strings/owo_talk.json | 1 - strings/phobia.json | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index b88ef80bcbd94..e0ffdca045365 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1802,7 +1802,7 @@ /obj/item/reagent_containers/glass/bottle/mutagen, /obj/item/reagent_containers/glass/bottle/formaldehyde, /obj/item/reagent_containers/glass/bottle/synaptizine, - /obj/item/storage/box/beakers,) + /obj/item/storage/box/beakers) crate_name = "Junior Epidemiology Kit" dangerous = TRUE diff --git a/strings/owo_talk.json b/strings/owo_talk.json index 82ee755350af9..c8c34f1acbb3f 100644 --- a/strings/owo_talk.json +++ b/strings/owo_talk.json @@ -8,7 +8,6 @@ "weed": "catnip", "arrested": "nuzzled", "arrest": "pounce", - "viro": ["kittie","neko"], "virology": ["kittie","neko"], "sec":"battle cats", "security":"battle cats", diff --git a/strings/phobia.json b/strings/phobia.json index 18411f9220abe..c1c2f3eb35345 100644 --- a/strings/phobia.json +++ b/strings/phobia.json @@ -132,7 +132,6 @@ "doctors": [ "doc", "md", - "viro", "chem", "chemist", "geneticist",