diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm index 94d7a3ae3c5..3e75dc38f59 100644 --- a/code/game/gamemodes/events/holidays/Holidays.dm +++ b/code/game/gamemodes/events/holidays/Holidays.dm @@ -31,92 +31,96 @@ var/global/Holiday = null if(1) //Jan switch(DD) if(1) Holiday = "New Year's Day" - if(10) Holiday = "Houseplant Appreciation Day" - if(25) Holiday = "Opposite Day" + if(9) Holiday = "Tajaran Coming of Dawn" if(2) //Feb switch(DD) - if(2) Holiday = "Groundhog Day" + if(1) Holiday = "C'thur Independence Day" + if(3) Holiday = "Dominian Feast of Devotion" if(14) Holiday = "Valentine's Day" - if(17) Holiday = "Random Acts of Kindness Day" if(29) Holiday = "Leap Day" if(3) //Mar switch(DD) - if(14) Holiday = "Pi Day" + if(4) Holiday = "People's Republic of Adhomai Victory Day" + if(11) Holiday = "Assunzioni Assumption of the Fading Lights" if(17) Holiday = "St. Patrick's Day" if(20) Holiday = "Spring Vernal Equinox" + if(31) + if(YY == 24) Holiday = "Easter" if(4) //Apr switch(DD) - if(1) - Holiday = "April Fool's Day" - if(YY == 18 && prob(50)) Holiday = "Easter" - if(12) - if(YY == 20) Holiday = "Easter" - if(20) Holiday = "Four-Twenty" - if(21) - if(YY == 19) Holiday = "Easter" + if(1) Holiday = "April Fool's Day" + if(3) Holiday = "Dominian Feast of Faith" + if(9) + Holiday = "Silversun Festival of the Silver Seas" + if(YY == 23 && prob(50)) Holiday = "Easter" + if(20) + if(YY == 25) Holiday = "Easter" if(22) Holiday = "Earth Day" if(5) //May switch(DD) if(1) Holiday = "Labour Day" - if(4) Holiday = "FireFighter's Day" - if(12) Holiday = "Owl and Pussycat Day" //what a dumb day of observence...but we -do- have costumes already :3 + if(5) Holiday = "Tau Ceti Republic Day" + if(22) Holiday = "Dominian Worker's Day" + if(30) Holiday = "People's Republic of Adhomai President's Day" if(6) //Jun switch(DD) - if(1) Holiday = "Flip a Coin Day" - if(8) Holiday = "Best Friends Day" + if(14) + Holiday = "New Gibson Remembrance Day" + if(prob(50)) Holiday = "Skrell Qu'Qyu-Poxii" + if(18) Holiday = "Callistean Landfall Day" if(20) - if(YY == 20) Holiday = "Summer Solstice" + if(YY == 20) Holiday = "Summer Solstice" if(21) - if(YY == (18 || 19)) Holiday = "Summer Solstice" + if(YY == (18 || 19)) Holiday = "Summer Solstice" + if(26) Holiday = "Callistean Pigeon Day" if(7) //Jul switch(DD) - if(1) Holiday = "Doctor's Day" - if(2) Holiday = "UFO Day" - if(5) Holiday = "National Bikini Day" - if(8) Holiday = "Writer's Day" - if(22) Holiday = "Hammock Day" - if(30) Holiday = "Friendship Day" + if(4) + Holiday = "DPRA Democratic Revolution Day" + if(prob(50)) Holiday = "DPRA Liberation Day" + if(7) Holiday = "Dominian Founding Day" + if(16) Holiday = "Lunarian Apollo Day" + if(29) Holiday = "Dominian Victory Day" + if(8) //Aug switch(DD) - if(3) Holiday = "Watermelon day" - if(5) Holiday = "Beer Day" - if(10) Holiday = "National S'mores Day'" - if(13) Holiday = "Left Hander's Day" + if(27) Holiday = "Vaurca Hive War Commemoration" if(9) //Sep switch(DD) + if(3) Holiday = "Dominian Feast of Joy" + if(5) Holiday = "Si'akh Final Judgement Day" if(19) Holiday = "Talk-Like-a-Pirate Day" - if(28) Holiday = "Stupid-Questions Day" + if(24) Holiday = "Tau Ceti Heritage Day" if(10) //Oct switch(DD) - if(4) Holiday = "Animal's Day" - if(7) Holiday = "Smiling Day" - if(16) Holiday = "Boss' Day" + if(9) Holiday = "K'lax Technology Day" + if(27) Holiday = "New Kingdom of Adhomai Day of Rightful Restoration" if(31) Holiday = "Halloween" if(11) //Nov switch(DD) - if(1) Holiday = "Vegan Day" - if(13) Holiday = "Kindness Day" - if(19) Holiday = "Flowers Day" - if(21) Holiday = "Saying-'Hello' Day" + if(17) Holiday = "Dominian Navy Day" + if(26) Holiday = "Tajaran Armistice Day" if(12) //Dec switch(DD) - if(10) Holiday = "Human-Rights Day" - if(14) Holiday = "Monkey Day" + if(3) Holiday = "Dominian Feast of Renewal" + if(7) Holiday = "Unathi Keeping of Memories" + if(15) Holiday = "Lunarian Pervoprohodets Day" if(24) Holiday = "Christmas Eve" if(25) Holiday = "Christmas" if(26) Holiday = "Boxing Day" + if(27) Holiday = "New Gibson Unity Day" if(31) Holiday = "New Year's Eve" if(!Holiday) diff --git a/html/changelogs/MortalRed-holiday-update.yml b/html/changelogs/MortalRed-holiday-update.yml new file mode 100644 index 00000000000..7945b41bfb8 --- /dev/null +++ b/html/changelogs/MortalRed-holiday-update.yml @@ -0,0 +1,43 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: ImmortalRedshirt + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds various in-universe holidays to the code" + - tweak: "Adds the next few Easter sundays up until 2025." + - rscdel: "Removes unneeded holidays from code."