From 8eeecbd9f7be8ad62ee28051fb56e314ba607d1e Mon Sep 17 00:00:00 2001
From: nervere <26285377+nervere@users.noreply.github.com>
Date: Thu, 13 Jul 2023 20:44:51 -0400
Subject: [PATCH] castlestation / labor day splash screen (#34633)

* castlestation / labor day splash screen

* new and improved version of castle splash
---
 __DEFINES/_macros.dm                            |   2 ++
 __DEFINES/dates.dm                              |   2 +-
 code/game/gamemodes/events/holidays/Holidays.dm |   2 +-
 code/game/turfs/unsimulated/walls.dm            |   5 ++++-
 icons/{ => splashworks_alt}/snowstation.gif     | Bin
 icons/splashworks_alt/viva.png                  | Bin 0 -> 5172 bytes
 6 files changed, 8 insertions(+), 3 deletions(-)
 rename icons/{ => splashworks_alt}/snowstation.gif (100%)
 create mode 100644 icons/splashworks_alt/viva.png

diff --git a/__DEFINES/_macros.dm b/__DEFINES/_macros.dm
index 21f52bd9977..bbb99549e5f 100644
--- a/__DEFINES/_macros.dm
+++ b/__DEFINES/_macros.dm
@@ -406,6 +406,8 @@
 
 #define SNOW_THEME (map.snow_theme || Holiday == XMAS || Holiday == XMAS_EVE)
 
+#define SOCIALISM_WON (map.nameShort == "castle" || Holiday == LABOR_DAY)
+
 #define get_conductivity(A) (A ? A.siemens_coefficient : 1)
 
 //Swaps the contents of the variables A and B. The if(TRUE) is there simply to restrict the scope of _.
diff --git a/__DEFINES/dates.dm b/__DEFINES/dates.dm
index dd14b7daccd..9a6794ee7d9 100644
--- a/__DEFINES/dates.dm
+++ b/__DEFINES/dates.dm
@@ -11,7 +11,7 @@
 #define AUTISM_AWARENESS_DAY "Autism Awareness Day"
 #define FOUR_TWENTY "Four-Twenty"
 #define EARTH_DAY "Earth Day"
-#define LABOUR_DAY "Labour Day"
+#define LABOR_DAY "Labor Day"
 #define FIREFIGHTERS_DAY "FireFighter's Day"
 #define OWL_AND_PUSSYCAT_DAY "Owl and Pussycat Day"
 #define INTERNATIONAL_PICNIC_DAY "International Picnic Day"
diff --git a/code/game/gamemodes/events/holidays/Holidays.dm b/code/game/gamemodes/events/holidays/Holidays.dm
index 627abe5c3e8..9113e7fb534 100644
--- a/code/game/gamemodes/events/holidays/Holidays.dm
+++ b/code/game/gamemodes/events/holidays/Holidays.dm
@@ -55,7 +55,7 @@ var/global/Holiday = null
 		if(5) // May
 			switch(DD)
 				if(1)
-					current_holidays += LABOUR_DAY
+					current_holidays += LABOR_DAY
 				if(4)
 					current_holidays += FIREFIGHTERS_DAY
 				if(9)
diff --git a/code/game/turfs/unsimulated/walls.dm b/code/game/turfs/unsimulated/walls.dm
index d537a8afbe1..81c2eebc452 100644
--- a/code/game/turfs/unsimulated/walls.dm
+++ b/code/game/turfs/unsimulated/walls.dm
@@ -74,7 +74,10 @@
 
 /turf/unsimulated/wall/splashscreen/New()
 	if(SNOW_THEME)
-		icon = 'icons/snowstation.gif' // not in the splashworks file so it doesn't appear in other cases
+		icon = 'icons/splashworks_alt/snowstation.gif' // uses splashworks_alt folder instead of splashworks so it only appears when we want it to
+		return
+	if(SOCIALISM_WON)
+		icon = 'icons/splashworks_alt/viva.png'
 		return
 	var/path = "icons/splashworks/"
 	var/list/filenames = flist(path)
diff --git a/icons/snowstation.gif b/icons/splashworks_alt/snowstation.gif
similarity index 100%
rename from icons/snowstation.gif
rename to icons/splashworks_alt/snowstation.gif
diff --git a/icons/splashworks_alt/viva.png b/icons/splashworks_alt/viva.png
new file mode 100644
index 0000000000000000000000000000000000000000..13e0f5e10a80835537de5bb9e68c91e947b61ba9
GIT binary patch
literal 5172
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
TqCsi&5DD1XI2<fJKui7~M0CEt

literal 0
HcmV?d00001