From 4989c4423aaa6e014fd3cbbca93003236d6449cd Mon Sep 17 00:00:00 2001
From: Nadyr <41974248+Darlantanis@users.noreply.github.com>
Date: Wed, 27 Jan 2021 14:19:18 -0500
Subject: [PATCH] Fixes sif forest grass, adds overgrowth tiles (#7841)

---
 .../objects/items/stacks/tiles/fifty_spawner_tiles.dm    | 4 ++++
 code/game/objects/items/stacks/tiles/tile_types.dm       | 5 +++++
 code/game/turfs/flooring/flooring.dm                     | 9 +++++++++
 code/game/turfs/simulated/outdoors/grass.dm              | 1 +
 4 files changed, 19 insertions(+)

diff --git a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
index 098926f535..e9d5f6a2a5 100644
--- a/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
+++ b/code/game/objects/items/stacks/tiles/fifty_spawner_tiles.dm
@@ -8,6 +8,10 @@
 	name = "stack of sifgrass"
 	type_to_spawn = /obj/item/stack/tile/grass/sif
 
+/obj/fiftyspawner/grass/sif/forest
+	name = "stack of sifgrass"
+	type_to_spawn = /obj/item/stack/tile/grass/sif/forest
+
 /obj/fiftyspawner/wood
 	name = "stack of wood"
 	type_to_spawn = /obj/item/stack/tile/wood
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index d2a6522ce2..5e5ac1a746 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -47,6 +47,11 @@
 	singular_name = "sivian grass floor tile"
 	desc = "A patch of grass like those that decorate the plains of Sif."
 
+/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."
+
 /*
  * Wood
  */
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 08133f1b72..31d39aa47d 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -148,6 +148,15 @@ var/list/flooring_types
 	icon_base = "grass_sif"
 	build_type = /obj/item/stack/tile/grass/sif
 	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
 
 /decl/flooring/water
 	name = "water"
diff --git a/code/game/turfs/simulated/outdoors/grass.dm b/code/game/turfs/simulated/outdoors/grass.dm
index 09784b21a3..65d0e472f1 100644
--- a/code/game/turfs/simulated/outdoors/grass.dm
+++ b/code/game/turfs/simulated/outdoors/grass.dm
@@ -86,6 +86,7 @@ var/list/grass_types = list(
 /turf/simulated/floor/outdoors/grass/sif/forest
 	name = "thick growth"
 	icon_state = "grass_sif_dark0"
+	initial_flooring = /decl/flooring/grass/sif/forest
 	edge_blending_priority = 5
 	tree_chance = 10
 	grass_chance = 1