castlestation / labor day splash screen (#34633)

* castlestation / labor day splash screen

* new and improved version of castle splash
This commit is contained in:
nervere
2023-07-13 20:44:51 -04:00
committed by GitHub
parent 467dbdf5b0
commit 8eeecbd9f7
6 changed files with 8 additions and 3 deletions

View File

@@ -406,6 +406,8 @@
#define SNOW_THEME (map.snow_theme || Holiday == XMAS || Holiday == XMAS_EVE) #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) #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 _. //Swaps the contents of the variables A and B. The if(TRUE) is there simply to restrict the scope of _.

View File

@@ -11,7 +11,7 @@
#define AUTISM_AWARENESS_DAY "Autism Awareness Day" #define AUTISM_AWARENESS_DAY "Autism Awareness Day"
#define FOUR_TWENTY "Four-Twenty" #define FOUR_TWENTY "Four-Twenty"
#define EARTH_DAY "Earth Day" #define EARTH_DAY "Earth Day"
#define LABOUR_DAY "Labour Day" #define LABOR_DAY "Labor Day"
#define FIREFIGHTERS_DAY "FireFighter's Day" #define FIREFIGHTERS_DAY "FireFighter's Day"
#define OWL_AND_PUSSYCAT_DAY "Owl and Pussycat Day" #define OWL_AND_PUSSYCAT_DAY "Owl and Pussycat Day"
#define INTERNATIONAL_PICNIC_DAY "International Picnic Day" #define INTERNATIONAL_PICNIC_DAY "International Picnic Day"

View File

@@ -55,7 +55,7 @@ var/global/Holiday = null
if(5) // May if(5) // May
switch(DD) switch(DD)
if(1) if(1)
current_holidays += LABOUR_DAY current_holidays += LABOR_DAY
if(4) if(4)
current_holidays += FIREFIGHTERS_DAY current_holidays += FIREFIGHTERS_DAY
if(9) if(9)

View File

@@ -74,7 +74,10 @@
/turf/unsimulated/wall/splashscreen/New() /turf/unsimulated/wall/splashscreen/New()
if(SNOW_THEME) 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 return
var/path = "icons/splashworks/" var/path = "icons/splashworks/"
var/list/filenames = flist(path) var/list/filenames = flist(path)

View File

Before

Width:  |  Height:  |  Size: 1016 KiB

After

Width:  |  Height:  |  Size: 1016 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB