From 79bd06049838f84f370f77de4545eab5489f2bae Mon Sep 17 00:00:00 2001
From: Sord <71185626+Sord213@users.noreply.github.com>
Date: Thu, 21 Sep 2023 19:59:08 -0500
Subject: [PATCH 1/4] new tile colors

---
 .../effects/decals/turfdecal/tilecoloring.dm  | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
index 24bb508d4775..0d7a22362ce6 100644
--- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
@@ -69,6 +69,14 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/green)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green)
 
+/// Darkest green tiles /// Fuck you, not dark enough
+
+/obj/effect/turf_decal/tile/darkest_green
+	name = "darkest green corner"
+	color = "#055205"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/darkest_green)
+
 /// Yellow tiles
 
 /obj/effect/turf_decal/tile/yellow
@@ -77,6 +85,22 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
 
+/// Piss Yellow tiles
+
+/obj/effect/turf_decal/tile/piss_yellow
+	name = "piss yellow corner"
+	color = "#BAC700"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/piss_yellow)
+
+/// Orange tiles
+
+/obj/effect/turf_decal/tile/orange
+	name = "orange corner"
+	color = "#D15802"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/orange)
+
 /// Red tiles
 
 /obj/effect/turf_decal/tile/red
@@ -102,6 +126,14 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/bar)
 
+/// Hot Pink Tiles
+
+/obj/effect/turf_decal/tile/hot_pink
+	name = "hot pink corner"
+	color = "#FF69B4"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/hot_pink)
+
 /// Purple tiles
 
 /obj/effect/turf_decal/tile/purple
@@ -110,6 +142,14 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/bar)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/purple)
 
+/// Dark Puple Tiles
+
+/obj/effect/turf_decal/tile/dark_purple
+	name = "dark purple corner"
+	color = "#6C1282"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_purple)
+
 /// Brown tiles
 
 /obj/effect/turf_decal/tile/brown
@@ -127,6 +167,13 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/brown)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/neutral)
 
+/// Gray tiles
+/obj/effect/turf_decal/tile/gray
+	name = "gray corner"
+	color = "#2E2E2E"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/gray)
+
 /// Dark tiles
 
 /obj/effect/turf_decal/tile/dark
@@ -248,6 +295,12 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/green)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_green)
 
+/// Darkest Green Trimlines
+/obj/effect/turf_decal/trimline/darkest_green
+	color = "#055205"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/darkest_green)
+
 /// Blue trimlines
 /obj/effect/turf_decal/trimline/blue
 	color = "#52B4E9"
@@ -266,12 +319,36 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_blue)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/yellow)
 
+/// Piss Yellow trimlines
+/obj/effect/turf_decal/trimline/piss_yellow
+	color = "#BAC700"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/piss_yellow)
+
+/// Orange trimlines
+/obj/effect/turf_decal/trimline/orange
+	color = "#D15802"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/orange)
+
+/// Hot Pink trimlines
+/obj/effect/turf_decal/trimline/hot_pink
+	color = "#FF69B4"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/hot_pink)
+
 /// Purple trimlines
 /obj/effect/turf_decal/trimline/purple
 	color = "#D381C9"
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/purple)
 
+/// Dark Purple trimlines
+/obj/effect/turf_decal/trimline/dark_purple
+	color = "#6C1282"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_purple)
+
 /// Brown trimlines
 /obj/effect/turf_decal/trimline/brown
 	color = "#A46106"
@@ -285,6 +362,12 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/brown)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/neutral)
 
+/// Gray trimlines
+/obj/effect/turf_decal/trimline/gray
+	color = "#2E2E2E"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/gray)
+
 /// Dark trimlines
 /obj/effect/turf_decal/trimline/dark
 	color = "#0e0f0f"

From a418f1a3682b83ba6f65d7d2fd2e90aa4da48307 Mon Sep 17 00:00:00 2001
From: "DESKTOP-M4GD565\\LME" <polygobttv@gmail.com>
Date: Sun, 8 Oct 2023 21:12:24 -0700
Subject: [PATCH 2/4] modularizes stuff

---
 .../effects/decals/turfdecal/tilecoloring.dm  | 83 -----------------
 .../aesthetics/mapping/tilecoloring.dm        | 92 +++++++++++++++++++
 2 files changed, 92 insertions(+), 83 deletions(-)
 create mode 100644 monkestation/code/modules/aesthetics/mapping/tilecoloring.dm

diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
index 0d7a22362ce6..24bb508d4775 100644
--- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
+++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm
@@ -69,14 +69,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/green)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_green)
 
-/// Darkest green tiles /// Fuck you, not dark enough
-
-/obj/effect/turf_decal/tile/darkest_green
-	name = "darkest green corner"
-	color = "#055205"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/darkest_green)
-
 /// Yellow tiles
 
 /obj/effect/turf_decal/tile/yellow
@@ -85,22 +77,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/darkest_green)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/yellow)
 
-/// Piss Yellow tiles
-
-/obj/effect/turf_decal/tile/piss_yellow
-	name = "piss yellow corner"
-	color = "#BAC700"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/piss_yellow)
-
-/// Orange tiles
-
-/obj/effect/turf_decal/tile/orange
-	name = "orange corner"
-	color = "#D15802"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/orange)
-
 /// Red tiles
 
 /obj/effect/turf_decal/tile/red
@@ -126,14 +102,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_red)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/bar)
 
-/// Hot Pink Tiles
-
-/obj/effect/turf_decal/tile/hot_pink
-	name = "hot pink corner"
-	color = "#FF69B4"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/hot_pink)
-
 /// Purple tiles
 
 /obj/effect/turf_decal/tile/purple
@@ -142,14 +110,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/hot_pink)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/purple)
 
-/// Dark Puple Tiles
-
-/obj/effect/turf_decal/tile/dark_purple
-	name = "dark purple corner"
-	color = "#6C1282"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_purple)
-
 /// Brown tiles
 
 /obj/effect/turf_decal/tile/brown
@@ -167,13 +127,6 @@ TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/brown)
 
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/neutral)
 
-/// Gray tiles
-/obj/effect/turf_decal/tile/gray
-	name = "gray corner"
-	color = "#2E2E2E"
-
-TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/gray)
-
 /// Dark tiles
 
 /obj/effect/turf_decal/tile/dark
@@ -295,12 +248,6 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/green)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_green)
 
-/// Darkest Green Trimlines
-/obj/effect/turf_decal/trimline/darkest_green
-	color = "#055205"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/darkest_green)
-
 /// Blue trimlines
 /obj/effect/turf_decal/trimline/blue
 	color = "#52B4E9"
@@ -319,36 +266,12 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_blue)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/yellow)
 
-/// Piss Yellow trimlines
-/obj/effect/turf_decal/trimline/piss_yellow
-	color = "#BAC700"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/piss_yellow)
-
-/// Orange trimlines
-/obj/effect/turf_decal/trimline/orange
-	color = "#D15802"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/orange)
-
-/// Hot Pink trimlines
-/obj/effect/turf_decal/trimline/hot_pink
-	color = "#FF69B4"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/hot_pink)
-
 /// Purple trimlines
 /obj/effect/turf_decal/trimline/purple
 	color = "#D381C9"
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/purple)
 
-/// Dark Purple trimlines
-/obj/effect/turf_decal/trimline/dark_purple
-	color = "#6C1282"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_purple)
-
 /// Brown trimlines
 /obj/effect/turf_decal/trimline/brown
 	color = "#A46106"
@@ -362,12 +285,6 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/brown)
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/neutral)
 
-/// Gray trimlines
-/obj/effect/turf_decal/trimline/gray
-	color = "#2E2E2E"
-
-TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/gray)
-
 /// Dark trimlines
 /obj/effect/turf_decal/trimline/dark
 	color = "#0e0f0f"
diff --git a/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm b/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm
new file mode 100644
index 000000000000..e3787b7becba
--- /dev/null
+++ b/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm
@@ -0,0 +1,92 @@
+/// Darkest green tiles /// Fuck you, not dark enough
+
+/obj/effect/turf_decal/tile/darkest_green
+	name = "darkest green corner"
+	color = "#055205"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/darkest_green)
+
+/// Piss Yellow tiles
+
+/obj/effect/turf_decal/tile/piss_yellow
+	name = "piss yellow corner"
+	color = "#BAC700"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/piss_yellow)
+
+
+/// Orange tiles
+
+/obj/effect/turf_decal/tile/orange
+	name = "orange corner"
+	color = "#D15802"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/orange)
+
+
+/// Hot Pink Tiles
+
+/obj/effect/turf_decal/tile/hot_pink
+	name = "hot pink corner"
+	color = "#FF69B4"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/hot_pink)
+
+
+/// Dark Puple Tiles
+
+/obj/effect/turf_decal/tile/dark_purple
+	name = "dark purple corner"
+	color = "#6C1282"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/dark_purple)
+
+
+/// Gray tiles
+/obj/effect/turf_decal/tile/gray
+	name = "gray corner"
+	color = "#2E2E2E"
+
+TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/gray)
+
+
+
+/// Darkest Green Trimlines
+/obj/effect/turf_decal/trimline/darkest_green
+	color = "#055205"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/darkest_green)
+
+
+
+/// Piss Yellow trimlines
+/obj/effect/turf_decal/trimline/piss_yellow
+	color = "#BAC700"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/piss_yellow)
+
+/// Orange trimlines
+/obj/effect/turf_decal/trimline/orange
+	color = "#D15802"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/orange)
+
+/// Hot Pink trimlines
+/obj/effect/turf_decal/trimline/hot_pink
+	color = "#FF69B4"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/hot_pink)
+
+
+
+/// Dark Purple trimlines
+/obj/effect/turf_decal/trimline/dark_purple
+	color = "#6C1282"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_purple)
+
+/// Gray trimlines
+/obj/effect/turf_decal/trimline/gray
+	color = "#2E2E2E"
+
+TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/gray)

From b1e2baa527de182988096ae7ab9cbd1fe2b4b9ca Mon Sep 17 00:00:00 2001
From: "DESKTOP-M4GD565\\LME" <polygobttv@gmail.com>
Date: Sun, 8 Oct 2023 23:29:00 -0700
Subject: [PATCH 3/4] tick

---
 tgstation.dme | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tgstation.dme b/tgstation.dme
index 663fb1bbe32a..6417905ae102 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5477,6 +5477,7 @@
 #include "monkestation\code\modules\admin\camera_view.dm"
 #include "monkestation\code\modules\aesthetics\airlock\airlock.dm"
 #include "monkestation\code\modules\aesthetics\items\clothing.dm"
+#include "monkestation\code\modules\aesthetics\mapping\tilecoloring.dm"
 #include "monkestation\code\modules\aesthetics\mobs\slime.dm"
 #include "monkestation\code\modules\aesthetics\objects\misc.dm"
 #include "monkestation\code\modules\aesthetics\objects\window_sill.dm"

From 77de9e340f597b426bd1915733db22ea9cab308e Mon Sep 17 00:00:00 2001
From: "DESKTOP-M4GD565\\LME" <polygobttv@gmail.com>
Date: Mon, 9 Oct 2023 00:18:34 -0700
Subject: [PATCH 4/4] can we define this twice

---
 .../aesthetics/mapping/tilecoloring.dm        | 95 +++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm b/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm
index e3787b7becba..e9066aeddce1 100644
--- a/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm
+++ b/monkestation/code/modules/aesthetics/mapping/tilecoloring.dm
@@ -4,6 +4,98 @@
 	name = "darkest green corner"
 	color = "#055205"
 
+
+
+/// Automatically generates all subtypes for a decal with the given path.
+#define TILE_DECAL_SUBTYPE_HELPER(path)\
+##path/opposingcorners {\
+	icon_state = "tile_opposing_corners";\
+}\
+##path/half {\
+	icon_state = "tile_half";\
+}\
+##path/half/contrasted {\
+	icon_state = "tile_half_contrasted";\
+}\
+##path/anticorner {\
+	icon_state = "tile_anticorner";\
+}\
+##path/anticorner/contrasted {\
+	icon_state = "tile_anticorner_contrasted";\
+}\
+##path/fourcorners {\
+	icon_state = "tile_fourcorners";\
+}\
+##path/full {\
+	icon_state = "tile_full";\
+}\
+##path/diagonal_centre {\
+	icon_state = "diagonal_centre";\
+}\
+##path/diagonal_edge {\
+	icon_state = "diagonal_edge";\
+}
+
+
+
+/// Automatically generates all trimlines for a decal with the given path.
+#define TRIMLINE_SUBTYPE_HELPER(path)\
+##path/line {\
+	icon_state = "trimline";\
+}\
+##path/corner {\
+	icon_state = "trimline_corner";\
+}\
+##path/end {\
+	icon_state = "trimline_end";\
+}\
+##path/arrow_cw {\
+	icon_state = "trimline_arrow_cw";\
+}\
+##path/arrow_ccw {\
+	icon_state = "trimline_arrow_ccw";\
+}\
+##path/warning {\
+	icon_state = "trimline_warn";\
+}\
+##path/tram {\
+	icon_state = "trimline_tram";\
+}\
+##path/mid_joiner {\
+	icon_state = "trimline_mid";\
+}\
+##path/filled {\
+	icon_state = "trimline_box_fill";\
+}\
+##path/filled/line {\
+	icon_state = "trimline_fill";\
+}\
+##path/filled/corner {\
+	icon_state = "trimline_corner_fill";\
+}\
+##path/filled/end {\
+	icon_state = "trimline_end_fill";\
+}\
+##path/filled/arrow_cw {\
+	icon_state = "trimline_arrow_cw_fill";\
+}\
+##path/filled/arrow_ccw {\
+	icon_state = "trimline_arrow_ccw_fill";\
+}\
+##path/filled/warning {\
+	icon_state = "trimline_warn_fill";\
+}\
+##path/filled/mid_joiner {\
+	icon_state = "trimline_mid_fill";\
+}\
+##path/filled/shrink_cw {\
+	icon_state = "trimline_shrink_cw";\
+}\
+##path/filled/shrink_ccw {\
+	icon_state = "trimline_shrink_ccw";\
+}
+
+
 TILE_DECAL_SUBTYPE_HELPER(/obj/effect/turf_decal/tile/darkest_green)
 
 /// Piss Yellow tiles
@@ -90,3 +182,6 @@ TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/dark_purple)
 	color = "#2E2E2E"
 
 TRIMLINE_SUBTYPE_HELPER(/obj/effect/turf_decal/trimline/gray)
+
+#undef TILE_DECAL_SUBTYPE_HELPER
+#undef TRIMLINE_SUBTYPE_HELPER