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

[MIRROR] Fixes sif forest grass, adds overgrowth tiles

Browse Source
This commit is contained in:
Chompstation Bot
2021-01-27 19:35:43 +00:00
parent e3a5367009
commit 0967736254
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
View File

@@ -8,12 +8,20 @@
name = "stack of sifgrass" name = "stack of sifgrass"
type_to_spawn = /obj/item/stack/tile/grass/sif type_to_spawn = /obj/item/stack/tile/grass/sif
<<<<<<< HEAD
//CHOMPedit, delete if this is added upstream. //CHOMPedit, delete if this is added upstream.
/obj/fiftyspawner/grass/sif/forest /obj/fiftyspawner/grass/sif/forest
name = "stack of sifgrass" name = "stack of sifgrass"
type_to_spawn = /obj/item/stack/tile/grass/sif/forest type_to_spawn = /obj/item/stack/tile/grass/sif/forest
//CHOMPedit end //CHOMPedit end
||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
=======
/obj/fiftyspawner/grass/sif/forest
name = "stack of sifgrass"
type_to_spawn = /obj/item/stack/tile/grass/sif/forest
>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
/obj/fiftyspawner/wood /obj/fiftyspawner/wood
name = "stack of wood" name = "stack of wood"
type_to_spawn = /obj/item/stack/tile/wood type_to_spawn = /obj/item/stack/tile/wood

9
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -52,12 +52,21 @@
singular_name = "sivian grass floor tile" singular_name = "sivian grass floor tile"
desc = "A patch of grass like those that decorate the plains of Sif." desc = "A patch of grass like those that decorate the plains of Sif."
<<<<<<< HEAD
//CHOMPedit: remove if this gets added upstream //CHOMPedit: remove if this gets added upstream
/obj/item/stack/tile/grass/sif/forest /obj/item/stack/tile/grass/sif/forest
name = "sivian overgrowth tile" name = "sivian overgrowth tile"
singular_name = "sivian overgrowth floor tile" singular_name = "sivian overgrowth floor tile"
desc = "A patch of dark overgrowth like those that decorate the plains of Sif." desc = "A patch of dark overgrowth like those that decorate the plains of Sif."
//CHOMPedit end //CHOMPedit end
||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
=======
/obj/item/stack/tile/grass/sif/forest
name = "sivian overgrowth tile"
singular_name = "sivian overgrowth floor tile"
desc = "A patch of dark overgrowth like those that decorate the plains of Sif."
>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
/* /*
* Wood * Wood
*/ */

9
code/game/turfs/flooring/flooring.dm
View File

@@ -148,6 +148,15 @@ var/list/flooring_types
icon_base = "grass_sif" icon_base = "grass_sif"
build_type = /obj/item/stack/tile/grass/sif build_type = /obj/item/stack/tile/grass/sif
has_base_range = 1 has_base_range = 1
/decl/flooring/grass/sif/forest
name = "thick growth"
desc = "A natural moss that has adapted to the sheer cold climate."
flags = TURF_REMOVE_SHOVEL
icon = 'icons/turf/outdoors.dmi'
icon_base = "grass_sif_dark"
build_type = /obj/item/stack/tile/grass/sif/forest
has_base_range = 1
//CHOMPedit: sif/forest decl. If this ends up upstream just accept the upstream version. //CHOMPedit: sif/forest decl. If this ends up upstream just accept the upstream version.
/decl/flooring/grass/sif/forest /decl/flooring/grass/sif/forest

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

@@ -89,7 +89,12 @@ var/list/grass_types = list(
/turf/simulated/floor/outdoors/grass/sif/forest /turf/simulated/floor/outdoors/grass/sif/forest
name = "thick growth" name = "thick growth"
icon_state = "grass_sif_dark0" icon_state = "grass_sif_dark0"
<<<<<<< HEAD
initial_flooring = /decl/flooring/grass/sif/forest //CHOMPedit: Remove if this ends up upstream initial_flooring = /decl/flooring/grass/sif/forest //CHOMPedit: Remove if this ends up upstream
||||||| parent of 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
=======
initial_flooring = /decl/flooring/grass/sif/forest
>>>>>>> 9eaf2d11ce... Merge pull request #9619 from VOREStation/upstream-merge-7841
edge_blending_priority = 5 edge_blending_priority = 5
tree_chance = 4 tree_chance = 4
grass_chance = 1 grass_chance = 1