Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Concatenates the holiday checks #7126

Merged
AsV9 merged 2 commits into from
Nov 21, 2019
Merged

Concatenates the holiday checks #7126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a24193
Update holidays.dm
Amelia0010 Nov 21, 2019
300c900
Update holidays.dm
Amelia0010 Nov 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions code/modules/holiday/holidays.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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")
Expand All @@ -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"
Expand Down Expand Up @@ -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")
Expand Down