Merge pull request #8893 from Baystation12/dev-freeze

Dev freeze into dev
This commit is contained in:
Zuhayr
2015-04-18 21:50:40 +09:30
3 changed files with 11 additions and 2 deletions

View File

@@ -53,3 +53,8 @@
/datum/species/vox/get_random_name(var/gender)
var/datum/language/species_language = all_languages[default_language]
return species_language.get_random_name(gender)
/datum/species/vox/can_shred(var/mob/living/carbon/human/H, var/ignore_intent)
if(!H.mind || !H.mind.special_role) // Pariah check.
return 0
return ..()