diff --git a/code/datums/records.dm b/code/datums/records.dm index 3841f618eb8..b74e06ceba1 100644 --- a/code/datums/records.dm +++ b/code/datums/records.dm @@ -195,9 +195,6 @@ /datum/record/medical var/blood_type = "AB+" var/blood_dna = "63920c3ec24b5d57d459b33a2f4d6446" - var/disabilities = "No disabilities have been declared." - var/allergies = "No allergies have been detected in this patient." - var/diseases = "No diseases have been diagnosed at the moment." var/list/comments = list() /datum/record/medical/New(var/mob/living/carbon/human/H, var/nid) @@ -210,6 +207,7 @@ blood_dna = H.dna.unique_enzymes if(H.med_record && !jobban_isbanned(H, "Records")) notes = H.med_record + else notes = "No history has been reported yet." // Record for storing security data /datum/record/security diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 19c7ce3e6c5..a73ae61808a 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -758,7 +758,6 @@ var/message = "Medical Records: [R.name]\n\n" \ + "Name: [R.name] Blood Type: [R.medical.blood_type]\n" \ + "DNA: [R.medical.blood_dna]\n" \ - + "Disabilities: [R.medical.disabilities]\n" \ + "Notes: [R.medical.notes]\n" \ + "\[View Comment Log\]" to_chat(usr, EXAMINE_BLOCK_DEEP_CYAN(message)) diff --git a/code/modules/modular_computers/file_system/programs/generic/records.dm b/code/modules/modular_computers/file_system/programs/generic/records.dm index 6c9a1b402e8..a56a0ce12d3 100644 --- a/code/modules/modular_computers/file_system/programs/generic/records.dm +++ b/code/modules/modular_computers/file_system/programs/generic/records.dm @@ -22,7 +22,7 @@ var/datum/record/virus/active_virus var/listener/record/rconsole/listener var/authenticated = FALSE - var/default_screen = "general" + var/default_screen = "General" var/record_prefix = "" var/typechoices = list( "physical_status" = list("Active", "*Deceased*", "*SSD*", "*Missing*", "Physically Unfit", "Disabled"), @@ -53,7 +53,7 @@ records_type = RECORD_MEDICAL | RECORD_VIRUS edit_type = RECORD_MEDICAL - default_screen = "medical" + default_screen = "Medical" program_icon_state = "medical_record" program_key_icon_state = "teal_key" color = LIGHT_COLOR_CYAN @@ -70,7 +70,7 @@ records_type = RECORD_SECURITY edit_type = RECORD_SECURITY - default_screen = "security" + default_screen = "Security" program_icon_state = "security_record" program_key_icon_state = "yellow_key" color = LIGHT_COLOR_YELLOW @@ -88,6 +88,7 @@ records_type = RECORD_GENERAL | RECORD_SECURITY edit_type = RECORD_GENERAL + default_screen = "General" program_icon_state = "employment_record" program_key_icon_state = "lightblue_key" color = LIGHT_COLOR_BLUE @@ -267,12 +268,6 @@ if("medical") if(!(edit_type & RECORD_MEDICAL)) return FALSE - if("diseases") - if(!(edit_type & RECORD_MEDICAL)) - return FALSE - if("allergies") - if(!(edit_type & RECORD_MEDICAL)) - return FALSE if("blood_type") if(!(edit_type & RECORD_MEDICAL) || (edit_type & RECORD_SECURITY)) return FALSE diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 4c9abcc0f36..f386cd11de3 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -167,9 +167,6 @@ Mental Status: [R.mental_status]
Medical Data

Blood Type: [R.medical.blood_type]
DNA: [R.medical.blood_dna]

-Disabilities: [R.medical.disabilities]

-Allergies: [R.medical.allergies]
-Current Diseases: [R.medical.diseases] (per disease info placed in log/comment section)

Important Notes:
[replacetext(R.medical.notes, "\n", "
")]

Comments/Log

diff --git a/html/changelogs/Hellfirejag-records-console-tweaks.yml b/html/changelogs/Hellfirejag-records-console-tweaks.yml new file mode 100644 index 00000000000..e93ec77ca15 --- /dev/null +++ b/html/changelogs/Hellfirejag-records-console-tweaks.yml @@ -0,0 +1,5 @@ +author: Hellfirejag +delete-after: True +changes: + - rscadd: "Records consoles now show their appropriate records types by default, EG: Medical showing full medical records, instead of only basic info." + - rscdel: "Medical records no longer displays Allergies, Disabilities and Diseases. These were vestigial remnants of something removed from the game 10 years ago." diff --git a/tgui/packages/tgui/interfaces/Records.tsx b/tgui/packages/tgui/interfaces/Records.tsx index ff95f5e3b41..1a90cf3197c 100644 --- a/tgui/packages/tgui/interfaces/Records.tsx +++ b/tgui/packages/tgui/interfaces/Records.tsx @@ -18,6 +18,7 @@ import { Dropdown } from '../components/Dropdown'; export type RecordsData = { activeview: string; + defaultview: string; editingvalue: string; physical_status_options: string[]; criminal_status_options: string[]; @@ -78,9 +79,6 @@ type Incident = { type Medical = { notes: string; - disabilities: string; - allergies: string; - diseases: string; blood_type: string; blood_dna: string; }; @@ -195,7 +193,11 @@ export const ListAllRecords = (props, context) => { // Omega shitcode ahead but this is my like 56th UI and I don't give a fuck anymore. export const ListActive = (props, context) => { const { act, data } = useBackend(context); - const [recordTab, setRecordTab] = useLocalState(context, 'recordTab', 'All'); + const [recordTab, setRecordTab] = useLocalState( + context, + 'recordTab', + data.defaultview, + ); const [editingPhysStatus, setEditingPhysStatus] = useLocalState( context, 'editingPhysStatus', @@ -244,22 +246,6 @@ export const ListActive = (props, context) => { false, ); - const [editingDisabilities, setEditingDisabilities] = useLocalState( - context, - 'editingDisabilities', - false, - ); - const [editingAllergies, setEditingAllergies] = useLocalState( - context, - 'editingAllergies', - false, - ); - const [editingDisease, setEditingDisease] = useLocalState( - context, - 'editingDisease', - false, - ); - return (
{ data.active.medical.blood_dna )} - - {data.editable & 2 ? ( - - {editingDisabilities ? ( - - act('editrecord', { - record_type: 'medical', - key: 'fingerprint', - value: v, - }) - } - /> - ) : ( - - {data.active.medical.disabilities}  -