From 3d557f93d01f6513a10c3e6eb0484d5aba82460c Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 18 Jan 2019 14:46:09 -0600 Subject: [PATCH] Fixes candle sprites --- code/game/objects/items/weapons/candle.dm | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm index 3f861b86d4..2c5d1dd263 100644 --- a/code/game/objects/items/weapons/candle.dm +++ b/code/game/objects/items/weapons/candle.dm @@ -68,6 +68,33 @@ update_icon() set_light(0) +<<<<<<< HEAD +======= +/obj/item/weapon/flame/candle/small + name = "small red candle" + desc = "a small red candle, for more intimate candle occasions." + icon = 'icons/obj/candle.dmi' + icon_state = "smallcandle" + icon_type = "smallcandle" + w_class = ITEMSIZE_SMALL + +/obj/item/weapon/flame/candle/white + name = "white candle" + desc = "a white pillar candle. Its specially-formulated fuel-oxidizer wax mixture allows continued combustion in airless environments." + icon = 'icons/obj/candle.dmi' + icon_state = "whitecandle" + icon_type = "whitecandle" + w_class = ITEMSIZE_SMALL + +/obj/item/weapon/flame/candle/black + name = "black candle" + desc = "a black pillar candle. Ominous." + icon = 'icons/obj/candle.dmi' + icon_state = "blackcandle" + icon_type = "blackcandle" + w_class = ITEMSIZE_SMALL + +>>>>>>> 3b2570d... Merge pull request #5856 from Cerebulon/candleicons /obj/item/weapon/flame/candle/candelabra name = "candelabra" desc = "a small gold candelabra. The cups that hold the candles save some of the wax from dripping off, allowing the candles to burn longer."