From bd9f1b36dde56830813f1b391957e6efc7006cb6 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Mon, 20 Nov 2023 20:22:49 +0100 Subject: [PATCH] sdafa (#17791) --- code/modules/mob/living/carbon/human/human.dm | 2 +- .../fluffyghost_fixmanifestimplosion.yml | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/fluffyghost_fixmanifestimplosion.yml diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 6c60272ebca..f44f12381bc 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -667,7 +667,7 @@ var/setmedical = tgui_input_list(usr, "Specify a new medical status for this person.", "Medical HUD", list("*SSD*", "*Deceased*", "*Missing*", "Physically Unfit", "Active", "Disabled", "Cancel"), R.physical_status) if(hasHUD(usr,"medical")) - if(setmedical != "Cancel") + if(!isnull(setmedical) && setmedical != "Cancel") R.physical_status = setmedical modified = 1 SSrecords.reset_manifest() diff --git a/html/changelogs/fluffyghost_fixmanifestimplosion.yml b/html/changelogs/fluffyghost_fixmanifestimplosion.yml new file mode 100644 index 00000000000..ee15d833aee --- /dev/null +++ b/html/changelogs/fluffyghost_fixmanifestimplosion.yml @@ -0,0 +1,41 @@ +################################ +# 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: FluffyGhost + +# 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: + - bugfix: "Fixed manifest imploding when someone tries to change the physical status via HUD and closes the window without hitting cancel."