From 90795329e65ab9d59d1e923d05aea9ef156a501b Mon Sep 17 00:00:00 2001
From: NovaBot <154629622+NovaBot13@users.noreply.github.com>
Date: Sat, 6 Apr 2024 21:17:35 -0400
Subject: [PATCH] [MIRROR] Fix `/datum/dimension_theme/fancy` never applying 
 (#1845)

* Fix `/datum/dimension_theme/fancy` never applying  (#82485)

## About The Pull Request

It always runtimed due to `replace_floors` being `null`
and because it runtimed it never got to set `replace_floors` to a list

## Changelog

:cl: Melbert
fix: Fix fancy anomaly theme being broken
/:cl:

* Fix `/datum/dimension_theme/fancy` never applying

---------

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
---
 .../anomalies/anomalies_dimensional_themes.dm | 46 +++++++++++--------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
index c085f023c0b..6832b07d125 100644
--- a/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
+++ b/code/game/objects/effects/anomalies/anomalies_dimensional_themes.dm
@@ -362,32 +362,42 @@
 		/obj/structure/chair = list(/obj/structure/chair/comfy = 1),
 		/obj/machinery/door/airlock = list(/obj/machinery/door/airlock/wood = 1, /obj/machinery/door/airlock/wood/glass = 1),
 	)
-	///cooldown for changing carpets, It's kinda dull to always use the same one, but we also can't make it too random.
+	/// Cooldown for changing carpets, It's kinda dull to always use the same one, but we also can't make it too random.
 	COOLDOWN_DECLARE(carpet_switch_cd)
+	/// List of carpets we can pick from, set up in New
+	var/list/valid_carpets
+	/// List of tables we can pick from, set up in New
+	var/list/valid_tables
 
-#define FANCY_CARPETS list(\
-	/turf/open/floor/eighties, \
-	/turf/open/floor/eighties/red, \
-	/turf/open/floor/carpet/lone/star, \
-	/turf/open/floor/carpet/black, \
-	/turf/open/floor/carpet/blue, \
-	/turf/open/floor/carpet/cyan, \
-	/turf/open/floor/carpet/green, \
-	/turf/open/floor/carpet/orange, \
-	/turf/open/floor/carpet/purple, \
-	/turf/open/floor/carpet/red, \
-	/turf/open/floor/carpet/royalblack, \
-	/turf/open/floor/carpet/royalblue,)
+/datum/dimension_theme/fancy/New()
+	. = ..()
+	valid_carpets = list(
+		/turf/open/floor/carpet/black,
+		/turf/open/floor/carpet/blue,
+		/turf/open/floor/carpet/cyan,
+		/turf/open/floor/carpet/green,
+		/turf/open/floor/carpet/lone/star,
+		/turf/open/floor/carpet/orange,
+		/turf/open/floor/carpet/purple,
+		/turf/open/floor/carpet/red,
+		/turf/open/floor/carpet/royalblack,
+		/turf/open/floor/carpet/royalblue,
+		/turf/open/floor/eighties,
+		/turf/open/floor/eighties/red,
+	)
+	valid_tables = subtypesof(/obj/structure/table/wood/fancy)
+	randomize_theme()
+
+/datum/dimension_theme/fancy/proc/randomize_theme()
+	replace_floors = list(pick(valid_carpets) = 1)
+	replace_objs[/obj/structure/table/wood] = list(pick(valid_tables) = 1)
 
 /datum/dimension_theme/fancy/apply_theme(turf/affected_turf, skip_sound = FALSE, show_effect = FALSE)
 	if(COOLDOWN_FINISHED(src, carpet_switch_cd))
-		replace_floors = list(pick(FANCY_CARPETS) = 1)
-		replace_objs[/obj/structure/table/wood] = list(pick(subtypesof(/obj/structure/table/wood/fancy)) = 1)
+		randomize_theme()
 		COOLDOWN_START(src, carpet_switch_cd, 90 SECONDS)
 	return ..()
 
-#undef FANCY_CARPETS
-
 /datum/dimension_theme/disco
 	name = "Disco"
 	icon = 'icons/obj/lighting.dmi'