shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update humans.dm

Browse Source
This commit is contained in:
LetterJay
2018-04-01 17:39:26 -05:00
committed by GitHub
parent 1c76539a5b
commit 5c817dfd01
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/mob/living/carbon/human/species_types/humans.dm
View File

@@ -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