diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index 9b255ff1ff9..3b3b54fe2ba 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -264,7 +264,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "agy" = ( @@ -19331,7 +19330,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 1 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/medbay/aft) "hGE" = ( @@ -25667,10 +25665,6 @@ "jKU" = ( /turf/closed/wall, /area/station/engineering/atmos/storage/gas) -"jLi" = ( -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/virology) "jLl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35271,13 +35265,6 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, /turf/open/floor/iron/grimy, /area/station/tcommsat/server) -"mIa" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white/small, -/area/station/medical/virology) "mIg" = ( /obj/machinery/light/small/directional/west, /turf/open/floor/catwalk_floor/iron_dark, @@ -107022,7 +107009,7 @@ bUv cSk gLb nlS -mIa +eRX gpM sSQ hrF @@ -108560,7 +108547,7 @@ jrk gIF wYA bpS -jLi +hOp nYk vVP xAA diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 2b35348f407..4c8e7a2aeed 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -51032,7 +51032,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 10 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "mIs" = ( @@ -58192,7 +58191,6 @@ "oDw" = ( /obj/structure/table/glass, /obj/machinery/computer/records/medical/laptop, -/obj/item/toy/figure/virologist, /obj/effect/turf_decal/trimline/green/filled/line{ dir = 1 }, @@ -70718,7 +70716,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, @@ -91414,7 +91411,6 @@ /area/station/hallway/secondary/entry) "wOz" = ( /obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, /obj/effect/turf_decal/trimline/green/filled/warning, /turf/open/floor/iron/white, /area/station/medical/virology) diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 0280110ed5a..ce90b3eba39 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -24066,7 +24066,6 @@ /obj/structure/chair/office/light{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "hsh" = ( @@ -45193,7 +45192,6 @@ /obj/effect/turf_decal/trimline/green/filled/line{ dir = 9 }, -/obj/effect/landmark/start/virologist, /obj/structure/chair/stool/directional/east, /turf/open/floor/iron/dark, /area/station/medical/virology) @@ -47715,10 +47713,6 @@ /area/station/maintenance/solars/starboard/fore) "oCs" = ( /obj/structure/table, -/obj/item/toy/figure/virologist{ - pixel_x = -8; - pixel_y = 7 - }, /obj/item/radio/headset/headset_med{ pixel_x = -3; pixel_y = -2 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index c244dcba5a6..ceb1a6e077a 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -24297,9 +24297,6 @@ /obj/machinery/reagentgrinder{ pixel_y = 8 }, -/obj/item/toy/figure/virologist{ - pixel_x = -8 - }, /obj/effect/turf_decal/tile/green/half/contrasted, /obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, @@ -41390,7 +41387,6 @@ /obj/structure/chair/office/light{ dir = 8 }, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) @@ -51737,7 +51733,6 @@ "syT" = ( /obj/structure/cable, /obj/structure/chair/office/light, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm index 5e86f74088d..92694397046 100644 --- a/_maps/map_files/NorthStar/north_star.dmm +++ b/_maps/map_files/NorthStar/north_star.dmm @@ -72967,7 +72967,6 @@ specialfunctions = 4 }, /obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/white, /area/station/medical/virology) "sPs" = ( @@ -76630,14 +76629,6 @@ }, /turf/open/floor/pod/dark, /area/station/maintenance/floor3/port/aft) -"tKr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/effect/turf_decal/tile/green/opposingcorners, -/obj/effect/landmark/start/virologist, -/turf/open/floor/iron/white, -/area/station/medical/virology) "tKs" = ( /obj/structure/curtain, /obj/structure/fans/tiny{ @@ -196076,7 +196067,7 @@ iOA utl doh gJz -tKr +rPC hwQ piz aWO @@ -196590,7 +196581,7 @@ iOA dfU pZm wJy -tKr +rPC dVV bLm yhv diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 85381e9b4f7..243504f1781 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -33457,7 +33457,6 @@ /obj/structure/bed{ dir = 4 }, -/obj/effect/landmark/start/virologist, /turf/open/floor/iron/dark, /area/station/medical/virology) "kPf" = ( @@ -67097,7 +67096,6 @@ "wDt" = ( /obj/effect/landmark/event_spawn, /obj/structure/chair/stool/directional/east, -/obj/effect/landmark/start/virologist, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index f00264d6b1a..ef254589129 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -543,7 +543,6 @@ /obj/item/modular_computer/pda/clown = list(REGION_GENERAL), \ /obj/item/modular_computer/pda/mime = list(REGION_GENERAL), \ /obj/item/modular_computer/pda/medical = list(REGION_MEDBAY), \ - /obj/item/modular_computer/pda/viro = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/coroner = list(REGION_MEDBAY), \ /obj/item/modular_computer/pda/engineering = list(REGION_ENGINEERING), \ /obj/item/modular_computer/pda/security = list(REGION_SECURITY), \ diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 8bb5a334475..7df79b7e57a 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -114,7 +114,6 @@ #define SECHUD_SHAFT_MINER "hudshaftminer" #define SECHUD_STATION_ENGINEER "hudstationengineer" #define SECHUD_VETERAN_ADVISOR "hudveteranadvisor" -#define SECHUD_VIROLOGIST "hudvirologist" #define SECHUD_WARDEN "hudwarden" #define SECHUD_CHEF "hudchef" diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 524deef42f8..2c3b151855c 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -71,7 +71,6 @@ #define JOB_MEDICAL_DOCTOR "Medical Doctor" #define JOB_PARAMEDIC "Paramedic" #define JOB_CHEMIST "Chemist" -#define JOB_VIROLOGIST "Virologist" //Science #define JOB_SCIENTIST "Scientist" #define JOB_ROBOTICIST "Roboticist" @@ -151,18 +150,17 @@ #define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 26 #define JOB_DISPLAY_ORDER_PARAMEDIC 27 #define JOB_DISPLAY_ORDER_CHEMIST 28 -#define JOB_DISPLAY_ORDER_VIROLOGIST 29 -#define JOB_DISPLAY_ORDER_CORONER 30 -#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 31 -#define JOB_DISPLAY_ORDER_SCIENTIST 32 -#define JOB_DISPLAY_ORDER_ROBOTICIST 33 -#define JOB_DISPLAY_ORDER_GENETICIST 34 -#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 35 -#define JOB_DISPLAY_ORDER_VETERAN_ADVISOR 36 -#define JOB_DISPLAY_ORDER_WARDEN 37 -#define JOB_DISPLAY_ORDER_DETECTIVE 38 -#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 39 -#define JOB_DISPLAY_ORDER_PRISONER 40 +#define JOB_DISPLAY_ORDER_CORONER 29 +#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 30 +#define JOB_DISPLAY_ORDER_SCIENTIST 31 +#define JOB_DISPLAY_ORDER_ROBOTICIST 32 +#define JOB_DISPLAY_ORDER_GENETICIST 33 +#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 34 +#define JOB_DISPLAY_ORDER_VETERAN_ADVISOR 35 +#define JOB_DISPLAY_ORDER_WARDEN 36 +#define JOB_DISPLAY_ORDER_DETECTIVE 37 +#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 38 +#define JOB_DISPLAY_ORDER_PRISONER 39 #define DEPARTMENT_UNASSIGNED "No Department" diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 771cdd12e10..93edea10b41 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 medical 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 creator name our disease. desc = "An engineered disease which can contain a multitude of symptoms." form = "Advanced Disease" // Will let med-scanners know that this disease was engineered. agent = "advance microbes" diff --git a/code/datums/id_trim/jobs.dm b/code/datums/id_trim/jobs.dm index 3d94c8645b5..cfa608011bd 100644 --- a/code/datums/id_trim/jobs.dm +++ b/code/datums/id_trim/jobs.dm @@ -1213,30 +1213,6 @@ if(CONFIG_GET(flag/security_has_maint_access)) access |= list(ACCESS_MAINT_TUNNELS) -/datum/id_trim/job/virologist - assignment = "Virologist" - trim_state = "trim_virologist" - department_color = COLOR_MEDICAL_BLUE - subdepartment_color = COLOR_MEDICAL_BLUE - sechud_icon_state = SECHUD_VIROLOGIST - minimal_access = list( - ACCESS_MECH_MEDICAL, - ACCESS_MEDICAL, - ACCESS_MINERAL_STOREROOM, - ACCESS_VIROLOGY, - ACCESS_PHARMACY, - ) - extra_access = list( - ACCESS_PLUMBING, - ACCESS_MORGUE, - ACCESS_SURGERY, - ) - template_access = list( - ACCESS_CAPTAIN, - ACCESS_CHANGE_IDS, - ACCESS_CMO, - ) - job = /datum/job/virologist /datum/id_trim/job/warden assignment = "Warden" diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index e4c16d713cc..2ce6543c112 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -591,7 +591,7 @@ //if engineering isnt valid, just send it to the bridge send_supply_pod_to_area(supply_pack_shielding.generate(null), /area/station/command/bridge, /obj/structure/closet/supplypod/centcompod) - // Let the viro know resistence is futile + // Let medical know resistence is futile send_fax_to_area(new /obj/item/paper/fluff/radiation_nebula_virologist(), /area/station/medical/virology, "NT Virology Department", \ force = TRUE, force_pod_type = /obj/structure/closet/supplypod/centcompod) diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index dda21308c96..bff2d532570 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -233,7 +233,6 @@ /datum/job/security_officer = /obj/item/organ/internal/cyberimp/arm/flash, /datum/job/shaft_miner = /obj/item/organ/internal/monster_core/rush_gland, /datum/job/station_engineer = /obj/item/organ/internal/cyberimp/arm/toolset, - /datum/job/virologist = /obj/item/organ/internal/lungs/cybernetic/tier2, /datum/job/warden = /obj/item/organ/internal/cyberimp/eyes/hud/security, ) diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 328531d88c6..b3ad7108ba5 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -574,7 +574,7 @@ /datum/objective_item/steal/traitor/moth_plush name = "cute moth plush toy" targetitem = /obj/item/toy/plush/moth - excludefromjob = list(JOB_PSYCHOLOGIST, JOB_PARAMEDIC, JOB_CHEMIST, JOB_MEDICAL_DOCTOR, JOB_VIROLOGIST, JOB_CHIEF_MEDICAL_OFFICER, JOB_CORONER) + excludefromjob = list(JOB_PSYCHOLOGIST, JOB_PARAMEDIC, JOB_CHEMIST, JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_CORONER) exists_on_map = TRUE difficulty = 1 steal_hint = "A moth plush toy. The Psychologist has one to help console patients." diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 7b66d72a98c..268b675871a 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -109,10 +109,9 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) // 20-29: Medbay JOB_CHIEF_MEDICAL_OFFICER = 20, JOB_CHEMIST = 21, - JOB_VIROLOGIST = 22, - JOB_MEDICAL_DOCTOR = 23, - JOB_PARAMEDIC = 24, - JOB_CORONER = 25, + JOB_MEDICAL_DOCTOR = 22, + JOB_PARAMEDIC = 23, + JOB_CORONER = 24, // 30-39: Science JOB_RESEARCH_DIRECTOR = 30, JOB_SCIENTIST = 31, diff --git a/code/game/machinery/nebula_shielding.dm b/code/game/machinery/nebula_shielding.dm index cd10a23150c..10306177ebf 100644 --- a/code/game/machinery/nebula_shielding.dm +++ b/code/game/machinery/nebula_shielding.dm @@ -145,7 +145,7 @@ More circuit boards can be ordered through cargo. Consider setting up auxillary shielding units in-case of destruction, power loss or sabotage. "} -/// Warns the viro that they can't use radioactive resonance +/// Warns medical that they can't use radioactive resonance /obj/item/paper/fluff/radiation_nebula_virologist name = "radioactive resonance" default_raw_text = {"EXTREME IMPORTANCE!!!!
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ce008b35f13..64c0afe188a 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -189,9 +189,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/psychologist name = "Psychologist" diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index cc548be16d2..71731bd80c0 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -467,9 +467,6 @@ /obj/item/reagent_containers/syringe, )) -/* - * Biowaste bag (mostly for virologists) - */ /obj/item/storage/bag/bio name = "bio bag" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 6a5b6357a8f..d5e09ee8a74 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -128,11 +128,11 @@ force = 0 var/random_color = TRUE /// the string of the dmi state the balloon has while on the floor. - var/world_state + var/world_state /// the string of the dmi state the balloon has while in your inventory. - var/storage_state + var/storage_state /// the string describing the name of balloon's current colour. - var/current_color + var/current_color /obj/item/toy/balloon/long name = "long balloon" @@ -183,9 +183,9 @@ ) for(var/list/pair_of_colors in balloon_combos) if((hit_by.current_color == pair_of_colors[1] && current_color == pair_of_colors[2]) || (current_color == pair_of_colors[1] && hit_by.current_color == pair_of_colors[2])) - var/path_to_spawn = balloon_combos[pair_of_colors] + var/path_to_spawn = balloon_combos[pair_of_colors] user.put_in_hands(new path_to_spawn) - break + break qdel(hit_by) qdel(src) return TRUE @@ -1381,10 +1381,6 @@ toysay = "I am the law!" toysound = 'sound/runtime/complionator/dredd.ogg' -/obj/item/toy/figure/virologist - name = "\improper Virologist action figure" - icon_state = "virologist" - toysay = "The cure is potassium!" /obj/item/toy/figure/warden name = "\improper Warden action figure" diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index 8b4fef65293..d95bda33b1e 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -223,7 +223,7 @@ LINEN BINS /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." icon_state = "sheetmedical" inhand_icon_state = "sheetmedical" dream_messages = list("healing", "life", "surgery", "a doctor") diff --git a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm index 0d62ecece5f..59ea9b20afa 100644 --- a/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm +++ b/code/modules/antagonists/traitor/objectives/destroy_heirloom.dm @@ -41,7 +41,6 @@ target_jobs = list( // Medical /datum/job/doctor, - /datum/job/virologist, /datum/job/paramedic, /datum/job/psychologist, /datum/job/chemist, diff --git a/code/modules/antagonists/traitor/objectives/kidnapping.dm b/code/modules/antagonists/traitor/objectives/kidnapping.dm index d6aec912fdb..85aad594516 100644 --- a/code/modules/antagonists/traitor/objectives/kidnapping.dm +++ b/code/modules/antagonists/traitor/objectives/kidnapping.dm @@ -48,7 +48,6 @@ /datum/job/chemist, /datum/job/doctor, /datum/job/psychologist, - /datum/job/virologist, // Science /datum/job/geneticist, /datum/job/roboticist, diff --git a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm index f28a79d6926..6ec71ff08bd 100644 --- a/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm +++ b/code/modules/antagonists/traitor/objectives/sleeper_protocol.dm @@ -18,7 +18,6 @@ JOB_CHIEF_MEDICAL_OFFICER, JOB_MEDICAL_DOCTOR, JOB_PARAMEDIC, - JOB_VIROLOGIST, JOB_ROBOTICIST, ) diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index e3a396609eb..a0f2971df23 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -4,8 +4,8 @@ scan everyone in sight" department_head = list(JOB_CHIEF_MEDICAL_OFFICER) faction = FACTION_STATION - total_positions = 5 - spawn_positions = 3 + total_positions = 6 + spawn_positions = 4 supervisors = SUPERVISOR_CMO exp_granted_type = EXP_TYPE_CREW config_tag = "MEDICAL_DOCTOR" diff --git a/code/modules/jobs/job_types/virologist.dm b/code/modules/jobs/job_types/virologist.dm deleted file mode 100644 index bdbfd7d687c..00000000000 --- a/code/modules/jobs/job_types/virologist.dm +++ /dev/null @@ -1,60 +0,0 @@ -/datum/job/virologist - title = JOB_VIROLOGIST - description = "Study the effects of various diseases and synthesize a \ - vaccine for them. Engineer beneficial viruses." - department_head = list(JOB_CHIEF_MEDICAL_OFFICER) - faction = FACTION_STATION - total_positions = 1 - spawn_positions = 1 - supervisors = SUPERVISOR_CMO - exp_requirements = 60 - exp_required_type = EXP_TYPE_CREW - exp_granted_type = EXP_TYPE_CREW - config_tag = "VIROLOGIST" - - outfit = /datum/outfit/job/virologist - plasmaman_outfit = /datum/outfit/plasmaman/viro - - paycheck = PAYCHECK_CREW - paycheck_department = ACCOUNT_MED - - liver_traits = list(TRAIT_MEDICAL_METABOLISM) - - display_order = JOB_DISPLAY_ORDER_VIROLOGIST - bounty_types = CIV_JOB_VIRO - departments_list = list( - /datum/job_department/medical, - ) - - family_heirlooms = list(/obj/item/reagent_containers/syringe, /obj/item/statuebust/hippocratic) - - mail_goodies = list( - /obj/item/reagent_containers/cup/bottle/random_virus = 15, - /obj/item/reagent_containers/cup/bottle/formaldehyde = 10, - /obj/item/reagent_containers/cup/bottle/synaptizine = 10, - /obj/item/stack/sheet/mineral/plasma = 10, - /obj/item/stack/sheet/mineral/uranium = 5, - ) - rpg_title = "Plague Doctor" - job_flags = STATION_JOB_FLAGS - - -/datum/outfit/job/virologist - name = "Virologist" - jobtype = /datum/job/virologist - - id_trim = /datum/id_trim/job/virologist - uniform = /obj/item/clothing/under/rank/medical/virologist - suit = /obj/item/clothing/suit/toggle/labcoat/virologist - suit_store = /obj/item/flashlight/pen - belt = /obj/item/modular_computer/pda/viro - ears = /obj/item/radio/headset/headset_med - mask = /obj/item/clothing/mask/surgical - shoes = /obj/item/clothing/shoes/sneakers/white - - backpack = /obj/item/storage/backpack/virology - satchel = /obj/item/storage/backpack/satchel/vir - duffelbag = /obj/item/storage/backpack/duffelbag/virology - messenger = /obj/item/storage/backpack/messenger/vir - - box = /obj/item/storage/box/survival/medical 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 38989d45d2d..ee6c9ee68f0 100644 --- a/code/modules/modular_computers/computers/item/role_tablet_presets.dm +++ b/code/modules/modular_computers/computers/item/role_tablet_presets.dm @@ -230,15 +230,6 @@ /datum/computer_file/program/radar/lifeline, ) -/obj/item/modular_computer/pda/viro - name = "virology PDA" - greyscale_config = /datum/greyscale_config/tablet/stripe_double - greyscale_colors = "#FAFAFA#355FAC#57C451" - starting_programs = list( - /datum/computer_file/program/records/medical, - /datum/computer_file/program/robocontrol, - ) - /obj/item/modular_computer/pda/chemist name = "chemist PDA" greyscale_config = /datum/greyscale_config/tablet/stripe_thick diff --git a/config/jobconfig.toml b/config/jobconfig.toml index 7106d2f2a4e..294868e28bb 100644 --- a/config/jobconfig.toml +++ b/config/jobconfig.toml @@ -183,8 +183,8 @@ "# Playtime Requirements" = 0 "# Required Account Age" = 0 "# Required Character Age" = 0 -"# Spawn Positions" = 3 -"# Total Positions" = 5 +"# Spawn Positions" = 4 +"# Total Positions" = 6 [MIME] "# Playtime Requirements" = 0 @@ -270,13 +270,6 @@ "# Spawn Positions" = 0 "# Total Positions" = 0 -[VIROLOGIST] -"# Playtime Requirements" = 60 -"# Required Account Age" = 0 -"# Required Character Age" = 0 -"# Spawn Positions" = 1 -"# Total Positions" = 1 - [WARDEN] "# Playtime Requirements" = 300 "# Required Account Age" = 7 diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 5bcd1df47d9..95453cb46ed 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/toys/toy.dmi b/icons/obj/toys/toy.dmi index f53b0781f6e..775192c5255 100644 Binary files a/icons/obj/toys/toy.dmi and b/icons/obj/toys/toy.dmi differ diff --git a/tgstation.dme b/tgstation.dme index e48c0d64a1e..b1387a23282 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -4263,7 +4263,6 @@ #include "code\modules\jobs\job_types\shaft_miner.dm" #include "code\modules\jobs\job_types\station_engineer.dm" #include "code\modules\jobs\job_types\unassigned.dm" -#include "code\modules\jobs\job_types\virologist.dm" #include "code\modules\jobs\job_types\warden.dm" #include "code\modules\jobs\job_types\antagonists\abductor_agent.dm" #include "code\modules\jobs\job_types\antagonists\abductor_scientist.dm" diff --git a/tgui/packages/tgui/interfaces/common/JobToIcon.ts b/tgui/packages/tgui/interfaces/common/JobToIcon.ts index 4d6410fc72c..74927a2ff08 100644 --- a/tgui/packages/tgui/interfaces/common/JobToIcon.ts +++ b/tgui/packages/tgui/interfaces/common/JobToIcon.ts @@ -54,6 +54,5 @@ export const JOB2ICON = { 'Station Engineer': 'gears', 'Syndicate Operative': 'dragon', 'Veteran Security Advisor': 'ribbon', - Virologist: 'virus', Warden: 'handcuffs', } as const;