From fe4e0cd4366bec6db3cf71ccbaf65a7f1449b0a8 Mon Sep 17 00:00:00 2001 From: MrSky12 <71841824+MrSky12@users.noreply.github.com> Date: Thu, 16 Nov 2023 19:10:22 +0100 Subject: [PATCH] candy light enabled --- GainStation13/code/obj/structure/candylight.dm | 2 +- tgstation.dme | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/GainStation13/code/obj/structure/candylight.dm b/GainStation13/code/obj/structure/candylight.dm index 220b7073..b60925f8 100644 --- a/GainStation13/code/obj/structure/candylight.dm +++ b/GainStation13/code/obj/structure/candylight.dm @@ -1,4 +1,4 @@ -/obj/structure/tree/candylight //GS13 +/obj/structure/flora/candylight //GS13 name = "Peppermint Light" desc = "A light source that's made out of a peppermint tree." icon = 'GainStation13/icons/obj/gslight.dmi' diff --git a/tgstation.dme b/tgstation.dme index ada99090..b875a541 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3103,6 +3103,7 @@ #include "GainStation13\code\modules\vending\mealdor.dm" #include "GainStation13\code\obj\items\minor_items.dm" #include "GainStation13\code\obj\structure\calorite_doors.dm" +#include "GainStation13\code\obj\structure\candylight.dm" #include "GainStation13\code\obj\structure\fountain.dm" #include "GainStation13\code\obj\structure\scale.dm" #include "GainStation13\code\obj\weapons\fatoray.dm"