[MIRROR] Flavour Enhancement: Holidays

code/game/gamemodes/events/holidays/Holidays.dm

@@ -22,7 +22,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 
 	Holiday = list()			// reset our switch now so we can recycle it as our Holiday name
 
-	var/YY	=	text2num(time2text(world.timeofday, "YY")) 	// get the current year
+	//var/YY	=	text2num(time2text(world.timeofday, "YY")) 	// get the current year - unused currently but can be used for floating dates
 	var/MM	=	text2num(time2text(world.timeofday, "MM")) 	// get the current month
 	var/DD	=	text2num(time2text(world.timeofday, "DD")) 	// get the current day
 
@@ -36,56 +36,63 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 					Holiday["New Years's Day"] = "The day of the new solar year on Sol."
 				if(12)
 					Holiday["Vertalliq-Qerr"] = "Vertalliq-Qerr, translated to mean 'Festival of the Royals', is a \
-					Skrell holiday that celebrates the Qerr-Katish and all they have provided for the rest of Skrell society, \
+					skrellian holiday that celebrates the Qerr-Katish and all they have provided for the rest of skrellian society, \
 					it often features colourful displays and skilled performers take this time to show off some of their more \
-					fancy displays."
+					elaborate displays."
+				if(14)
+					Holiday["Lohri"] = "A human festival traditionally celebrating the end of winter on the Indian subcontinent. \
+					The holiday is now celebrated independently of seasons in many colonies with large populations of Indian \
+					descent. Traditions include the burning of bonfires, dancing, and door-to-door singing in exchange for treats."
+				if(30)
+					Holiday["Lunar New Year"] = "Originally the new year on the ancient lunisolar calendar, the Lunar New Year is \
+					celebrated with a wide variety of east Asian traditions with roots in Chinese, Japanese, Korean, Vietnamese, \
+					Tibetan, Mongolian, and Ryukyu cultures. Elaborate parades, performances, dances and meals are usual staples."
 
 		if(2)	//Feb
 			switch(DD)
 				if(2)
-					Holiday["Groundhog Day"] = "An unoffical holiday based on ancient folklore that originated on Earth, \
+					Holiday["Groundhog Day"] = "An unoffical holiday based on medieval folklore that originated on Earth, \
-					that involves the worship of an almighty groundhog, that could control the weather based on if it casted a shadow."
+					that involves the reverence of a prophetic animal - traditionally a badger, fox or groundhog - that was \
+					said to be able to predict, or even control the changing of the seasons."
 				if(14)
-					Holiday["Valentine's Day"] = "An old holiday that revolves around romance and love."
+					Holiday["Valentine's Day"] = "A human holiday that revolves around expressions of romance and love. \
+					In particular, the exchanging of gifts, letters and cards is traditional."
+				if(15)
+					Holiday["Lantern Festival"] = "A human holiday with origins in Chinese new year celebrations. Participants \
+					carry or hang elaborate paper lanterns that are thought to bring good luck. Today, electric lights are often used \
+					in environments where open flames would be hazardous or non-functional."
 				if(17)
 					Holiday["Random Acts of Kindness Day"] = "An unoffical holiday that challenges everyone to perform \
-					acts of kindness to their friends, co-workers, and strangers, for no reason."
+					acts of kindness to their friends, co-workers, and strangers, with no strings attached."
 
 		if(3)	//Mar
 			switch(DD)
 				if(3)
-					Holiday["Qixm-tes"] = "Qixm-tes, or 'Day of mourning', is a Skrell holiday where Skrell gather at places \
+					Holiday["Qixm-tes"] = "Qixm-tes, or 'Day of mourning', is a skrellian holiday where skrell gather at places \
-					of worship and sing a song of mourning for all those who have died in service to their empire."
+					of worship and sing a song of mourning for all those who have died in service to their kingdoms."
 				if(14)
 					Holiday["Pi Day"] = "An unoffical holiday celebrating the mathematical constant Pi.  It is celebrated on \
 					March 14th, as the digits form 3 14, the first three significant digits of Pi.  Observance of Pi Day generally \
 					involve eating (or throwing) pie, due to a pun.  Pies also tend to be round, and thus relatable to Pi."
 				if(17)
-					Holiday["St. Patrick's Day"] = "An old holiday originating from Earth, Sol, celebrating the color green, \
+					Holiday["St. Patrick's Day"] = "A holiday originating on Earth, celebrating a popular version of Irish culture. \
-					shamrocks, attending parades, and drinking alcohol."
+					Traditions include elaborate parades, wearing of the colour green, and drinking alcohol."
+				if(18)
+					Holiday["Holi"] = "Also known as the Festival of Colours, a human Hindu festival celebrating divine love and the \
+					triumph of good over evil. Traditionally a bonfire is lit overnight, followed by the free-for-all smearing of \
+					celebrants with colourful pigments, and the forgiveness of past wrongs."
 				if(27)
-					if(YY == 16)
+					Holiday["Easter"] = "A Earth springtime festival variously celebrating rebirth and the beginning of the planting \
-						Holiday["Easter"] = ""
+					season. Traditionally celebrated with the painting and exchange of eggs, sometimes made from chocolate. \
-				if(31)
+					The holiday's date was standardized in the 22nd century."
-					if(YY == 13)
-						Holiday["Easter"] = ""
 
 		if(4)	//Apr
 			switch(DD)
 				if(1)
-					Holiday["April Fool's Day"] = "An old holiday that endevours one to pull pranks and spread hoaxes on their friends."
+					Holiday["April Fool's Day"] = "A human holiday that endevours one to pull pranks and spread hoaxes on their friends."
-					if(YY == 18)
+				if(5)
-						Holiday["Easter"] = ""
+					Holiday["First Day of Passover"] = "The first of eight days of a human holiday celebrating the exodus of ancient Jewish people \
-				if(8)
+					from slavery, and of the spring harvest. The most well-known tradition is the Sedar meal. The date was standardized in the 22nd century."
-					if(YY == 15)
-						Holiday["Easter"] = ""
-				if(16)
-					if(YY == 17) //Easter can go die for all of this copypasta.
-						Holiday["Easter"] = ""
-
-				if(20)
-					if(YY == 14)
-						Holiday["Easter"] = ""
 				if(22)
 					Holiday["Earth Day"] = "A holiday of enviromentalism, that originated on it's namesake, Earth."
 
@@ -100,7 +107,7 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 					Observance of this day varies throughout human space, but most common traditions are the act of bringing flowers to graves,\
 					attending parades, and the wearing of poppies (either paper or real) in one's clothing."
 				if(28)
-					Holiday["Jiql-tes"] = "A Skrellian holiday that translates to 'Day of Celebration', Skrell communities \
+					Holiday["Jiql-tes"] = "A skrellian holiday that translates to 'Day of Celebration', skrell communities \
 					gather for a grand feast and give gifts to friends and close relatives."
 
 		if(6)	//Jun
@@ -113,7 +120,11 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 					and to thank blood donors for their voluntary, life-saving gifts of blood."
 				if(20)
 					Holiday["Civil Servant's Day"] = "Civil Servant's Day is a holiday observed in SCG member states that honors civil servants everywhere,\
-+					(especially those who are members of the armed forces and the emergency services), or have been or have been civil servants in the past."
+					(especially those who are members of the armed forces and the emergency services), or have been or have been civil servants in the past."
+/*				if(25)
+					Holiday["Merhyat Njarha"] = "A Njarir'Akhan tajaran tradition translating to \"Harmony of the House\", in which Njarjirii citizens pay \
+					homage to their ruling house and their ancestors. Traditions include large communal meals and dances hosted by the ruling house, \
+					and the intensive upkeep of community spaces."*/
 
 		if(7)	//Jul
 			switch(DD)
@@ -126,36 +137,57 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 
 		if(8)	//Aug
 			switch(DD)
+<<<<<<< HEAD
 //				if(10)
 //					Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer,
 //					on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common." 
+=======
+>>>>>>> 0f2b652ea9... Merge pull request #13934 from VOREStation/upstream-merge-8759
 //VOREStation Add - Of course we need this.
 				if(8)
 					Holiday["Vore Day"] = "A holiday representing the innate desire in all/most/some/a few of us to devour each other or be devoured. \
 					That's probably why you're here, isn't it? Get to it, then!"
 //VOREStation Add End.
-
+/*				if(10)
+					Holiday["S'randarr's Day"] = "A Tajaran holiday that occurs on the longest day of the year in summer,
+					on Ahdomai. It is named after the Tajaran deity of Light, and huge celebrations are common."
+				if(11)
+					Holiday["Tajaran Contact Day"] = "The anniversary of first contact between SolGov and the tajaran species, widely observed\
+					throughout tajaran and human space. Marks the date that in 2513, a human exploration team investigating electromagnetic \
+					emissions from the Meralar system made radio contact with the tajaran scientific outpost that had broadcast them."*/
+				if(20)
+					Holiday["Obon"] = "An ancient Earth holiday originating in east Asia, for the honouring of one's ancestral spirits. \
+					Traditions include the maintenance of grave sites and memorials, and community traditional dance performances."
 				if(27)
 					Holiday["Forgiveness Day"] = "A time to forgive and be forgiven."
 
 		if(9)	//Sep
 			switch(DD)
 				if(17)
-					Holiday["Qill-xamr"] = "Translated to 'Night of the dead', it is a Skrell holiday where Skrell \
+					Holiday["Qill-xamr"] = "Translated to 'Night of the dead', it is a skrellian holiday where skrell \
 					communities hold parties in order to remember loved ones who passed, unlike Qixm-tes, this applies to everyone \
 					and is a joyful celebration."
 				if(19)
-					Holiday["Talk-Like-a-Pirate Day"] = "Ahoy, matey!  Tis unoffical holiday be celebratin' the jolly \
+					Holiday["Talk-Like-a-Pirate Day"] = "Ahoy, matey! It be the unoffical holiday celebratin' the salty \
-					good humor of speakin' like the pirates of old."
+					sea humor of speakin' like the pirates of old."
+				if(20)
+					Holiday["Rosh Hashanah"] = "An old human holiday that marks the traditional Hebrew new year."
 				if(28)
 					Holiday["Stupid-Questions Day"] = "Known as Ask A Stupid Question Day, it is an unoffical holiday \
 					created by teachers in Sol, very long ago, to encourage students to ask more questions in the classroom."
 
 		if(10)	//Oct
 			switch(DD)
+				if(9)
+					Holiday["Lief Eriksson Day"] = "A day commemorating Norse explorer Lief Eriksson, an early Scandinavian cultural figure \
+					who is thought to have been the first European to set foot in North America."
 				if(16)
 					Holiday["Boss' Day"] = "Boss' Day has traditionally been a day for employees to thank their bosses for the difficult work that they do \
 					throughout the year. This day was created for the purpose of strengthening the bond between employer and employee."
+				if(21)
+					Holiday["First Day of Diwali"] = "An ancient Hindu, Jain and Sikh festival lasting five days, celebrating victory of light over darkness, good over \
+					evil, and knowledge over ignorance. It is celebrated by the wearing of your finest clothes, decorating with oil lamps and rangolis, \
+					fireworks, and gift-giving. Electric lights are often used in modern times where oil lamps would be hazardous or inoperable."
 				if(31)
 					Holiday["Halloween"] = "Originating from Earth, Halloween is also known as All Saints' Eve, and \
 					is celebrated by some by attending costume parties, trick-or-treating, carving faces in pumpkins, or visiting \
@@ -163,6 +195,10 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 
 		if(11)	//Nov
 			switch(DD)
+				if(1)
+					Holiday["Day of the Dead"] = "An old human holiday celebrating the lives of deceased friends and family members, \
+					by means of good humour and joyful parties. Offerings are often left at altars to the dead, and exchanging gifts \
+					among the living is not uncommon."
 				if(13)
 					Holiday["Kindness Day"] = "Kindness Day is an unofficial holiday to highlight good deeds in the \
 					community, focusing on the positive power and the common thread of kindness which binds humanity and \
@@ -182,16 +218,17 @@ var/global/list/Holiday = list() //Holidays are lists now, so we can have more t
 				if(10)
 					Holiday["Human-Rights Day"] = "An old holiday created by an intergovernmental organization known back than as the United Nations, \
 					human rights were not recognized globally at the time, and the holiday was made in honor of the Universal Declaration of Human Rights.  \
-					These days, SolGov ensures that past efforts were not in vein, and continues to honor this holiday across the galaxy."
+					These days, SolGov ensures that past efforts were not in vein, and continues to honor this holiday across the galaxy as a historical \
+					reminder."
 				if(22)
-					Holiday["Vertalliq-qixim"] = "A Skrellian holiday that celebrates the Skrell's first landing on one of \
+					Holiday["Vertalliq-qixim"] = "A skrellian holiday that celebrates the skrell's first landing on one of \
-					their moons.  It's often celebrated with grand festivals."
+					their moons. It's often celebrated with grand festivals."
 				if(24)
 					Holiday["Christmas Eve"] = "The eve of Christmas, an old holiday from Earth that mainly involves gift \
 					giving, decorating, family reunions, and a fat red human breaking into people's homes to steal milk and cookies."
 				if(25)
 					Holiday["Christmas"] = "Christmas is a very old holiday that originated in Earth, Sol.  It was a \
-					religious holiday for the Christian religion, which would later form Unitarianism.  Nowdays, the holiday is celebrated \
+					religious holiday for the Christian religion, which would later form Unitarianism. Nowadays, the holiday is celebrated \
 					generally by giving gifts, symbolic decoration, and reuniting with one's family.  It also features a mythical fat \
 					red human, known as Santa, who broke into people's homes to loot cookies and milk."
 				if(31)