From 8d6801c387d20abd357f1a7b60c2db0783304457 Mon Sep 17 00:00:00 2001 From: BlueWildrose <57083662+BlueWildrose@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:34:10 -0700 Subject: [PATCH] holiday patterns + pansexual/panromantic holiday --- code/modules/holiday/holidays.dm | 112 ++++++++++++++++++++++++++----- 1 file changed, 96 insertions(+), 16 deletions(-) diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 239246cd59..4c199a9901 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -26,7 +26,7 @@ var/i = findtext(name," ") return copytext(name, 1, i) -// Return 1 if this holidy should be celebrated today +// Return 1 if this holiday should be celebrated today /datum/holiday/proc/shouldCelebrate(dd, mm, yy, ww, ddd) if(always_celebrate) return TRUE @@ -189,12 +189,40 @@ begin_day = 22 begin_month = APRIL -/datum/holiday/lesbianvisibility +/datum/holiday/lgbt + name = "Pride Week" + begin_month = JUNE + begin_day = 23 + end_day = 29 + //Will take place during pride month for one week. Stonewall was June 28th, so this captures its week. + + var/list/holiday_colors = list( + COLOR_PRIDE_PURPLE, + COLOR_PRIDE_BLUE, + COLOR_PRIDE_GREEN, + COLOR_PRIDE_YELLOW, + COLOR_PRIDE_ORANGE, + COLOR_PRIDE_RED + ) + +/datum/holiday/lgbt/proc/get_floor_tile_color(atom/atom) + var/turf/turf = get_turf(atom) + return holiday_colors[(turf.y % holiday_colors.len) + 1] + +/datum/holiday/lgbt/lesbianvisibility name = "Lesbian Visibility Day" begin_day = 26 begin_month = APRIL -/datum/holiday/lesbianvisibility/greet() + holiday_colors = list( //using the 2018 5-pattern flag + COLOR_LESBIAN_ORANGERED, + COLOR_LESBIAN_SANDYBROWN, + COLOR_WHITE, + COLOR_LESBIAN_PALEVIOLETRED, + COLOR_LESBIAN_DARKMAGENTA + ) + +/datum/holiday/lgbt/lesbianvisibility/greet() return "Today is Lesbian Visibility Day!" /datum/holiday/labor @@ -300,12 +328,20 @@ /datum/holiday/programmers/getStationPrefix() return pick("span>","DEBUG: ","null","/list","EVENT PREFIX NOT FOUND") //Portability -/datum/holiday/bivisibility +/datum/holiday/lgbt/bivisibility name = "Bisexual Visibility Day" begin_day = 23 begin_month = SEPTEMBER -/datum/holiday/bivisibility/greet() + holiday_colors = list( + COLOR_BISEXUAL_MEDIUMVIOLETRED, + COLOR_BISEXUAL_MEDIUMVIOLETRED, + COLOR_BISEXUAL_DARKORCHID, + COLOR_BISEXUAL_DARKBLUE, + COLOR_BISEXUAL_DARKBLUE + ) + +/datum/holiday/lgbt/bivisibility/greet() return "Today is Bisexual Visibility Day!" /datum/holiday/questions @@ -341,12 +377,18 @@ begin_month = OCTOBER drone_hat = /obj/item/clothing/head/that -/datum/holiday/intersexawareness +/datum/holiday/lgbt/intersexawareness name = "Intersex Awareness Day" begin_day = 26 begin_month = OCTOBER -/datum/holiday/intersexawareness/greet() + holiday_colors = list( //Intersex's flag isn't a striped pattern so this is the best we got + COLOR_INTERSEX_GOLD, + COLOR_INTERSEX_DARKMAGENTA, + COLOR_INTERSEX_GOLD + ) + +/datum/holiday/lgbt/intersexawareness/greet() return "Today is Intersex Awareness Day! It has been [text2num(time2text(world.timeofday, "YYYY")) - 1996] years since the first public protest speaking out against the human rights issues faced by intersex people." /datum/holiday/halloween @@ -388,21 +430,35 @@ begin_month = NOVEMBER drone_hat = /obj/item/reagent_containers/food/snacks/grown/moonflower -/datum/holiday/transawareness +/datum/holiday/lgbt/transawareness name = "Transgender Awareness Week" begin_day = 13 begin_month = NOVEMBER end_day = 19 -/datum/holiday/transawareness/greet() + holiday_colors = list( + COLOR_TRANS_BLUE, + COLOR_TRANS_PINK, + COLOR_WHITE, + COLOR_TRANS_PINK //loops back to blue + ) + +/datum/holiday/lgbt/transawareness/greet() return "This week is Transgender Awareness Week!" -/datum/holiday/transremembrance +/datum/holiday/lgbt/transremembrance name = "Transgender Day of Remembrance" begin_day = 20 begin_month = NOVEMBER -/datum/holiday/transremembrance/greet() + holiday_colors = list( + COLOR_TRANS_BLUE, + COLOR_TRANS_PINK, + COLOR_WHITE, + COLOR_TRANS_PINK //loops back to blue + ) + +/datum/holiday/lgbt/transremembrance/greet() return "Today is the Transgender Day of Remembrance." /datum/holiday/hello @@ -443,14 +499,21 @@ begin_month = OCTOBER begin_weekday = MONDAY -/datum/holiday/aceawareness +/datum/holiday/lgbt/aceawareness name = "Asexual Awareness Week" begin_month = OCTOBER -/datum/holiday/aceawareness/greet() + holiday_colors = list( + COLOR_BLACK, + COLOR_ACE_DARKGRAY, + COLOR_ACE_PURPLE, + COLOR_WHITE + ) + +/datum/holiday/lgbt/aceawareness/greet() return "This week is Asexual Awareness Week!" -/datum/holiday/aceawareness/shouldCelebrate(dd, mm, yy, ww, ddd) //Ace awareness week falls on the last full week of October. +/datum/holiday/lgbt/aceawareness/shouldCelebrate(dd, mm, yy, ww, ddd) //Ace awareness week falls on the last full week of October. if(mm != begin_month) return FALSE //it's not even the right month var/daypointer = world.timeofday - ((WEEKDAY2NUM(ddd) - 1) * 24 HOURS) @@ -478,7 +541,7 @@ begin_month = JUNE begin_weekday = SUNDAY -/datum/holiday/pride +/datum/holiday/pride //Won't be typing this as /lgbt/ because the typing is meant for LGBT holidays that will change the station's decals. Having a full month of pride decals seems a bit long. name = PRIDE_MONTH begin_day = 1 begin_month = JUNE @@ -487,7 +550,7 @@ /datum/holiday/pride/getStationPrefix() return pick("Pride", "Gay", "Bi", "Trans", "Lesbian", "Ace", "Aro", "Agender", pick("Enby", "Enbie"), "Pan", "Intersex", "Demi", "Poly", "Closeted", "Genderfluid") -/datum/holiday/stonewall +/datum/holiday/stonewall //decal patterns covered in "Pride Week" name = "Stonewall Riots Anniversary" begin_day = 28 begin_month = JUNE @@ -495,6 +558,23 @@ /datum/holiday/stonewall/greet() //Not gonna lie, I was fairly tempted to make this use the IC year instead of the IRL year, but I was worried that it would have caused too much confusion. return "Today marks the [text2num(time2text(world.timeofday, "YYYY")) - 1969]\th anniversary of the riots at the Stonewall Inn!" +/datum/holiday/lgbt/pan + name = "Pansexual and Panromantic Awareness Day" + begin_day = 24 + begin_month = MAY + + holiday_colors = list( + COLOR_PAN_DEEPPINK, + COLOR_PAN_GOLD, + COLOR_PAN_DODGERBLUE + ) + +/datum/holiday/lgbt/pan/greet() + return "Today is Pansexual and Panromantic Awareness Day!" + +/datum/holiday/lgbt/pan/getStationPrefix() + return pick("Pansexual","Panromantic") + /datum/holiday/moth name = "Moth Week" begin_month = JULY