From 3eb3934e26135067cd41d7bfe98bb84e2c241a2d Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 4 Jun 2020 18:40:31 -0400 Subject: [PATCH] Adds Pride Month as a holiday! (#12436) * Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits * yknow what, while i'm at it, let's compress it --- code/__DEFINES/time.dm | 1 + code/game/objects/structures/ghost_role_spawners.dm | 11 ++++------- code/modules/holiday/holidays.dm | 9 +++++++++ code/modules/jobs/job_types/assistant.dm | 11 ++++------- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index af618cf828..9233a69108 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -18,6 +18,7 @@ #define VALENTINES "Valentine's Day" #define APRIL_FOOLS "April Fool's Day" #define EASTER "Easter" +#define PRIDE_MONTH "Pride Month" #define HALLOWEEN "Halloween" #define CHRISTMAS "Christmas" #define FESTIVE_SEASON "Festive Season" diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 86aff44e02..8c9a3636c8 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -694,15 +694,12 @@ ..() var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT if (CONFIG_GET(flag/grey_assistants)) - if(suited) - uniform = /obj/item/clothing/under/color/grey - else - uniform = /obj/item/clothing/under/color/jumpskirt/grey + uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey else - if(suited) - uniform = /obj/item/clothing/under/color/random + if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH]) + uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow else - uniform = /obj/item/clothing/under/color/jumpskirt/random + uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random /obj/item/storage/box/syndie_kit/chameleon/ghostcafe name = "ghost cafe costuming kit" diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 68001db517..d63e011f5b 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -412,6 +412,15 @@ begin_month = JUNE begin_weekday = SUNDAY +/datum/holiday/pride + name = PRIDE_MONTH + begin_day = 1 + begin_month = JUNE + end_day = 30 + +/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/moth name = "Moth Week" diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 91b3a3f581..b8fc963989 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -35,12 +35,9 @@ Assistant ..() var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT if (CONFIG_GET(flag/grey_assistants)) - if(suited) - uniform = /obj/item/clothing/under/color/grey - else - uniform = /obj/item/clothing/under/color/jumpskirt/grey + uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey else - if(suited) - uniform = /obj/item/clothing/under/color/random + if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH]) + uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow else - uniform = /obj/item/clothing/under/color/jumpskirt/random + uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random