From e0699c1940a6646c0bae96c18a6c481e23296fcc Mon Sep 17 00:00:00 2001 From: Fikou <23585223+Fikou@users.noreply.github.com> Date: Sun, 18 Jul 2021 10:44:29 +0200 Subject: [PATCH] Add to moth week holiday: teleporter accidents make you moths (#60284) --- code/__DEFINES/time.dm | 1 + code/game/machinery/teleporter.dm | 9 ++++++--- code/modules/holiday/nth_week.dm | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index 4af03ae9145..b7c71e2d734 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -29,6 +29,7 @@ #define GARBAGEDAY "Garbage Day" #define MONKEYDAY "Monkey Day" #define PRIDE_WEEK "Pride Week" +#define MOTH_WEEK "Moth Week" /* Days of the week to make it easier to reference them. diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index e1c6327e013..30d72f2c6af 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -79,10 +79,13 @@ if(ishuman(M))//don't remove people from the round randomly you jerks var/mob/living/carbon/human/human = M if(!(human.mob_biotypes & (MOB_ROBOTIC|MOB_MINERAL|MOB_UNDEAD|MOB_SPIRIT))) - if(human.dna && human.dna.species.id != SPECIES_FLY) + var/datum/species/species_to_transform = /datum/species/fly + if(SSevents.holidays && SSevents.holidays[MOTH_WEEK]) + species_to_transform = /datum/species/moth + if(human.dna && human.dna.species.id != initial(species_to_transform.id)) to_chat(M, span_hear("You hear a buzzing in your ears.")) - human.set_species(/datum/species/fly) - log_game("[human] ([key_name(human)]) was turned into a fly person") + human.set_species(species_to_transform) + log_game("[human] ([key_name(human)]) was turned into a [initial(species_to_transform.name)] through [src].") human.apply_effect((rand(120 - accuracy * 40, 180 - accuracy * 60)), EFFECT_IRRADIATE, 0) calibrated = FALSE diff --git a/code/modules/holiday/nth_week.dm b/code/modules/holiday/nth_week.dm index 342cc663b48..10ecc11b3ca 100644 --- a/code/modules/holiday/nth_week.dm +++ b/code/modules/holiday/nth_week.dm @@ -67,7 +67,7 @@ return pick("Stout","Porter","Lager","Ale","Malt","Bock","Doppelbock","Hefeweizen","Pilsner","IPA","Lite") //I'm sorry for the last one /datum/holiday/nth_week/moth - name = "Moth Week" + name = MOTH_WEEK begin_week = 3 end_week = 4 begin_month = JULY