Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

During moth week, teleporter accidents make you Moths #60284

Merged
merged 1 commit into from Jul 18, 2021
Merged

During moth week, teleporter accidents make you Moths #60284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions code/__DEFINES/time.dm
View file
Open in desktop
Expand Up @@ -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.
Expand Down
9 changes: 6 additions & 3 deletions code/game/machinery/teleporter.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/holiday/nth_week.dm
View file
Open in desktop
Expand Up @@ -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
Expand Down