From 0b14f97af0e8ea43bc4c24290dd55bc74d5c221d Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Sat, 4 Aug 2012 15:44:02 +1000 Subject: [PATCH] hardcap for vermin spawning (30, editable via gameticker) --- code/game/gamemodes/gameticker.dm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index 14948987199..986a0b314da 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -327,27 +327,28 @@ var/datum/roundinfo/roundinfo = new() if(spawn_vermin && vermin_spawn_turfs && vermin_spawn_turfs.len) if(!spawning_vermin) spawning_vermin = 1 + spawn(rand(vermin_min_spawntime, vermin_max_spawntime)) spawning_vermin = 0 var/cur_alive_vermin = 0 + //check to see if there are too many already for(var/obj/effect/critter/roach/R in world) cur_alive_vermin++ for(var/mob/living/simple_animal/mouse/M in world) if(!M.stat) cur_alive_vermin++ - if(cur_alive_vermin <= max_vermin) - return - var/turf/T = pick(vermin_spawn_turfs) - if(T) - if(prob(50)) - new /mob/living/simple_animal/mouse(T) + if(cur_alive_vermin < max_vermin) + var/turf/T = pick(vermin_spawn_turfs) + if(T) + if(prob(50)) + new /mob/living/simple_animal/mouse(T) + else + new /obj/effect/critter/roach(T) else - new /obj/effect/critter/roach(T) - else - //no turf, skip this time - vermin_spawn_turfs.Remove(T) + //no turf, skip this time + vermin_spawn_turfs.Remove(T) return 1