diff --git a/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm index 87b525a5..657da5b7 100644 --- a/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm +++ b/GainStation13/code/modules/food_and_drinks/objects/candy_flora.dm @@ -18,6 +18,23 @@ icon = 'GainStation13/icons/turf/decals_candy.dmi' icon_state = "candy_decal3" +/obj/effect/turf_decal/candy/greenwhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_g1" + +/obj/effect/turf_decal/candy/greenwhite2 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_g2" + +/obj/effect/turf_decal/candy/bluewhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_b1" + +/obj/effect/turf_decal/candy/purplewhite1 + icon = 'GainStation13/icons/turf/decals_candy.dmi' + icon_state = "candy_decal_p1" + + /obj/structure/lollipop //ik it's not necessarily a decal but I'm lazy rn and will (hopefully) move it later name = "Lollipop tree" desc = "A mere snack for people larger than life." diff --git a/GainStation13/code/obj/structure/candylight.dm b/GainStation13/code/obj/structure/candylight.dm new file mode 100644 index 00000000..220b7073 --- /dev/null +++ b/GainStation13/code/obj/structure/candylight.dm @@ -0,0 +1,9 @@ +/obj/structure/tree/candylight //GS13 + name = "Peppermint Light" + desc = "A light source that's made out of a peppermint tree." + icon = 'GainStation13/icons/obj/gslight.dmi' + icon_state = "candylight" + max_integrity = 500 + light_color = "#a5cfc5" //testing out my copy cat skills. -Metussi + light_range = 3 + anchored = 1 diff --git a/GainStation13/icons/obj/gslight.dmi b/GainStation13/icons/obj/gslight.dmi new file mode 100644 index 00000000..d82cbd0f Binary files /dev/null and b/GainStation13/icons/obj/gslight.dmi differ diff --git a/GainStation13/icons/turf/decals_candy.dmi b/GainStation13/icons/turf/decals_candy.dmi index b9cfd99e..029c6a09 100644 Binary files a/GainStation13/icons/turf/decals_candy.dmi and b/GainStation13/icons/turf/decals_candy.dmi differ