Fix molotov cocktails not lighting (#94269)

This commit is contained in:
Roxy
2025-12-03 11:50:26 +01:00
committed by GitHub
parent 79b39c58d4
commit ebe8a7e11e
2 changed files with 7 additions and 3 deletions
@@ -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)
. = ..()
@@ -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)