cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-19 20:29:45 -05:00
committed by GitHub
parent ea6181b9bf
commit aba4c656ea
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/game/turfs/simulated/outdoors/grass.dm
View File

@@ -41,17 +41,11 @@ var/list/grass_types = list(
initial_flooring = /decl/flooring/grass/sif initial_flooring = /decl/flooring/grass/sif
edge_blending_priority = 2 edge_blending_priority = 2
grass_chance = 5 grass_chance = 5
<<<<<<< HEAD var/tree_chance = 0.7 //CHOMPedit
var/tree_chance = 0.7
animal_chance = 0.25 animal_chance = 0.25 //CHOMPedit
=======
var/tree_chance = 2
/*
animal_chance = 0.5
>>>>>>> 3b23b6a4969... Merge pull request #12286 from Heroman3003/branch
animal_types = list( animal_types = list(
/mob/living/simple_mob/animal/sif/diyaab = 7, /mob/living/simple_mob/animal/sif/diyaab = 7,
/mob/living/simple_mob/animal/sif/glitterfly = 2, /mob/living/simple_mob/animal/sif/glitterfly = 2,
@@ -106,7 +100,6 @@ var/list/grass_types = list(
/obj/structure/flora/sif/eyes = 5, /obj/structure/flora/sif/eyes = 5,
/obj/structure/flora/sif/tendrils = 30 /obj/structure/flora/sif/tendrils = 30
) )
<<<<<<< HEAD
//CHOMPedit: animal spawning for sif rocks. This probably doesn't belong in grass.dm but it's where there other Sif spawns are, sue me. //CHOMPedit: animal spawning for sif rocks. This probably doesn't belong in grass.dm but it's where there other Sif spawns are, sue me.
/turf/simulated/floor/outdoors/rocks/sif /turf/simulated/floor/outdoors/rocks/sif
@@ -123,5 +116,3 @@ var/list/grass_types = list(
. = ..() . = ..()
//CHOMPedit end //CHOMPedit end
=======
>>>>>>> 3b23b6a4969... Merge pull request #12286 from Heroman3003/branch