From c8f2ac43cd35ff635b2dd927718cf21ab32dfbbe Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Sat, 29 Oct 2022 18:58:45 -0400
Subject: [PATCH] powder that makes you say yes

---
 code/game/gamemodes/events/holidays/Holidays.dm | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm
index 6233f8b060..9c156a50bd 100644
--- a/code/game/gamemodes/events/holidays/Holidays.dm
+++ b/code/game/gamemodes/events/holidays/Holidays.dm
@@ -137,24 +137,10 @@ 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."*/
+					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."