Merge pull request #3289 from Citadel-Station-13/upstream-merge-31444

[MIRROR] Fixes cigarettes runtiming when preferences generation attempts to light them before initialization is done.
This commit is contained in:
LetterJay
2017-10-10 22:32:02 -04:00
committed by GitHub
+4
View File
@@ -157,6 +157,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
if(lit)
return
if(!initialized)
icon_state = icon_on
item_state = icon_on
return
lit = TRUE
name = "lit [name]"