diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 4c3859845bd5..eb5593e449ac 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -285,9 +285,7 @@ name = "Beer Day" /datum/holiday/beer/shouldCelebrate(dd, mm, yy, ww, ddd) - if(mm == 8 && ddd == FRIDAY && ww == 1) //First Friday in August - return TRUE - return FALSE + return (mm == 8 && ddd == FRIDAY && ww == 1) //First Friday in August /datum/holiday/beer/getStationPrefix() return pick("Stout","Porter","Lager","Ale","Malt","Bock","Doppelbock","Hefeweizen","Pilsner","IPA","Lite") //I'm sorry for the last one @@ -308,14 +306,7 @@ name = "Programmers' Day" /datum/holiday/programmers/shouldCelebrate(dd, mm, yy, ww, ddd) //Programmer's day falls on the 2^8th day of the year - if(mm == 9) - if(yy/4 == round(yy/4)) //Note: Won't work right on September 12th, 2200 (at least it's a Friday!) - if(dd == 12) - return 1 - else - if(dd == 13) - return 1 - return 0 + return (mm==9 && ((yy/4 == round(yy/4) && dd==12) || dd==13)) /datum/holiday/programmers/getStationPrefix() return pick("span>","DEBUG: ","null","/list","EVENT PREFIX NOT FOUND") //Portability @@ -467,9 +458,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and */ /datum/holiday/ramadan/shouldCelebrate(dd, mm, yy, ww, ddd) - if (round(((world.realtime - 285984000) / 864000) % 354.373435326843) == 0) - return TRUE - return FALSE + return (round(((world.realtime - 285984000) / 864000) % 354.373435326843) == 0) /datum/holiday/ramadan/getStationPrefix() return pick("Harm","Halaal","Jihad","Muslim") @@ -478,9 +467,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and name = "End of Ramadan" /datum/holiday/ramadan/end/shouldCelebrate(dd, mm, yy, ww, ddd) - if (round(((world.realtime - 312768000) / 864000) % 354.373435326843) == 0) - return TRUE - return FALSE + return (round(((world.realtime - 312768000) / 864000) % 354.373435326843) == 0) /datum/holiday/lifeday name = "Life Day" @@ -541,9 +528,7 @@ Since Ramadan is an entire month that lasts 29.5 days on average, the start and name = "Friday the 13th" /datum/holiday/friday_thirteenth/shouldCelebrate(dd, mm, yy, ww, ddd) - if(dd == 13 && ddd == FRIDAY) - return TRUE - return FALSE + return (dd == 13 && ddd == FRIDAY) /datum/holiday/friday_thirteenth/getStationPrefix() return pick("Mike","Friday","Evil","Myers","Murder","Deathly","Stabby")