From 8bd2a0fd032ba57310c194831a8b7785d4dddcb6 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Wed, 24 Jan 2018 13:59:02 -0600 Subject: [PATCH] Update jellypeople.dm --- .../mob/living/carbon/human/species_types/jellypeople.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index 472b0732c4..6b1a35ea04 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -140,10 +140,6 @@ bodies = list(C) else bodies |= C -<<<<<<< HEAD - - C.faction |= "slime" -======= /datum/species/jelly/slime/spec_death(gibbed, mob/living/carbon/human/H) if(slime_split) @@ -157,7 +153,6 @@ if(!LAZYLEN(available_bodies)) return swap_body.swap_to_dupe(M, pick(available_bodies)) ->>>>>>> f4847c2... [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common (#33773) //If you're cloned you get your body pool back /datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species)