From f7840111810edad4fa1c542cc6bbf486106adc72 Mon Sep 17 00:00:00 2001
From: Atermonera <atermonera@gmail.com>
Date: Fri, 19 Jun 2020 22:00:24 -0700
Subject: [PATCH 1/2] Dirt Fix

---
 code/game/turfs/flooring/flooring.dm       |  8 ++++++--
 code/game/turfs/simulated/outdoors/dirt.dm | 12 +++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/code/game/turfs/flooring/flooring.dm b/code/game/turfs/flooring/flooring.dm
index edf949c8c9..a2f2b62b7f 100644
--- a/code/game/turfs/flooring/flooring.dm
+++ b/code/game/turfs/flooring/flooring.dm
@@ -205,14 +205,18 @@ var/list/flooring_types
 	desc = "Gritty and unpleasant, just like dirt."
 	icon = 'icons/turf/outdoors.dmi'
 	icon_base = "dirt-dark"
-	flags = TURF_HAS_EDGES | TURF_REMOVE_SHOVEL
+	flags = TURF_REMOVE_SHOVEL
 	build_type = null
 	footstep_sounds = list("human" = list(
 		'sound/effects/footstep/asteroid1.ogg',
 		'sound/effects/footstep/asteroid2.ogg',
 		'sound/effects/footstep/asteroid3.ogg',
 		'sound/effects/footstep/asteroid4.ogg',
-		'sound/effects/footstep/asteroid5.ogg'))
+		'sound/effects/footstep/asteroid5.ogg',
+		'sound/effects/footstep/MedDirt1.ogg',
+		'sound/effects/footstep/MedDirt2.ogg',
+		'sound/effects/footstep/MedDirt3.ogg',
+		'sound/effects/footstep/MedDirt4.ogg',))
 
 /decl/flooring/snow
 	name = "snow"
diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm
index 58e1db4951..7a61254eb9 100644
--- a/code/game/turfs/simulated/outdoors/dirt.dm
+++ b/code/game/turfs/simulated/outdoors/dirt.dm
@@ -1,7 +1,17 @@
+<<<<<<< HEAD
 /turf/simulated/floor/outdoors/dirt
 	name = "dirt"
 	desc = "Quite dirty!"
 	icon_state = "dirt-dark"
 	edge_blending_priority = 2
 	turf_layers = list(/turf/simulated/floor/outdoors/rocks)
-	initial_flooring = /decl/flooring/asteroid
\ No newline at end of file
+	initial_flooring = /decl/flooring/asteroid
+=======
+/turf/simulated/floor/outdoors/dirt
+	name = "dirt"
+	desc = "Quite dirty!"
+	icon_state = "dirt-dark"
+	edge_blending_priority = 2
+	turf_layers = list(/turf/simulated/floor/outdoors/rocks)
+	initial_flooring = /decl/flooring/dirt
+>>>>>>> 3723433... Merge pull request #7295 from Darlantanis/DirtFix

From 70d21b6b79435edf9a3ef91a1c9d556e08744cc5 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 22 Jun 2020 07:52:45 -0400
Subject: [PATCH 2/2] Update dirt.dm

---
 code/game/turfs/simulated/outdoors/dirt.dm | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm
index 7a61254eb9..b02bbdd9f0 100644
--- a/code/game/turfs/simulated/outdoors/dirt.dm
+++ b/code/game/turfs/simulated/outdoors/dirt.dm
@@ -1,17 +1,7 @@
-<<<<<<< HEAD
 /turf/simulated/floor/outdoors/dirt
 	name = "dirt"
 	desc = "Quite dirty!"
 	icon_state = "dirt-dark"
 	edge_blending_priority = 2
 	turf_layers = list(/turf/simulated/floor/outdoors/rocks)
-	initial_flooring = /decl/flooring/asteroid
-=======
-/turf/simulated/floor/outdoors/dirt
-	name = "dirt"
-	desc = "Quite dirty!"
-	icon_state = "dirt-dark"
-	edge_blending_priority = 2
-	turf_layers = list(/turf/simulated/floor/outdoors/rocks)
-	initial_flooring = /decl/flooring/dirt
->>>>>>> 3723433... Merge pull request #7295 from Darlantanis/DirtFix
+	initial_flooring = /decl/flooring/dirt