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

Update lizardpeople.dm

Browse Source
This commit is contained in:
deathride58
2017-11-22 17:50:23 -05:00
committed by GitHub
parent 93a2d653bf
commit 6bfba3ea03
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/lizardpeople.dm
+1 -6
View File
@@ -4,13 +4,8 @@
id = "lizard" id = "lizard"
say_mod = "hisses" say_mod = "hisses"
default_color = "00FF00" default_color = "00FF00"
<<<<<<< HEAD species_traits = list(SPECIES_ORGANIC,MUTCOLORS,EYECOLOR,LIPS, HAIR, FACEHAIR)
species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR,FACEHAIR)
mutant_bodyparts = list("tail_lizard", "snout", "spines", "horns", "frills", "body_markings", "legs", "taur") 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 mutanttongue = /obj/item/organ/tongue/lizard
mutanttail = /obj/item/organ/tail/lizard mutanttail = /obj/item/organ/tail/lizard
coldmod = 1.5 coldmod = 1.5