shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some improvements on the holiday system (#32329)

Browse Source
This commit is contained in:
tortellinitony
2017-11-04 00:36:49 -04:00
committed by CitadelStationBot
parent 910e6b6396
commit 3772d722e2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/holiday/holidays.dm
View File

@@ -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