From 527598807a0b28ef5695cbb55fd6eee11263a377 Mon Sep 17 00:00:00 2001
From: Mykhailo Bykhovtsev <mikebykhovtsev@gmail.com>
Date: Mon, 9 Mar 2020 09:04:38 -0700
Subject: [PATCH] Diona nymph immortality fix (#8368)

---
 .../living/carbon/alien/diona/diona_nymph.dm  |  7 ++++
 html/changelogs/Sindorman-diona.yml           | 41 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 html/changelogs/Sindorman-diona.yml

diff --git a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
index 0120d8e8984..6953142f062 100644
--- a/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
+++ b/code/modules/mob/living/carbon/alien/diona/diona_nymph.dm
@@ -364,3 +364,10 @@
 		else
 			user.visible_message(span("warning", "[user] butchers \the [src] messily!"))
 			gib()
+
+
+
+/mob/living/carbon/alien/diona/adjustBruteLoss(var/amount)
+	if (status_flags & GODMODE)
+		return
+	health = min(health - amount, maxHealth)
\ No newline at end of file
diff --git a/html/changelogs/Sindorman-diona.yml b/html/changelogs/Sindorman-diona.yml
new file mode 100644
index 00000000000..c08bd02ed92
--- /dev/null
+++ b/html/changelogs/Sindorman-diona.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: PoZe
+
+# 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: "Diona nymph is no longer immortal."