workaround because i cant be bothered

This commit is contained in:
alsoandanswer
2019-11-14 00:57:07 +08:00
parent 2698972eca
commit c9d0421826

View File

@@ -155,13 +155,14 @@
if(istype(O, /obj/item/weapon/flame/candle)) if(istype(O, /obj/item/weapon/flame/candle))
var/obj/item/weapon/flame/candle/c = O var/obj/item/weapon/flame/candle/c = O
var/candle_wax = c.wax var/candle_wax = c.wax
var/candle_lit = c.lit if(c.lit)
to_chat(user, "You add [O] to [src].") 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) playsound(src.loc, 'sound/items/drop/gloves.ogg', 50, 1)
qdel(O) qdel(O)
var/obj/item/clothing/head/pumpkin/lantern/L = new /obj/item/clothing/head/pumpkin/lantern(user.loc) var/obj/item/clothing/head/pumpkin/lantern/L = new /obj/item/clothing/head/pumpkin/lantern(user.loc)
L.wax = candle_wax L.wax = candle_wax
L.lit = candle_lit
user.put_in_hands(L) user.put_in_hands(L)
qdel(src) qdel(src)
return return
@@ -173,13 +174,6 @@
var/wax = 900 var/wax = 900
var/lit = 0 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() /obj/item/clothing/head/pumpkin/lantern/update_icon()
icon_state = "pumpkin_carved[lit ? "_lit" : ""]" icon_state = "pumpkin_carved[lit ? "_lit" : ""]"
if(ismob(loc)) if(ismob(loc))