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

Update jellypeople.dm

Browse Source
This commit is contained in:
LetterJay
2018-01-24 13:59:02 -06:00
committed by GitHub
parent 3aa246d39b
commit 8bd2a0fd03
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species_types/jellypeople.dm
-5
View File
@@ -140,10 +140,6 @@
bodies = list(C) bodies = list(C)
else else
bodies |= C bodies |= C
<<<<<<< HEAD
C.faction |= "slime"
=======
/datum/species/jelly/slime/spec_death(gibbed, mob/living/carbon/human/H) /datum/species/jelly/slime/spec_death(gibbed, mob/living/carbon/human/H)
if(slime_split) if(slime_split)
@@ -157,7 +153,6 @@
if(!LAZYLEN(available_bodies)) if(!LAZYLEN(available_bodies))
return return
swap_body.swap_to_dupe(M, pick(available_bodies)) 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 //If you're cloned you get your body pool back
/datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species) /datum/species/jelly/slime/copy_properties_from(datum/species/jelly/slime/old_species)