Better Molotoovs (#11128)

Molotovs now work off both alcohol and welding fuel.
    Molotovs now longer emit light if an unlit rag is inserted.
    Molotov rags now properly delete when they burn out.
This commit is contained in:
Geeves
2021-02-06 17:45:37 +02:00
committed by GitHub
parent 81068d0f6b
commit afeb4a0849
3 changed files with 44 additions and 12 deletions
@@ -101,12 +101,20 @@
update_icon()
/obj/item/reagent_containers/food/drinks/bottle/proc/remove_rag(mob/user)
if(!rag) return
if(!rag)
return
user.put_in_hands(rag)
rag = null
flags |= (initial(flags) & OPENCONTAINER)
update_icon()
/obj/item/reagent_containers/food/drinks/bottle/proc/delete_rag()
if(!rag)
return
QDEL_NULL(rag)
flags |= (initial(flags) & OPENCONTAINER)
update_icon()
/obj/item/reagent_containers/food/drinks/bottle/open(mob/user)
if(rag)
return
@@ -114,13 +122,14 @@
/obj/item/reagent_containers/food/drinks/bottle/update_icon()
underlays.Cut()
set_light(0)
if(rag)
var/underlay_image = image(icon='icons/obj/drinks.dmi', icon_state=rag.on_fire? "[rag_underlay]_lit" : rag_underlay)
underlays += underlay_image
set_light(2)
else
set_light(0)
..()
if(rag.on_fire)
set_light(2, l_color = LIGHT_COLOR_FIRE)
return
..()
/obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user, var/hit_zone)
var/blocked = ..()