From 0f0ab49648b61d7a8204005832754d9295079b3b Mon Sep 17 00:00:00 2001 From: deathride58 Date: Thu, 8 Mar 2018 01:03:56 -0500 Subject: [PATCH] Update species.dm --- code/modules/mob/living/carbon/human/species.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index e08df18d2c..2e2648a26a 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -683,7 +683,8 @@ GLOBAL_LIST_EMPTY(roundstart_races) S = GLOB.legs_list[H.dna.features["legs"]] if("moth_wings") S = GLOB.moth_wings_list[H.dna.features["moth_wings"]] -<<<<<<< HEAD + if("caps") + S = GLOB.caps_list[H.dna.features["caps"]] //Mammal Bodyparts if("mam_tail") @@ -705,10 +706,6 @@ GLOBAL_LIST_EMPTY(roundstart_races) if("xenotail") S = GLOB.xeno_tail_list[H.dna.features["xenotail"]] -======= - if("caps") - S = GLOB.caps_list[H.dna.features["caps"]] ->>>>>>> 84d4b3a... Mushroom people, revived! (#35858) if(!S || S.icon_state == "none") continue