From 8fd624e5a60fb7dfec199ecee25e68e97fc147f7 Mon Sep 17 00:00:00 2001 From: oranges Date: Sun, 17 Nov 2019 22:38:55 +0000 Subject: [PATCH] Adds international garbage day, a day to respect janitors everywhere --- code/__DEFINES/time.dm | 2 +- code/modules/holiday/holidays.dm | 14 ++++++++++++-- code/modules/jobs/job_types/janitor.dm | 6 ++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index 9a2993ee65b..bdb4571fdd1 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -21,7 +21,7 @@ #define HALLOWEEN "Halloween" #define CHRISTMAS "Christmas" #define FESTIVE_SEASON "Festive Season" - +#define GARBAGEDAY "Garbage Day" /* Days of the week to make it easier to reference them. diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index 8ffe7d99877..7f34b9930c8 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -93,6 +93,16 @@ /datum/holiday/valentines/getStationPrefix() return pick("Love","Amore","Single","Smootch","Hug") +/// Garbage DAYYYYY +/// Huh?.... NOOOO +/// *GUNSHOT* +/// AHHHGHHHHHHH +/datum/holiday/garbageday + name = GARBAGEDAY + begin_day = 17 + end_day = 17 + begin_month = JUNE + /datum/holiday/birthday name = "Birthday of Space Station 13" begin_day = 16 @@ -170,8 +180,8 @@ /datum/holiday/april_fools/celebrate() SSjob.set_overflow_role("Clown") SSticker.login_music = 'sound/ambience/clown.ogg' - for(var/i in GLOB.new_player_list) - var/mob/dead/new_player/P = i + for(var/i in GLOB.new_player_list) + var/mob/dead/new_player/P = i if(P.client) P.client.playtitlemusic() diff --git a/code/modules/jobs/job_types/janitor.dm b/code/modules/jobs/job_types/janitor.dm index dbbe0e5acad..c2edbe34cc4 100644 --- a/code/modules/jobs/job_types/janitor.dm +++ b/code/modules/jobs/job_types/janitor.dm @@ -26,3 +26,9 @@ ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/civilian/janitor backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1) + +/datum/outfit/job/janitor/pre_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(GARBAGEDAY in SSevents.holidays) + l_pocket = /obj/item/gun/ballistic/revolver + r_pocket = /obj/item/ammo_box/a357