diff --git a/modular_zubbers/master_files/code/modules/holiday/holiday.dm b/modular_zubbers/master_files/code/modules/holiday/holiday.dm index 1bea7011fc8..aeab2fc181a 100644 --- a/modular_zubbers/master_files/code/modules/holiday/holiday.dm +++ b/modular_zubbers/master_files/code/modules/holiday/holiday.dm @@ -7,26 +7,6 @@ #define COLOR_PRIDE_WHITE "#FFFFFF" -#define COLOR_TRANS_BLUE "#5BCEFA" -#define COLOR_TRANS_PINK "#F5A9B8" - -#define COLOR_ACE_BLACK "#292929" -#define COLOR_ACE_GREY "#888888" -#define COLOR_ACE_PURPLE "#800080" - -#define COLOR_BI_PINK "#D60270" -#define COLOR_BI_PURPLE "#9B4F96" -#define COLOR_BI_BLUE "#0038A8" - -#define COLOR_LESBIAN_RED "#D62800" -#define COLOR_LESBIAN_ORANGE "#FF9B56" -#define COLOR_LESBIAN_PINK "#D452A6" -#define COLOR_LESBIAN_MAGENTA "#A40062" - -#define COLOR_PAN_MAGENTA "#FF218C" -#define COLOR_PAN_YELLOW "#FFE45E" -#define COLOR_PAN_CYAN "#2CCAFF" - /datum/holiday/proc/queue_storyteller_celebration(datum/round_event/event, datum/round_event_control/control) if(isnull(event) || isnull(control)) stack_trace("Invalid holiday event passed to storyteller") @@ -169,79 +149,6 @@ /datum/holiday/pride_week begin_day = 1 - holiday_colors = list() - -/datum/holiday/pride_week/New() - . = ..() - var/palette = rand(1, 7) - switch(palette) - if(1) - holiday_colors += list( - COLOR_PRIDE_PURPLE, - COLOR_PRIDE_BLUE, - COLOR_PRIDE_GREEN, - COLOR_PRIDE_YELLOW, - COLOR_PRIDE_ORANGE, - COLOR_PRIDE_RED, - ) - if(2) - holiday_colors += list( - COLOR_TRANS_BLUE, - COLOR_TRANS_PINK, - COLOR_PRIDE_WHITE, - ) - if(3) - holiday_colors += list( - COLOR_ACE_BLACK, - COLOR_ACE_GREY, - COLOR_PRIDE_WHITE, - COLOR_ACE_PURPLE, - ) - if(4) - holiday_colors += list( - COLOR_PAN_MAGENTA, - COLOR_PAN_YELLOW, - COLOR_PAN_CYAN, - ) - if(5) - holiday_colors += list( - COLOR_BI_PINK, - COLOR_BI_PURPLE, - COLOR_BI_BLUE, - ) - if(6) - holiday_colors += list( - COLOR_LESBIAN_RED, - COLOR_LESBIAN_ORANGE, - COLOR_LESBIAN_PINK, - COLOR_LESBIAN_MAGENTA, - ) - if(7) - holiday_colors += list( - COLOR_LESBIAN_RED, - COLOR_LESBIAN_ORANGE, - COLOR_LESBIAN_PINK, - COLOR_LESBIAN_MAGENTA, - COLOR_PRIDE_PURPLE, - COLOR_PRIDE_BLUE, - COLOR_PRIDE_GREEN, - COLOR_PRIDE_YELLOW, - COLOR_PRIDE_ORANGE, - COLOR_PRIDE_RED, - COLOR_TRANS_BLUE, - COLOR_TRANS_PINK, - COLOR_PRIDE_WHITE, - COLOR_PAN_MAGENTA, - COLOR_PAN_YELLOW, - COLOR_PAN_CYAN, - COLOR_ACE_BLACK, - COLOR_ACE_GREY, - COLOR_PRIDE_WHITE, - COLOR_ACE_PURPLE, - COLOR_BI_PINK, - COLOR_BI_PURPLE, - COLOR_BI_BLUE, - ) #undef COLOR_PURPLE_LIGHT #undef COLOR_PURPLE_DARK @@ -251,23 +158,3 @@ #undef COLOR_GREY_DARK #undef COLOR_PRIDE_WHITE - -#undef COLOR_TRANS_BLUE -#undef COLOR_TRANS_PINK - -#undef COLOR_ACE_BLACK -#undef COLOR_ACE_GREY -#undef COLOR_ACE_PURPLE - -#undef COLOR_BI_PINK -#undef COLOR_BI_PURPLE -#undef COLOR_BI_BLUE - -#undef COLOR_LESBIAN_RED -#undef COLOR_LESBIAN_ORANGE -#undef COLOR_LESBIAN_PINK -#undef COLOR_LESBIAN_MAGENTA - -#undef COLOR_PAN_MAGENTA -#undef COLOR_PAN_YELLOW -#undef COLOR_PAN_CYAN