From b8c75ab047f136a162e49c2024eeb8446c32b6f2 Mon Sep 17 00:00:00 2001
From: Cerebulon <tanhindmarsh@yahoo.com>
Date: Wed, 1 Sep 2021 01:59:24 +0100
Subject: [PATCH] entire duplicate sidewalk dm?!

---
 code/game/turfs/simulated/outdoors/dirt.dm    | 43 -------------------
 .../game/turfs/simulated/outdoors/sidewalk.dm | 37 ++++++++++------
 2 files changed, 23 insertions(+), 57 deletions(-)

diff --git a/code/game/turfs/simulated/outdoors/dirt.dm b/code/game/turfs/simulated/outdoors/dirt.dm
index 496971a349..4d1de09764 100644
--- a/code/game/turfs/simulated/outdoors/dirt.dm
+++ b/code/game/turfs/simulated/outdoors/dirt.dm
@@ -67,46 +67,3 @@
 /turf/simulated/floor/outdoors/newdirt_nograss/Initialize(mapload)
 	flooring_override = pickweight(possibledirts)
 	return ..()
-
-/turf/simulated/floor/outdoors/sidewalk
-	name = "sidewalk"
-	desc = "Concrete shaped into a path!"
-	icon = 'icons/turf/outdoors.dmi'
-	icon_state = "sidewalk"
-	edge_blending_priority = 1
-	movement_cost = -0.5
-	initial_flooring = /decl/flooring/outdoors/sidewalk
-	var/static/possibledirts = list(
-		"" = 150,
-		"1" = 3,
-		"2" = 3,
-		"3" = 3,
-		"4" = 3,
-		"5" = 3,
-		"6" = 2,
-		"7" = 2,
-		"8" = 2,
-		"9" = 2,
-		"10" = 2
-	)
-
-/decl/flooring/outdoors/sidewalk
-	name = "sidewalk"
-	desc = "Concrete shaped into a path!"
-	icon = 'icons/turf/outdoors.dmi'
-	icon_base = "sidewalk"
-	footstep_sounds = list("human" = list(
-		'sound/effects/footstep/LightStone1.ogg',
-		'sound/effects/footstep/LightStone2.ogg',
-		'sound/effects/footstep/LightStone3.ogg',
-		'sound/effects/footstep/LightStone4.ogg',))
-
-/turf/simulated/floor/outdoors/sidewalk/Initialize(mapload)
-	flooring_override = "[initial(icon_state)][pickweight(possibledirts)]"
-	return ..()
-
-/turf/simulated/floor/outdoors/sidewalk/side
-	icon_state = "side-walk"
-
-/turf/simulated/floor/outdoors/sidewalk/slab
-	icon_state = "slab"
\ No newline at end of file
diff --git a/code/game/turfs/simulated/outdoors/sidewalk.dm b/code/game/turfs/simulated/outdoors/sidewalk.dm
index 7de6566058..78aa5fca6a 100644
--- a/code/game/turfs/simulated/outdoors/sidewalk.dm
+++ b/code/game/turfs/simulated/outdoors/sidewalk.dm
@@ -1,3 +1,25 @@
+/turf/simulated/floor/outdoors/sidewalk
+	name = "sidewalk"
+	desc = "Concrete shaped into a path!"
+	icon = 'icons/turf/outdoors.dmi'
+	icon_state = "sidewalk"
+	edge_blending_priority = 1
+	movement_cost = -0.5
+	initial_flooring = /decl/flooring/outdoors/sidewalk
+	var/static/possibledirts = list(
+		"" = 150,
+		"1" = 3,
+		"2" = 3,
+		"3" = 3,
+		"4" = 3,
+		"5" = 3,
+		"6" = 2,
+		"7" = 2,
+		"8" = 2,
+		"9" = 2,
+		"10" = 2
+	)
+
 /decl/flooring/outdoors/sidewalk
 	name = "sidewalk"
 	desc = "Concrete shaped into a path!"
@@ -10,20 +32,7 @@
 		'sound/effects/footstep/LightStone4.ogg',))
 
 /turf/simulated/floor/outdoors/sidewalk/Initialize(mapload)
-	var/possibledirts = list(
-		"[initial(icon_state)]" = 150,
-		"[initial(icon_state)]1" = 3,
-		"[initial(icon_state)]2" = 3,
-		"[initial(icon_state)]3" = 3,
-		"[initial(icon_state)]4" = 3,
-		"[initial(icon_state)]5" = 3,
-		"[initial(icon_state)]6" = 2,
-		"[initial(icon_state)]7" = 2,
-		"[initial(icon_state)]8" = 2,
-		"[initial(icon_state)]9" = 2,
-		"[initial(icon_state)]10" = 2
-	)
-	flooring_override = pickweight(possibledirts)
+	flooring_override = "[initial(icon_state)][pickweight(possibledirts)]"
 	return ..()
 
 /turf/simulated/floor/outdoors/sidewalk/side