diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 00c1af7f503..311512d7f56 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -177,7 +177,23 @@
 		swap_hand()
 
 /mob/living/carbon/proc/help_shake_act(mob/living/carbon/M)
-	if (!is_asystole())
+	if (on_fire)
+		playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+		if (M.on_fire)
+			M.visible_message(span("warning", "[M] tries to pat out [src]'s flames, but to no avail!"),
+			span("warning", "You try to pat out [src]'s flames, but to no avail! Put yourself out first!"))
+		else
+			M.visible_message(span("warning", "[M] tries to pat out [src]'s flames!"),
+			span("warning", "You try to pat out [src]'s flames! Hot!"))
+			if(do_mob(M, src, 1.5 SECONDS))
+				if (M.IgniteMob(prob(10)))
+					M.visible_message(span("danger", "The fire spreads from [src] to [M]!"),
+					span("danger", "The fire spreads to you as well!"))
+				else
+					if (src.ExtinguishMob(1))
+						M.visible_message(span("warning", "[M] successfully pats out [src]'s flames."),
+						span("warning", "You successfully pat out [src]'s flames."))
+	else if (!is_asystole())
 		if(src == M && istype(src, /mob/living/carbon/human))
 			var/mob/living/carbon/human/H = src
 			src.visible_message(
@@ -226,22 +242,6 @@
 
 			if((isskeleton(H)) && (!H.w_uniform) && (!H.wear_suit))
 				H.play_xylophone()
-		else if (on_fire)
-			playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
-			if (M.on_fire)
-				M.visible_message(span("warning", "[M] tries to pat out [src]'s flames, but to no avail!"),
-				span("warning", "You try to pat out [src]'s flames, but to no avail! Put yourself out first!"))
-			else
-				M.visible_message(span("warning", "[M] tries to pat out [src]'s flames!"),
-				span("warning", "You try to pat out [src]'s flames! Hot!"))
-				if(do_mob(M, src, 1.5 SECONDS))
-					if (M.IgniteMob(prob(10)))
-						M.visible_message(span("danger", "The fire spreads from [src] to [M]!"),
-						span("danger", "The fire spreads to you as well!"))
-					else
-						if (src.ExtinguishMob(1))
-							M.visible_message(span("warning", "[M] successfully pats out [src]'s flames."),
-							span("warning", "You successfully pat out [src]'s flames."))
 		else
 			var/t_him = "it"
 			if (src.gender == MALE)
diff --git a/html/changelogs/extinguish_priority.yml b/html/changelogs/extinguish_priority.yml
new file mode 100644
index 00000000000..7e0ddf5998c
--- /dev/null
+++ b/html/changelogs/extinguish_priority.yml
@@ -0,0 +1,7 @@
+author: mikomyazaki
+
+delete-after: True
+
+changes: 
+  - bugfix: "Patting out flames on a target will now take priority over CPR, examining wounds, etc."
+  - bugfix: "Can now pat out flames on targets that are dead, have no heartbeat or no heart."
\ No newline at end of file