From ca82d79d872f8a1b60425a4aeceac33219beba96 Mon Sep 17 00:00:00 2001 From: Certhic Date: Wed, 2 Sep 2020 10:04:23 +0200 Subject: [PATCH] fixes shotglass burning --- .../drinks/drinks/shotglass.dm | 2 ++ icons/obj/reagentfillings.dmi | Bin 3562 -> 5207 bytes 2 files changed, 2 insertions(+) diff --git a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm index d5d114fb43f..7b3349e4c2d 100644 --- a/code/modules/food_and_drinks/drinks/drinks/shotglass.dm +++ b/code/modules/food_and_drinks/drinks/drinks/shotglass.dm @@ -7,6 +7,7 @@ materials = list(MAT_GLASS=100) var/light_intensity = 2 light_color = LIGHT_COLOR_LIGHTBLUE + resistance_flags = FLAMMABLE /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change() if(!isShotFlammable() && (resistance_flags & ON_FIRE)) @@ -30,6 +31,7 @@ overlays += filling name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future. if(resistance_flags & ON_FIRE) + cut_overlay(GLOB.fire_overlay, TRUE) overlays += "shotglass_fire" name = "flaming [name]" else diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 60eb897b2b18a85d22a299e6d5be8f4796b18014..51e9b66ee304ab05fe40668f6e5cfcd0d7a3040d 100644 GIT binary patch literal 5207 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 bx2)cWvRxfQU+p6MhXb4)PdGFkJeTqxV&Q64