From 6c23b4ca76ea63573c65f5d79dce0475e4a72dcb Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Thu, 12 Mar 2026 21:04:12 +0100 Subject: [PATCH] A few medical fixes. (#22022) - Pneumalin no longer fixes damage on robotic lungs. - Fixed augments not processing. This means that HUD augments are fixed as well. - Fixed health analyzers displaying damage between 0 and 1 as 'none'. Co-authored-by: Matt Atlas --- code/game/objects/items/devices/scanners.dm | 2 +- code/modules/organs/internal/_internal.dm | 1 - .../subtypes/augment/augments/eye_sensors.dm | 9 +-- .../Chemistry-Reagents-Medicine.dm | 4 +- html/changelogs/mattatlas-hotandcold.yml | 60 +++++++++++++++++++ 5 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/mattatlas-hotandcold.yml diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 3c95a3a43e7..50663e74227 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -74,7 +74,7 @@ BREATH ANALYZER switch(amount) if (0) output = "none" - if (1 to 10) + if (0 to 10) output = "minor" if (11 to 25) output = "moderate" diff --git a/code/modules/organs/internal/_internal.dm b/code/modules/organs/internal/_internal.dm index 6ad50469cc3..75d370b88c2 100644 --- a/code/modules/organs/internal/_internal.dm +++ b/code/modules/organs/internal/_internal.dm @@ -49,7 +49,6 @@ ..() - STOP_PROCESSING(SSprocessing, src) target.internal_organs |= src affected.internal_organs |= src target.internal_organs_by_name[organ_tag] = src diff --git a/code/modules/organs/subtypes/augment/augments/eye_sensors.dm b/code/modules/organs/subtypes/augment/augments/eye_sensors.dm index d57a4c8d354..0172784d552 100644 --- a/code/modules/organs/subtypes/augment/augments/eye_sensors.dm +++ b/code/modules/organs/subtypes/augment/augments/eye_sensors.dm @@ -48,10 +48,10 @@ if(selected_hud == "disabled") selected_hud = SEC_HUDTYPE - to_chat(user, "You activate \the [src].") + to_chat(user, SPAN_NOTICE("You activate \the [src].")) else selected_hud = "disabled" - to_chat(user, "You deactivate \the [src].") + to_chat(user, SPAN_NOTICE("You deactivate \the [src].")) /obj/item/organ/internal/augment/eye_sensors/security/process() ..() @@ -67,6 +67,7 @@ active_hud = "disabled" else active_hud = "disabled" + /obj/item/organ/internal/augment/eye_sensors/medical name = "integrated medical HUD sensors" action_button_name = "Toggle Medical Sensors" @@ -76,10 +77,10 @@ if(selected_hud == "disabled") selected_hud = MED_HUDTYPE - to_chat(user, "You activate \the [src].") + to_chat(user, SPAN_NOTICE("You activate \the [src].")) else selected_hud = "disabled" - to_chat(user, "You deactivate \the [src].") + to_chat(user, SPAN_NOTICE("You deactivate \the [src].")) /obj/item/organ/internal/augment/eye_sensors/medical/process() ..() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index c269b4f3be6..ced3bdd48ea 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -1615,13 +1615,13 @@ /singleton/reagent/pneumalin/affect_breathe(var/mob/living/carbon/human/H, var/alien, var/removed, var/datum/reagents/holder) H.adjustOxyLoss(removed) //Every unit heals 1 oxy damage - H.add_chemical_effect(CE_PNEUMOTOXIC, -removed * 1.5) + H.remove_chemical_effect(CE_PNEUMOTOXIC, removed * 1.5) H.add_chemical_effect(CE_PULSE, -1) var/obj/item/organ/internal/lungs/L = H.internal_organs_by_name[BP_LUNGS] if(istype(L) && !BP_IS_ROBOTIC(L)) L.rescued = FALSE - L.damage = max(L.damage - (removed * 1.5), 0) + L.heal_damage(removed * 1.5) . = ..() diff --git a/html/changelogs/mattatlas-hotandcold.yml b/html/changelogs/mattatlas-hotandcold.yml new file mode 100644 index 00000000000..470b31f33db --- /dev/null +++ b/html/changelogs/mattatlas-hotandcold.yml @@ -0,0 +1,60 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Pneumalin no longer fixes damage on robotic lungs." + - bugfix: "Fixed augments not processing. This means that HUD augments are fixed as well." + - bugfix: "Fixed health analyzers displaying damage between 0 and 1 as 'none'."