From 5ed15f56365c970494e9dee1dccc53f3152d580b Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 9 May 2020 15:58:43 -0700 Subject: [PATCH 1/2] Prevents simplemob spawning on random turfs, pending a better system. --- code/game/turfs/simulated/outdoors/grass.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 553b4858bba..90f4f790ae9 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -11,14 +11,14 @@ var/list/grass_types = list( /turf/simulated/floor/outdoors/dirt ) var/grass_chance = 20 - +/* var/animal_chance = 1 // Weighted spawn list. var/list/animal_types = list( /mob/living/simple_mob/animal/passive/tindalos = 1 ) - +*/ var/list/grass_types = list( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/fullgrass @@ -38,8 +38,13 @@ var/list/grass_types = list( edge_blending_priority = 4 grass_chance = 5 var/tree_chance = 2 +<<<<<<< HEAD animal_chance = 0 //VOREStation Edit +======= +/* + animal_chance = 0.5 +>>>>>>> ac4719e... Merge pull request #7132 from Mechoid/Simplemobageddon animal_types = list( /mob/living/simple_mob/animal/sif/diyaab = 10, @@ -48,7 +53,7 @@ var/list/grass_types = list( /mob/living/simple_mob/animal/sif/shantak/retaliate = 2, /obj/random/mob/multiple/sifmobs = 1 ) - +*/ grass_types = list( /obj/structure/flora/sif/eyes = 1, /obj/structure/flora/sif/tendrils = 10 @@ -70,11 +75,11 @@ var/list/grass_types = list( if(grass_chance && prob(grass_chance) && !check_density()) var/grass_type = pickweight(grass_types) new grass_type(src) - +/* if(animal_chance && prob(animal_chance) && !check_density()) var/animal_type = pickweight(animal_types) new animal_type(src) - +*/ . = ..() /turf/simulated/floor/outdoors/grass/forest From 60c0e7a24af98b03b6c20aa22b94efa817692109 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun, 10 May 2020 12:05:02 -0400 Subject: [PATCH 2/2] Update grass.dm --- code/game/turfs/simulated/outdoors/grass.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm index 90f4f790ae9..6ee01d5087d 100644 --- a/code/game/turfs/simulated/outdoors/grass.dm +++ b/code/game/turfs/simulated/outdoors/grass.dm @@ -38,13 +38,8 @@ var/list/grass_types = list( edge_blending_priority = 4 grass_chance = 5 var/tree_chance = 2 -<<<<<<< HEAD - - animal_chance = 0 //VOREStation Edit -======= /* animal_chance = 0.5 ->>>>>>> ac4719e... Merge pull request #7132 from Mechoid/Simplemobageddon animal_types = list( /mob/living/simple_mob/animal/sif/diyaab = 10,