From c9d0421826b71abe08df3d9fc90ab3d68b0f505c Mon Sep 17 00:00:00 2001 From: alsoandanswer Date: Thu, 14 Nov 2019 00:57:07 +0800 Subject: [PATCH] workaround because i cant be bothered --- code/modules/clothing/head/misc_special.dm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index b24fefcc94d..f3f23d3f93b 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -155,13 +155,14 @@ if(istype(O, /obj/item/weapon/flame/candle)) var/obj/item/weapon/flame/candle/c = O var/candle_wax = c.wax - var/candle_lit = c.lit - to_chat(user, "You add [O] to [src].") + if(c.lit) + to_chat(user, span("notice", "You should extinguish \the [O] first!")) + return + to_chat(user, "You add \the [O] to \the [src].") playsound(src.loc, 'sound/items/drop/gloves.ogg', 50, 1) qdel(O) var/obj/item/clothing/head/pumpkin/lantern/L = new /obj/item/clothing/head/pumpkin/lantern(user.loc) L.wax = candle_wax - L.lit = candle_lit user.put_in_hands(L) qdel(src) return @@ -173,13 +174,6 @@ var/wax = 900 var/lit = 0 -/obj/item/clothing/head/pumpkin/lantern/New() - ..() - if(lit) - set_light(CANDLE_LUM) - update_icon() - START_PROCESSING(SSprocessing, src) - /obj/item/clothing/head/pumpkin/lantern/update_icon() icon_state = "pumpkin_carved[lit ? "_lit" : ""]" if(ismob(loc))