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
+1 -1
View File
@@ -84,7 +84,7 @@
spawn_types = list(/obj/effect/spider/spiderling)
vermstring = "spiders"
if(VERM_SLIMES)
spawn_types = typesof(/mob/living/carbon/slime) - /mob/living/carbon/slime - typesof(/mob/living/carbon/slime/adult)
spawn_types = typesof(/mob/living/carbon/slime) - /mob/living/carbon/slime
vermstring = "slimes"
if(VERM_BATS)
spawn_types = /mob/living/simple_animal/hostile/scarybat