diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index e20b4b1533d..f1c88130f75 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -27,6 +27,7 @@ #define EASTER "Easter" #define HALLOWEEN "Halloween" #define CHRISTMAS "Christmas" +#define FESTIVE_SEASON "Festive Season" #define FRIDAY_13TH "Friday the 13th" //Human Overlays Indexes///////// diff --git a/code/modules/events/holiday/xmas.dm b/code/modules/events/holiday/xmas.dm index 5821f00588c..9ee13888517 100644 --- a/code/modules/events/holiday/xmas.dm +++ b/code/modules/events/holiday/xmas.dm @@ -80,6 +80,10 @@ flags_inv = 0 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 0, acid = 0) +/obj/effect/landmark/xmastree + name = "christmas tree spawner" + var/tree = /obj/structure/flora/tree/pine/xmas + /datum/round_event_control/santa name = "Santa is coming to town! (Christmas)" holidayID = CHRISTMAS diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 255069d3cc2..c064518a22e 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -316,6 +316,26 @@ /datum/holiday/xmas/greet() return "Have a merry Christmas!" +/datum/holiday/xmas/celebrate() + for(var/obj/effect/landmark/xmastree/XT in world) + new XT.tree(get_turf(XT)) + qdel(XT) + +/datum/holiday/festive_season + name = FESTIVE_SEASON + begin_day = 1 + begin_month = DECEMBER + end_day = 31 + +/datum/holiday/festive_season/celebrate() + for(var/obj/effect/landmark/xmastree/XT in world) + var/turf/t = get_turf(XT) + new /obj/structure/flora/tree/pine/xmas(t) + qdel(XT) + +/datum/holiday/festive_season/greet() + return "Have a nice festive season!" + /datum/holiday/boxing name = "Boxing Day" begin_day = 26