From fde6a94202c1feda2b7936202d75fa70e3bfd041 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Fri, 27 Oct 2017 18:33:13 -0400 Subject: [PATCH] Merge pull request #32112 from KorPhaeron/mummies "Mummies" (cloth golems) for Halloween --- code/modules/mob/living/carbon/human/species_types/golems.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index f6dac06eea..10e2dedfd6 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -654,6 +654,11 @@ punchdamagehigh = 8 // not as heavy as stone prefix = "Cloth" +/datum/species/golem/cloth/check_roundstart_eligible() + if(SSevents.holidays && SSevents.holidays[HALLOWEEN]) + return TRUE + return ..() + /datum/species/golem/cloth/random_name(gender,unique,lastname) var/pharaoh_name = pick("Neferkare", "Hudjefa", "Khufu", "Mentuhotep", "Ahmose", "Amenhotep", "Thutmose", "Hatshepsut", "Tutankhamun", "Ramses", "Seti", \ "Merenptah", "Djer", "Semerkhet", "Nynetjer", "Khafre", "Pepi", "Intef", "Ay") //yes, Ay was an actual pharaoh