cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 19:44:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes candle sprites

Browse Source
This commit is contained in:
Anewbe
2019-01-18 14:46:09 -06:00
committed by VirgoBot
parent a0cb0a347d
commit 3d557f93d0
1 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/candle.dm
+27
View File
@@ -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."