Update skeletons.dm

2017-10-22 10:48:29 -05:00
parent e4f76a79a5
commit 1bcb5f2c86
1 changed files with 0 additions and 4 deletions
@@ -10,13 +10,9 @@
 	mutanttongue = /obj/item/organ/tongue/bone
 	damage_overlay_type = ""//let's not show bloody wounds or burns over bones.
 	disliked_food = NONE
-<<<<<<< HEAD
 	liked_food = NONE
-=======
-	liked_food = GROSS | MEAT | RAW

 /datum/species/skeleton/check_roundstart_eligible()
 	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
 		return TRUE
 	return ..()
->>>>>>> dcddc79... Allows species to be blocked from ever being roundstart, can now choose your Halloween species (#31877)