diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 34a7743b082..cd9b0c02206 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -47,7 +47,7 @@ i++ /datum/event/carp_migration/end() - for(var/mob/living/simple_animal/hostile/carp/C in spawned_carp) + for(var/mob/living/simple_animal/hostile/C in spawned_carp) if(!C.stat) var/turf/T = get_turf(C) if(istype(T, /turf/space)) diff --git a/code/modules/events/koi_mirgration.dm b/code/modules/events/koi_mirgration.dm index 6372d0ea1cd..868457721b2 100644 --- a/code/modules/events/koi_mirgration.dm +++ b/code/modules/events/koi_mirgration.dm @@ -6,28 +6,4 @@ /datum/event/carp_migration/koi/start() - spawn_fish(landmarks_list.len) - -/datum/event/carp_migration/koi/spawn_fish(var/num_groups, var/group_size_min=3, var/group_size_max=5) - var/list/spawn_locations = list() - - for(var/obj/effect/landmark/C in landmarks_list) - if(C.name == "carpspawn") - spawn_locations.Add(C.loc) - spawn_locations = shuffle(spawn_locations) - num_groups = min(num_groups, spawn_locations.len) - - var/i = 1 - while(i <= num_groups) - var/group_size = rand(group_size_min, group_size_max) - for(var/j = 1, j <= group_size, j++) - var/carptype = pickweight(spawned_mobs) - spawned_carp.Add(new carptype(spawn_locations[i])) - i++ - -/datum/event/carp_migration/koi/end() - for(var/mob/living/simple_animal/hostile/retaliate/carp/koi/C in spawned_carp) - if(!C.stat) - var/turf/T = get_turf(C) - if(istype(T, /turf/space)) - qdel(C) + spawn_fish(landmarks_list.len) \ No newline at end of file