From ebe8a7e11ebdc305c64589c74978bf01b6370dd0 Mon Sep 17 00:00:00 2001
From: Roxy <75404941+TealSeer@users.noreply.github.com>
Date: Wed, 3 Dec 2025 04:50:26 -0600
Subject: [PATCH] Fix molotov cocktails not lighting  (#94269)

---
 code/modules/reagents/reagent_containers/cups/_cup.dm        | 5 ++++-
 code/modules/reagents/reagent_containers/cups/glassbottle.dm | 5 +++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/code/modules/reagents/reagent_containers/cups/_cup.dm b/code/modules/reagents/reagent_containers/cups/_cup.dm
index c2ac3844771..15ce8277316 100644
--- a/code/modules/reagents/reagent_containers/cups/_cup.dm
+++ b/code/modules/reagents/reagent_containers/cups/_cup.dm
@@ -23,10 +23,13 @@
 	var/reagent_consumption_method = INGEST
 	///What sound does our consumption play on consuming from the container?
 	var/consumption_sound = 'sound/items/drink.ogg'
+	///Whether to allow heating up the contents with a source of flame.
+	var/heatable = TRUE
 
 /obj/item/reagent_containers/cup/Initialize(mapload, vol)
 	. = ..()
-	AddElement(/datum/element/reagents_item_heatable)
+	if(heatable)
+		AddElement(/datum/element/reagents_item_heatable)
 
 /obj/item/reagent_containers/cup/examine(mob/user)
 	. = ..()
diff --git a/code/modules/reagents/reagent_containers/cups/glassbottle.dm b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
index b4682b10571..f45bab961a0 100644
--- a/code/modules/reagents/reagent_containers/cups/glassbottle.dm
+++ b/code/modules/reagents/reagent_containers/cups/glassbottle.dm
@@ -880,6 +880,7 @@
 	desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss."
 	icon_state = "vodkabottle"
 	list_reagents = list()
+	heatable = FALSE
 	var/active = FALSE
 	var/list/accelerants = list(
 		/datum/reagent/consumable/ethanol,
@@ -907,11 +908,11 @@
 	..(hit_atom, throwingdatum, do_splash = FALSE)
 
 /obj/item/reagent_containers/cup/glass/bottle/molotov/smash(atom/target, mob/thrower, datum/thrownthing/throwingdatum, break_top)
-	var/firestarter = 0
+	var/firestarter = FALSE
 	for(var/datum/reagent/contained_reagent in reagents.reagent_list)
 		for(var/accelerant_type in accelerants)
 			if(istype(contained_reagent, accelerant_type))
-				firestarter = 1
+				firestarter = TRUE
 				break
 	..()
 	if(firestarter && active)