From ce13f83307b9aa393bed40f2d781dceee29ef740 Mon Sep 17 00:00:00 2001 From: nerocavalier <61446250+nerocavalier@users.noreply.github.com> Date: Sat, 11 Sep 2021 10:54:32 -0500 Subject: [PATCH] Patient monitoring console QoL (#12467) --- code/game/machinery/computer/Operating.dm | 22 +++++++--- .../nerocavalier-examineconsole.yml | 42 +++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/nerocavalier-examineconsole.yml diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 025a9cbab35..8b26f7ab15f 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -47,12 +47,9 @@ var/dat = "Operating Computer\n" if(src.table && (src.table.check_victim())) src.victim = src.table.victim - var/brain_result = victim.get_brain_status() - if(victim.isFBP()) - brain_result = "N/A" dat += {" Patient Information:
-Brain Activity: [brain_result]
+Brain Activity: [victim.isFBP() ? "N/A" : victim.get_brain_status()]
Pulse: [victim.get_pulse(GETPULSE_TOOL)]
BP: [victim.get_blood_pressure()]
Blood Oxygenation: [victim.get_blood_oxygenation()]
@@ -68,6 +65,21 @@ Blood Oxygenation: [victim.get_blood_oxygenation()]
op_win.set_content(dat) op_win.open() +/obj/machinery/computer/operating/examine(mob/user) + ..() + if(get_dist(src, user) <= 2) + if(src.table && (src.table.check_victim())) + src.victim = src.table.victim + + to_chat(user, SPAN_NOTICE("Patient Info:")) + to_chat(user, SPAN_NOTICE("Brain Activity: [victim.isFBP() ? "N/A" : victim.get_brain_status()]")) + to_chat(user, SPAN_NOTICE("Pulse: [victim.get_pulse(GETPULSE_TOOL)]")) + to_chat(user, SPAN_NOTICE("BP: [victim.get_blood_pressure()]")) + to_chat(user, SPAN_NOTICE("Blood Oxygenation: [victim.get_blood_oxygenation()]")) + else + src.victim = null + to_chat(user, SPAN_NOTICE("No Patient Detected")) + /obj/machinery/computer/operating/Topic(href, href_list) if(..()) return 1 @@ -78,4 +90,4 @@ Blood Oxygenation: [victim.get_blood_oxygenation()]
/obj/machinery/computer/operating/machinery_process() if(operable()) - src.updateDialog() \ No newline at end of file + src.updateDialog() diff --git a/html/changelogs/nerocavalier-examineconsole.yml b/html/changelogs/nerocavalier-examineconsole.yml new file mode 100644 index 00000000000..bd41e37e859 --- /dev/null +++ b/html/changelogs/nerocavalier-examineconsole.yml @@ -0,0 +1,42 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: NeroCavalier + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "You can now examine the patient monitoring console in the OR to see your patient's status instead of having to click on it with an empty hand." +