From 6bfba3ea033a7f41abe805b9f9fc7c8fbb736563 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 17:50:23 -0500 Subject: [PATCH] Update lizardpeople.dm --- .../mob/living/carbon/human/species_types/lizardpeople.dm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm index c1db8cd69b..257abf63d0 100644 --- a/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/lizardpeople.dm @@ -4,13 +4,8 @@ id = "lizard" say_mod = "hisses" default_color = "00FF00" -<<<<<<< HEAD - species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR) + species_traits = list(SPECIES_ORGANIC,MUTCOLORS,EYECOLOR,LIPS, HAIR, FACEHAIR) mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur") -======= - species_traits = list(SPECIES_ORGANIC,MUTCOLORS,EYECOLOR,LIPS) - mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs") ->>>>>>> 9d487d2... Divides species in subtypes, makes viruses able to infect certain subtypes (#32858) mutanttongue = /obj/item/organ/tongue/lizard mutanttail = /obj/item/organ/tail/lizard coldmod = 1.5