From c517ea7c5b4a49eff1bd96dfdf3be1ff583618ed Mon Sep 17 00:00:00 2001
From: iloveloopers <140007537+iloveloopers@users.noreply.github.com>
Date: Sat, 20 Apr 2024 01:19:49 -0400
Subject: [PATCH] white phosphorus smoke can no longer override stronger flames
 (#6137)

# About the pull request
white phosphorus smoke will no longer forcefully set the reagent of the
mob

# Explain why it's good for the game
when hit by a WP rocket, a mob is supposed to be set with the blueflame
reagent but sometimes the phosphorus smoke can override it just as you
leave the fire and the mob's fire reagent ends up being normal UT
napalm, which is signficantly weaker than blueflame.

# Testing Photographs and Procedure
yes I tested it

# Changelog
:cl:
fix: White phosphorus will no longer forcefully set a mob's fire_reagent
to be UT napthal
/:cl:
---
 code/game/objects/effects/effect_system/smoke.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
index b79e50b453cc..6e3869f563a4 100644
--- a/code/game/objects/effects/effect_system/smoke.dm
+++ b/code/game/objects/effects/effect_system/smoke.dm
@@ -240,9 +240,9 @@
 	if(isyautja(M) || isxeno(M))
 		burn_damage *= xeno_yautja_reduction
 
+	var/reagent = new /datum/reagent/napalm/ut()
 	M.burn_skin(burn_damage)
-	M.adjust_fire_stacks(applied_fire_stacks)
-	M.fire_reagent = new /datum/reagent/napalm/ut()
+	M.adjust_fire_stacks(applied_fire_stacks, reagent)
 	M.IgniteMob()
 	M.updatehealth()