Slime update

Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
This commit is contained in:
Kelenius
2014-07-15 00:50:41 -04:00
committed by ZomgPonies
parent 9ed850c40f
commit c54b9e3626
34 changed files with 912 additions and 1056 deletions
+2 -3
View File
@@ -293,11 +293,10 @@
babies += M
new_slime = pick(babies)
else
new_slime = new /mob/living/carbon/slime(loc)
if(adult)
new_slime = new /mob/living/carbon/slime/adult(loc)
new_slime.is_adult = 1
else
new_slime = new /mob/living/carbon/slime(loc)
new_slime.a_intent = "harm"
new_slime.key = key
new_slime << "<B>You are now a slime. Skreee!</B>"