From 0b47e4a4646456f006afe1a16ec88faf18eea735 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Fri, 24 May 2024 18:12:58 -0400 Subject: [PATCH 1/5] Apply suggestions from code review Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/medical_pod/autodoc.dm | 4 ++-- code/game/machinery/medical_pod/bodyscanner.dm | 2 +- code/modules/cm_marines/marines_consoles.dm | 6 +++--- code/modules/mob/living/carbon/human/human.dm | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index d77a9f154865..fa8858c1c647 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -74,7 +74,7 @@ if(operable()) visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"") else - to_chat(usr, "You remove \the [user_id_card] from \the [src].") + to_chat(usr, "You remove [user_id_card] from [src].") authenticated = FALSE user_id_card = null else diff --git a/code/game/machinery/medical_pod/autodoc.dm b/code/game/machinery/medical_pod/autodoc.dm index eeb7622997ff..cca98ca989a5 100644 --- a/code/game/machinery/medical_pod/autodoc.dm +++ b/code/game/machinery/medical_pod/autodoc.dm @@ -286,8 +286,8 @@ var/human_ref = WEAKREF(H) N = retrieve_record(record_id_ref = H.record_id_ref, mob_ref = human_ref, record_type = RECORD_TYPE_MEDICAL) if(isnull(N)) - visible_message("\The [src] buzzes: No records found for occupant.") - src.go_out() //kick them out too. + visible_message("[src] buzzes: No records found for occupant.") + go_out() //kick them out too. return var/list/surgery_todo_list = N.fields["autodoc_manual"] diff --git a/code/game/machinery/medical_pod/bodyscanner.dm b/code/game/machinery/medical_pod/bodyscanner.dm index 1793403aa345..6ad94e75e7ca 100644 --- a/code/game/machinery/medical_pod/bodyscanner.dm +++ b/code/game/machinery/medical_pod/bodyscanner.dm @@ -182,7 +182,7 @@ N.fields["last_tgui_scan_result"] = last_health_display.ui_data(user, DETAIL_LEVEL_BODYSCAN) N.fields[MOB_AUTODOC_DATA] = generate_autodoc_surgery_list(H) visible_message(SPAN_NOTICE("\The [src] pings as it stores the scan report of [H.real_name]")) - playsound(src.loc, 'sound/machines/screen_output1.ogg', 25) + playsound(loc, 'sound/machines/screen_output1.ogg', 25) last_health_display.look_at(user, DETAIL_LEVEL_BODYSCAN, bypass_checks = TRUE) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index 5c1b84d18efb..c8f8f0b6cbfe 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -73,7 +73,7 @@ if(operable()) // Powered. Console can response. visible_message("[SPAN_BOLD("[src]")] states, \"AUTH LOGOUT: Session end confirmed.\"") else - to_chat(usr, "You remove \the [user_id_card] from \the [src].") + to_chat(usr, "You remove [user_id_card] from [src].") authenticated = FALSE // No card - no access user_id_card = null @@ -86,7 +86,7 @@ target_id_card.name = text("[target_id_card.registered_name]'s ID Card ([target_id_card.assignment])") visible_message("[SPAN_BOLD("[src]")] states, \"CARD EJECT: Data imprinted. Updating database... Success.\"") else - to_chat(usr, "You remove \the [target_id_card] from \the [src].") + to_chat(usr, "You remove [target_id_card] from [src].") target_id_card = null else @@ -651,7 +651,7 @@ if(!user_id_card || !target_id_card || person_to_modify || user.name == user_id_card.registered_name) return - user.visible_message(SPAN_NOTICE("You hear a beep as [user]'s hand is scanned to \the [name].")) + user.visible_message(SPAN_NOTICE("You hear a beep as [user]'s hand is scanned to [name].")) visible_message("[SPAN_BOLD("[src]")] states, \"SCAN ENTRY: Scanned, please stay close until operation's end.\"") playsound(user.loc, 'sound/machines/screen_output1.ogg', 25, 1) person_to_modify = user diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index e260c5379f27..f46a04521892 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -19,7 +19,7 @@ prev_gender = gender // Debug for plural genders if(SSticker?.mode?.hardcore) - hardcore = TRUE //For WO disposing of corpsess + hardcore = TRUE //For WO disposing of corpses /mob/living/carbon/human/initialize_pass_flags(datum/pass_flags_container/PF) ..() From 0ad80eaa7d71702f9e49fd439b4ec3a9eb621438 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Fri, 24 May 2024 18:13:45 -0400 Subject: [PATCH 2/5] Update code/modules/cm_marines/marines_consoles.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/modules/cm_marines/marines_consoles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/marines_consoles.dm b/code/modules/cm_marines/marines_consoles.dm index c8f8f0b6cbfe..eac73b911dfa 100644 --- a/code/modules/cm_marines/marines_consoles.dm +++ b/code/modules/cm_marines/marines_consoles.dm @@ -636,7 +636,7 @@ return data /obj/structure/machinery/computer/double_id/squad_changer/attack_alien(mob/living/carbon/xenomorph/xeno_user) - xeno_user.visible_message(SPAN_NOTICE("You hear a beep as [xeno_user]'s limb is scanned to \the [name].")) + xeno_user.visible_message(SPAN_NOTICE("You hear a beep as [xeno_user]'s limb is scanned to [name].")) visible_message("[SPAN_BOLD("[src]")] states, \"SCAN ENTRY: Unknown lifeform detected! Forbidden operation!\"") playsound(xeno_user.loc, 'sound/machines/screen_output1.ogg', 25, 1) return XENO_ATTACK_ACTION From 366cdfccdeb948a4107aedb8a1bdf1d4971b3205 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Fri, 24 May 2024 18:14:09 -0400 Subject: [PATCH 3/5] Update code/game/machinery/computer/medical.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/computer/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index dc5a95ea0f42..09bbc3758221 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -146,7 +146,7 @@ return TRUE /obj/structure/machinery/computer/double_id/med_data/proc/print_paper() - playsound(src.loc, 'sound/machines/fax.ogg', 15, 1) + playsound(loc, 'sound/machines/fax.ogg', 15, 1) var/contents = {"

Medical Report

Prepared By: [user_id_card?.registered_name ? user_id_card.registered_name : "Unknown"]
For: [target_id_card.registered_name ? target_id_card.registered_name : "Unregistered"]
From f8cc221a389c65a48e72bae70f1c49f05b854bfa Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Fri, 24 May 2024 18:14:20 -0400 Subject: [PATCH 4/5] Update code/game/machinery/computer/medical.dm Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/computer/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 09bbc3758221..7cbb93fa0968 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -177,7 +177,7 @@ med_report.info += contents med_report.update_icon() - visible_message(SPAN_NOTICE("\The [src] prints out a paper.")) + visible_message(SPAN_NOTICE("[src] prints out a paper.")) return TRUE /obj/structure/machinery/computer/double_id/med_data/ui_static_data(mob/user) From 79806b0b2fdcc26ab69201fc3e8faa79167ebc02 Mon Sep 17 00:00:00 2001 From: Vero <73014819+vero5123@users.noreply.github.com> Date: Fri, 24 May 2024 18:15:10 -0400 Subject: [PATCH 5/5] Apply suggestions from code review Co-authored-by: Drathek <76988376+Drulikar@users.noreply.github.com> --- code/game/machinery/medical_pod/bodyscanner.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/medical_pod/bodyscanner.dm b/code/game/machinery/medical_pod/bodyscanner.dm index 6ad94e75e7ca..5904073a1fb6 100644 --- a/code/game/machinery/medical_pod/bodyscanner.dm +++ b/code/game/machinery/medical_pod/bodyscanner.dm @@ -181,7 +181,7 @@ N.fields["last_tgui_scan_result"] = last_health_display.ui_data(user, DETAIL_LEVEL_BODYSCAN) N.fields[MOB_AUTODOC_DATA] = generate_autodoc_surgery_list(H) - visible_message(SPAN_NOTICE("\The [src] pings as it stores the scan report of [H.real_name]")) + visible_message(SPAN_NOTICE("[src] pings as it stores the scan report of [H.real_name]")) playsound(loc, 'sound/machines/screen_output1.ogg', 25) last_health_display.look_at(user, DETAIL_LEVEL_BODYSCAN, bypass_checks = TRUE)