From 5c817dfd01c78cc017454739d3a29277b4f812a3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 1 Apr 2018 17:39:26 -0500 Subject: [PATCH] Update humans.dm --- code/modules/mob/living/carbon/human/species_types/humans.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/humans.dm b/code/modules/mob/living/carbon/human/species_types/humans.dm index 3fcd0c409f..ffee4fa0a5 100644 --- a/code/modules/mob/living/carbon/human/species_types/humans.dm +++ b/code/modules/mob/living/carbon/human/species_types/humans.dm @@ -2,14 +2,9 @@ name = "Human" id = "human" default_color = "FFFFFF" -<<<<<<< HEAD species_traits = list(MUTCOLORS_PARTSONLY,SPECIES_ORGANIC,EYECOLOR,HAIR,FACEHAIR,LIPS) mutant_bodyparts = list("mam_tail", "mam_ears", "wings", "taur") default_features = list("mcolor" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "wings" = "None", "taur" = "none") -======= - species_traits = list(SPECIES_ORGANIC,EYECOLOR,HAIR,FACEHAIR,LIPS) - default_features = list("mcolor" = "FFF", "tail_human" = "None", "ears" = "None", "wings" = "None") ->>>>>>> 485efbd... Fixes mutant bodypart assignments (#36816) use_skintones = 1 skinned_type = /obj/item/stack/sheet/animalhide/human disliked_food = GROSS | RAW