diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index f435d7e819..73a7041fa0 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -177,7 +177,7 @@ SUBSYSTEM_DEF(events) var/YY = text2num(time2text(world.timeofday, "YY")) // get the current year var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - var/DDD = text2num(time2text(world.timeofday, "DDD")) // get the current weekday + var/DDD = time2text(world.timeofday, "DDD") // get the current weekday var/W = weekdayofthemonth() // is this the first monday? second? etc. for(var/H in subtypesof(/datum/holiday)) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 751bc53eac..388a9d6893 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -33,7 +33,7 @@ if(!end_month) end_month = begin_month if(begin_week && begin_weekday) - if(begin_week == ww && begin_weekday == ddd) + if(begin_week == ww && begin_weekday == ddd && begin_month == mm) return TRUE if(end_month > begin_month) //holiday spans multiple months in one year if(mm == end_month) //in final month