From 22cca56c2f06f2b0e861c2b4146325447965bf64 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 16 Dec 2019 20:13:47 +0100 Subject: [PATCH] Fixes shells having a heartbeat on medhud (#7678) God, I fucking hate shells for making me do this, but there's like no other way to do it. --- code/modules/mob/living/carbon/human/life.dm | 2 + html/changelogs/mattatlas-shellfix.yml | 41 ++++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 html/changelogs/mattatlas-shellfix.yml diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 40b4eb324c6..20209c7c0f4 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1154,6 +1154,8 @@ holder.icon_state = "0" // X_X else if(is_asystole()) holder.icon_state = "flatline" + else if(isFBP(src)) + holder.icon_state = "2" else holder.icon_state = "[pulse()]" hud_list[HEALTH_HUD] = holder diff --git a/html/changelogs/mattatlas-shellfix.yml b/html/changelogs/mattatlas-shellfix.yml new file mode 100644 index 00000000000..46247a43d82 --- /dev/null +++ b/html/changelogs/mattatlas-shellfix.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: 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, 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: "Shells now have a heartbeat on the medhud."