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

Update skeletons.dm

Browse Source
This commit is contained in:
LetterJay
2017-10-03 18:47:01 -05:00
committed by GitHub
parent e4d6219f1d
commit dc9b438bd8
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/skeletons.dm
+1 -17
View File
@@ -1,18 +1,3 @@
<<<<<<< HEAD
/datum/species/skeleton
// 2spooky
name = "Spooky Scary Skeleton"
id = "skeleton"
say_mod = "rattles"
blacklisted = 1
sexes = 0
meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/skeleton
species_traits = list(NOBREATH,RESISTHOT,RESISTCOLD,RESISTPRESSURE,NOBLOOD,RADIMMUNE,VIRUSIMMUNE,PIERCEIMMUNE,NOHUNGER,EASYDISMEMBER,EASYLIMBATTACHMENT)
mutant_organs = list(/obj/item/organ/tongue/bone)
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
disliked_food = NONE
liked_food = NONE
=======
/datum/species/skeleton
// 2spooky
name = "Spooky Scary Skeleton"
@@ -25,5 +10,4 @@
mutanttongue = /obj/item/organ/tongue/bone
damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
disliked_food = NONE
liked_food = GROSS | MEAT | RAW
>>>>>>> 85cd9e6... Organ initialization cleanup
liked_food = NONE