From 1bcb5f2c863debf5c948c8ed67e2d216b60c5518 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 22 Oct 2017 10:48:29 -0500 Subject: [PATCH] Update skeletons.dm --- .../mob/living/carbon/human/species_types/skeletons.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/skeletons.dm b/code/modules/mob/living/carbon/human/species_types/skeletons.dm index e1b17ab5eb..acaa182ad0 100644 --- a/code/modules/mob/living/carbon/human/species_types/skeletons.dm +++ b/code/modules/mob/living/carbon/human/species_types/skeletons.dm @@ -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)