From a2f77d1eb140bdc0fd5e39bb6236089e11e75e54 Mon Sep 17 00:00:00 2001
From: Darlantan <forlirnglacignis@gmail.com>
Date: Sun, 24 Jan 2021 11:02:43 -0500
Subject: [PATCH] Fixes Sif forest turfs

---
 .../objects/items/stacks/tiles/fifty_spawner_tiles.dm |  6 ++++++
 code/game/objects/items/stacks/tiles/tile_types.dm    |  6 ++++++
 code/game/turfs/flooring/flooring.dm                  | 11 +++++++++++
 3 files changed, 23 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..4aabc88d2d 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,12 @@
 	name = "stack of sifgrass"
 	type_to_spawn = /obj/item/stack/tile/grass/sif
 
+//CHOMPedit, delete if this is added upstream.
+/obj/fiftyspawner/grass/sif/forest
+	name = "stack of sifgrass"
+	type_to_spawn = /obj/item/stack/tile/grass/sif/forest
+//CHOMPedit end
+
 /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 1612725741..befe769b91 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -52,6 +52,12 @@
 	singular_name = "sivian grass floor tile"
 	desc = "A patch of grass like those that decorate the plains of Sif."
 
+//CHOMPedit: remove if this gets added upstream
+/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."
+//CHOMPedit end
 /*
  * Wood
  */
diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index 21bb1c9e8a..42e3792bb0 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -149,6 +149,17 @@ var/list/flooring_types
 	build_type = /obj/item/stack/tile/grass/sif
 	has_base_range = 1
 
+//CHOMPedit: sif/forest decl. If this ends up upstream just accept the upstream version.
+/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 end
+
 /decl/flooring/water
 	name = "water"
 	desc = "Water is wet, gosh, who knew!"