Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation into ErikTheDogEdits

# Conflicts:
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
This commit is contained in:
Erik Darkpaws
2019-05-27 00:37:27 -07:00
13 changed files with 216 additions and 12 deletions
+3 -2
View File
@@ -20,13 +20,14 @@
/mob/living/simple_animal/hostile/goose = 60,
/mob/living/simple_animal/retaliate/bee = 50,
/mob/living/simple_animal/hostile/metroid/mine = 20,
)
)
/obj/structure/mob_spawner/scanner/mining_animals/do_spawn(var/mob_path)
if(!ispath(mob_path))
return 0
var/mob/living/L = new mob_path(get_turf(src))
L/simple_animal.vore_escape_time = 15 SECONDS
if (ispath(L, /mob/living/simple_animal))
L/simple_animal.vore_escape_time = 15 SECONDS // Mob vore nerf!
L.source_spawner = src
spawned_mobs.Add(L)
last_spawn = world.time