shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds Pride Month as a holiday! (#12436)

Browse Source 
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
This commit is contained in:
deathride58
2020-06-04 15:40:31 -07:00
committed by GitHub
parent 76da796b76
commit 3eb3934e26
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/time.dm
+1
View File
@@ -18,6 +18,7 @@
#define VALENTINES "Valentine's Day" #define VALENTINES "Valentine's Day"
#define APRIL_FOOLS "April Fool's Day" #define APRIL_FOOLS "April Fool's Day"
#define EASTER "Easter" #define EASTER "Easter"
#define PRIDE_MONTH "Pride Month"
#define HALLOWEEN "Halloween" #define HALLOWEEN "Halloween"
#define CHRISTMAS "Christmas" #define CHRISTMAS "Christmas"
#define FESTIVE_SEASON "Festive Season" #define FESTIVE_SEASON "Festive Season"
code/game/objects/structures/ghost_role_spawners.dm
+4 -7
View File
@@ -694,15 +694,12 @@
..() ..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants)) if (CONFIG_GET(flag/grey_assistants))
if(suited) uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
uniform = /obj/item/clothing/under/color/grey
else
uniform = /obj/item/clothing/under/color/jumpskirt/grey
else else
if(suited) if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
uniform = /obj/item/clothing/under/color/random uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else 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 /obj/item/storage/box/syndie_kit/chameleon/ghostcafe
name = "ghost cafe costuming kit" name = "ghost cafe costuming kit"
code/modules/holiday/holidays.dm
+9
View File
@@ -412,6 +412,15 @@
begin_month = JUNE begin_month = JUNE
begin_weekday = SUNDAY 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 /datum/holiday/moth
name = "Moth Week" name = "Moth Week"
code/modules/jobs/job_types/assistant.dm
+4 -7
View File
@@ -35,12 +35,9 @@ Assistant
..() ..()
var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT var/suited = !preference_source || preference_source.prefs.jumpsuit_style == PREF_SUIT
if (CONFIG_GET(flag/grey_assistants)) if (CONFIG_GET(flag/grey_assistants))
if(suited) uniform = suited ? /obj/item/clothing/under/color/grey : /obj/item/clothing/under/color/jumpskirt/grey
uniform = /obj/item/clothing/under/color/grey
else
uniform = /obj/item/clothing/under/color/jumpskirt/grey
else else
if(suited) if(SSevents.holidays && SSevents.holidays[PRIDE_MONTH])
uniform = /obj/item/clothing/under/color/random uniform = suited ? /obj/item/clothing/under/color/rainbow : /obj/item/clothing/under/color/jumpskirt/rainbow
else else
uniform = /obj/item/clothing/under/color/jumpskirt/random uniform = suited ? /obj/item/clothing/under/color/random : /obj/item/clothing/under/color/jumpskirt/random