From 98b308279fe1bad57e19b58a90e3189719671621 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 26 Mar 2018 15:17:34 -0400 Subject: [PATCH 1/2] Merge pull request #36710 from fludd12/Inky-Capped-Lists Properly Blacklists Mushroom People --- code/modules/mob/living/carbon/human/species_types/mushpeople.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm index 18cb2d248d..b6c20b9401 100644 --- a/code/modules/mob/living/carbon/human/species_types/mushpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/mushpeople.dm @@ -25,6 +25,7 @@ mutanteyes = /obj/item/organ/eyes/night_vision/mushroom use_skintones = FALSE var/datum/martial_art/mushpunch/mush + blacklisted = TRUE //See comment below about locking it out of roundstart. The species is not intended to be available to players yet - and this means wizards, too. /datum/species/mush/check_roundstart_eligible() return FALSE //hard locked out of roundstart on the order of design lead kor, this can be removed in the future when planetstation is here OR SOMETHING but right now we have a problem with races.