Cigarette Fixes (#5597)

There was an issue with one of the travis checks that caused reagents with incorrect specific heat values to sneak into the game and cause havok. This fixes that.

Fixes #5594
Fixes #5593
This commit is contained in:
BurgerLUA
2018-11-12 09:39:28 +02:00
committed by Erki
parent 6d778d035c
commit c35ce60a50
11 changed files with 96 additions and 24 deletions
+1
View File
@@ -43,6 +43,7 @@
id = "honey"
description = "A golden yellow syrup, loaded with sugary sweetness."
color = "#FFFF00"
fallback_specific_heat = 0.75
/obj/item/weapon/book/manual/hydroponics_beekeeping
name = "The Ins and Outs of Apiculture - A Precise Art"
@@ -106,7 +106,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/smokable/process()
if(reagents && reagents.total_volume)
if(reagents && reagents.total_volume && burn_rate)
if(!initial_volume)
initial_volume = reagents.total_volume
var/mob/living/carbon/human/C = loc