From f36d082b3c0d0e7953addbbbcefafafed24790de Mon Sep 17 00:00:00 2001 From: Shroopy Date: Wed, 15 Nov 2023 10:50:55 -0800 Subject: [PATCH] Fixes molotovs not lighting their splashed contents (#79727) ## About The Pull Request Delays fire effects on target and creating a hotspot until after bottle/smash (and the liquid is splashed), not before. ## Why It's Good For The Game Makes molotovs work properly ## Changelog :cl: fix: Molotovs now splash before burning, not after /:cl: --- code/modules/reagents/reagent_containers/cups/glassbottle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm index e204c6803fb..1eed3c36b76 100644 --- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm +++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm @@ -803,10 +803,10 @@ if(istype(contained_reagent, accelerant_type)) firestarter = 1 break + ..() if(firestarter && active) target.fire_act() new /obj/effect/hotspot(get_turf(target)) - ..() /obj/item/reagent_containers/cup/glass/bottle/molotov/attackby(obj/item/I, mob/user, params) if(I.get_temperature() && !active)