diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index 48d9aa7273..324d26cc64 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -91,24 +91,27 @@ ui.open() /obj/structure/filingcabinet/tgui_data(mob/user) - var/list/files = list() - for(var/obj/item/P in src) - files.Add(list(list( - "name" = P.name, - "ref" = "\ref[P]", - ))) + var/list/data = list() - return list("contents" = files) + data["cabinet_name"] = "[name]" + data["contents"] = list() + data["contents_ref"] = list() + for(var/obj/item/content in src) + data["contents"] += "[content]" + data["contents_ref"] += "[REF(content)]" -/obj/structure/filingcabinet/tgui_act(action, params, datum/tgui/ui) - if(..()) - return TRUE + return data + +/obj/structure/filingcabinet/tgui_act(action, params) + . = ..() + if(.) + return switch(action) - if("retrieve") - var/obj/item/P = locate(params["ref"]) - if(istype(P) && (P.loc == src) && ui.user.Adjacent(src)) - ui.user.put_in_hands(P) + if("remove_object") + var/obj/item/content = locate(params["ref"]) in src + if(istype(content) && (content.loc == src) && usr.Adjacent(src)) + usr.put_in_hands(content) open_animation() SStgui.update_uis(src) @@ -134,9 +137,9 @@ S = R break var/obj/item/paper/P = new /obj/item/paper(src) - P.info = "
Security Record

" + P.info = "
" + span_bold("Security Record") + "

" P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - P.info += "
\n
Security Data

\nCriminal Status: [S.fields["criminal"]]
\n
\nMinor Crimes: [S.fields["mi_crim"]]
\nDetails: [S.fields["mi_crim_d"]]
\n
\nMajor Crimes: [S.fields["ma_crim"]]
\nDetails: [S.fields["ma_crim_d"]]
\n
\nImportant Notes:
\n\t[S.fields["notes"]]
\n
\n
Comments/Log

" + P.info += "
\n
" + span_bold("Security Data") + "

\nCriminal Status: [S.fields["criminal"]]
\n
\nMinor Crimes: [S.fields["mi_crim"]]
\nDetails: [S.fields["mi_crim_d"]]
\n
\nMajor Crimes: [S.fields["ma_crim"]]
\nDetails: [S.fields["ma_crim_d"]]
\n
\nImportant Notes:
\n\t[S.fields["notes"]]
\n
\n
" + span_bold("Comments/Log") + "

" var/counter = 1 while(S.fields["com_[counter]"]) P.info += "[S.fields["com_[counter]"]]
" @@ -170,10 +173,10 @@ break if(M) var/obj/item/paper/P = new /obj/item/paper(src) - P.info = "
Medical Record

" + P.info = "
" + span_bold("Medical Record") + "

" P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - P.info += "
\n
Medical Data

\nBlood Type: [M.fields["b_type"]]
\nDNA: [M.fields["b_dna"]]
\n
\nMinor Disabilities: [M.fields["mi_dis"]]
\nDetails: [M.fields["mi_dis_d"]]
\n
\nMajor Disabilities: [M.fields["ma_dis"]]
\nDetails: [M.fields["ma_dis_d"]]
\n
\nAllergies: [M.fields["alg"]]
\nDetails: [M.fields["alg_d"]]
\n
\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)
\nDetails: [M.fields["cdi_d"]]
\n
\nImportant Notes:
\n\t[M.fields["notes"]]
\n
\n
Comments/Log

" + P.info += "
\n
" + span_bold("Medical Data") + "

\nBlood Type: [M.fields["b_type"]]
\nDNA: [M.fields["b_dna"]]
\n
\nMinor Disabilities: [M.fields["mi_dis"]]
\nDetails: [M.fields["mi_dis_d"]]
\n
\nMajor Disabilities: [M.fields["ma_dis"]]
\nDetails: [M.fields["ma_dis_d"]]
\n
\nAllergies: [M.fields["alg"]]
\nDetails: [M.fields["alg_d"]]
\n
\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)
\nDetails: [M.fields["cdi_d"]]
\n
\nImportant Notes:
\n\t[M.fields["notes"]]
\n
\n
" + span_bold("Comments/Log") + "

" var/counter = 1 while(M.fields["com_[counter]"]) P.info += "[M.fields["com_[counter]"]]
" diff --git a/modular_chomp/code/modules/paperwork/filingcabinet.dm b/modular_chomp/code/modules/paperwork/filingcabinet.dm deleted file mode 100644 index be11490fb3..0000000000 --- a/modular_chomp/code/modules/paperwork/filingcabinet.dm +++ /dev/null @@ -1,190 +0,0 @@ -/* Filing cabinets! - * Contains: - * Filing Cabinets - * Security Record Cabinets - * Medical Record Cabinets - */ - - -/* - * Filing Cabinets - */ -/obj/structure/filingcabinet - name = "filing cabinet" - desc = "A large cabinet with drawers." - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "filingcabinet" - density = TRUE - anchored = TRUE - -/obj/structure/filingcabinet/chestdrawer - name = "chest drawer" - icon_state = "chestdrawer" - -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unecessary map issues, but please don't name stuff like this in the future -Pete - icon_state = "tallcabinet" - - -/obj/structure/filingcabinet/Initialize(mapload) - for(var/obj/item/I in loc) - if(istype(I, /obj/item/paper) || istype(I, /obj/item/folder) || istype(I, /obj/item/photo) || istype(I, /obj/item/paper_bundle)) - I.loc = src - . = ..() - -/obj/structure/filingcabinet/attackby(obj/item/P as obj, mob/user as mob) - if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/paper_bundle)) - to_chat(user, span_notice("You put [P] in [src].")) - user.drop_item() - P.loc = src - open_animation() - SStgui.update_uis(src) - else if(P.has_tool_quality(TOOL_WRENCH)) - playsound(src, P.usesound, 50, 1) - anchored = !anchored - to_chat(user, span_notice("You [anchored ? "wrench" : "unwrench"] \the [src].")) - else if(P.has_tool_quality(TOOL_SCREWDRIVER)) - to_chat(user, span_notice("You begin taking the [name] apart.")) - playsound(src, P.usesound, 50, 1) - if(do_after(user, 10 * P.toolspeed)) - playsound(src, P.usesound, 50, 1) - to_chat(user, span_notice("You take the [name] apart.")) - new /obj/item/stack/material/steel( src.loc, 4 ) - for(var/obj/item/I in contents) - I.forceMove(loc) - qdel(src) - return - else - to_chat(user, span_notice("You can't put [P] in [src]!")) - -/obj/structure/filingcabinet/attack_hand(mob/user as mob) - tgui_interact(user) - -/obj/structure/filingcabinet/attack_tk(mob/user) - if(anchored) - return attack_self_tk(user) - return ..() - -/obj/structure/filingcabinet/attack_self_tk(mob/user) - if(contents.len) - if(prob(40 + contents.len * 5)) - var/obj/item/I = pick(contents) - I.loc = loc - if(prob(25)) - step_rand(I) - to_chat(user, span_notice("You pull \a [I] out of [src] at random.")) - return - to_chat(user, span_notice("You find nothing in [src].")) - -/obj/structure/filingcabinet/tgui_state(mob/user) - return GLOB.tgui_physical_state - -/obj/structure/filingcabinet/tgui_interact(mob/user, datum/tgui/ui) - ui = SStgui.try_update_ui(user, src, ui) - if(!ui) - ui = new(user, src, "FilingCabinet", name) - ui.set_autoupdate(FALSE) - ui.open() - -/obj/structure/filingcabinet/tgui_data(mob/user) - var/list/data = list() - - data["cabinet_name"] = "[name]" - data["contents"] = list() - data["contents_ref"] = list() - for(var/obj/item/content in src) - data["contents"] += "[content]" - data["contents_ref"] += "[REF(content)]" - - return data - -/obj/structure/filingcabinet/tgui_act(action, params) - . = ..() - if(.) - return - - switch(action) - if("remove_object") - var/obj/item/content = locate(params["ref"]) in src - if(istype(content) && (content.loc == src) && usr.Adjacent(src)) - usr.put_in_hands(content) - open_animation() - SStgui.update_uis(src) - -/obj/structure/filingcabinet/proc/open_animation() - flick("[initial(icon_state)]-open",src) - playsound(src, 'sound/bureaucracy/filingcabinet.ogg', 50, 1) - spawn(0) - sleep(20) - icon_state = initial(icon_state) - -/* - * Security Record Cabinets - */ -/obj/structure/filingcabinet/security - var/virgin = 1 - -/obj/structure/filingcabinet/security/proc/populate() - if(virgin) - for(var/datum/data/record/G in GLOB.data_core.general) - var/datum/data/record/S - for(var/datum/data/record/R in GLOB.data_core.security) - if((R.fields["name"] == G.fields["name"] || R.fields["id"] == G.fields["id"])) - S = R - break - var/obj/item/paper/P = new /obj/item/paper(src) - P.info = "
" + span_bold("Security Record") + "

" - P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - P.info += "
\n
" + span_bold("Security Data") + "

\nCriminal Status: [S.fields["criminal"]]
\n
\nMinor Crimes: [S.fields["mi_crim"]]
\nDetails: [S.fields["mi_crim_d"]]
\n
\nMajor Crimes: [S.fields["ma_crim"]]
\nDetails: [S.fields["ma_crim_d"]]
\n
\nImportant Notes:
\n\t[S.fields["notes"]]
\n
\n
" + span_bold("Comments/Log") + "

" - var/counter = 1 - while(S.fields["com_[counter]"]) - P.info += "[S.fields["com_[counter]"]]
" - counter++ - P.info += "" - P.name = "Security Record ([G.fields["name"]])" - virgin = 0 //tabbing here is correct- it's possible for people to try and use it - //before the records have been generated, so we do this inside the loop. - -/obj/structure/filingcabinet/security/attack_hand() - populate() - ..() - -/obj/structure/filingcabinet/security/attack_tk() - populate() - ..() - -/* - * Medical Record Cabinets - */ -/obj/structure/filingcabinet/medical - var/virgin = 1 - -/obj/structure/filingcabinet/medical/proc/populate() - if(virgin) - for(var/datum/data/record/G in GLOB.data_core.general) - var/datum/data/record/M - for(var/datum/data/record/R in GLOB.data_core.medical) - if((R.fields["name"] == G.fields["name"] || R.fields["id"] == G.fields["id"])) - M = R - break - if(M) - var/obj/item/paper/P = new /obj/item/paper(src) - P.info = "
" + span_bold("Medical Record") + "

" - P.info += "Name: [G.fields["name"]] ID: [G.fields["id"]]
\nSex: [G.fields["sex"]]
\nAge: [G.fields["age"]]
\nFingerprint: [G.fields["fingerprint"]]
\nPhysical Status: [G.fields["p_stat"]]
\nMental Status: [G.fields["m_stat"]]
" - - P.info += "
\n
" + span_bold("Medical Data") + "

\nBlood Type: [M.fields["b_type"]]
\nDNA: [M.fields["b_dna"]]
\n
\nMinor Disabilities: [M.fields["mi_dis"]]
\nDetails: [M.fields["mi_dis_d"]]
\n
\nMajor Disabilities: [M.fields["ma_dis"]]
\nDetails: [M.fields["ma_dis_d"]]
\n
\nAllergies: [M.fields["alg"]]
\nDetails: [M.fields["alg_d"]]
\n
\nCurrent Diseases: [M.fields["cdi"]] (per disease info placed in log/comment section)
\nDetails: [M.fields["cdi_d"]]
\n
\nImportant Notes:
\n\t[M.fields["notes"]]
\n
\n
" + span_bold("Comments/Log") + "

" - var/counter = 1 - while(M.fields["com_[counter]"]) - P.info += "[M.fields["com_[counter]"]]
" - counter++ - P.info += "" - P.name = "Medical Record ([G.fields["name"]])" - virgin = 0 //tabbing here is correct- it's possible for people to try and use it - //before the records have been generated, so we do this inside the loop. - -/obj/structure/filingcabinet/medical/attack_hand() - populate() - ..() - -/obj/structure/filingcabinet/medical/attack_tk() - populate() - ..() diff --git a/tgui/packages/tgui/interfaces/FileCabinet.tsx b/tgui/packages/tgui/interfaces/FileCabinet.tsx index 794b6eba35..856d53e934 100644 --- a/tgui/packages/tgui/interfaces/FileCabinet.tsx +++ b/tgui/packages/tgui/interfaces/FileCabinet.tsx @@ -1,34 +1,47 @@ import { useBackend } from 'tgui/backend'; import { Window } from 'tgui/layouts'; -import { Button, Section } from 'tgui-core/components'; +import { Box, Button, Section, Stack } from 'tgui-core/components'; -type Data = { contents: content[] }; - -type content = { name: string; ref: string }; +type Data = { + cabinet_name: string; + contents: string[]; + contents_ref: string[]; +}; export const FileCabinet = (props) => { const { act, data } = useBackend(); - - const { contents } = data; - - // Wow, the filing cabinets sort themselves in 2320. - contents.sort((a, b) => a.name.localeCompare(b.name)); - + const { cabinet_name, contents, contents_ref } = data; return ( - - -
- {contents.map((item) => ( - - ))} -
+ + + {contents.map((object, index) => ( + + + {object} + + +