From df1ef6c2fbf3f510546ede9c41b7c2bfe4d94d23 Mon Sep 17 00:00:00 2001
From: Casper3667 <CasperMC@hotmail.dk>
Date: Mon, 19 Apr 2021 19:10:29 +0200
Subject: [PATCH] Fixes trying mouth to mouth when people are on fire (#11700)

---
 code/modules/mob/living/carbon/human/human_attackhand.dm | 2 +-
 html/changelogs/MouthOnFire.yml                          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/MouthOnFire.yml

diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm
index a6f795b6f3c..baa5cd95709 100644
--- a/code/modules/mob/living/carbon/human/human_attackhand.dm
+++ b/code/modules/mob/living/carbon/human/human_attackhand.dm
@@ -102,7 +102,7 @@
 
 	switch(M.a_intent)
 		if(I_HELP)
-			if(H != src && istype(H) && (is_asystole() || (status_flags & FAKEDEATH) || failed_last_breath))
+			if(H != src && istype(H) && (is_asystole() || (status_flags & FAKEDEATH) || failed_last_breath) && !src.on_fire)
 				if (cpr)
 					cpr = FALSE
 					return
diff --git a/html/changelogs/MouthOnFire.yml b/html/changelogs/MouthOnFire.yml
new file mode 100644
index 00000000000..697cf5b6c94
--- /dev/null
+++ b/html/changelogs/MouthOnFire.yml
@@ -0,0 +1,6 @@
+author: TheGreyWolf
+
+delete-after: True
+
+changes:
+  - bugfix: "You will no longer attempt to resuscitate prone people who are on fire, instead they will be put out first."