TGS Test Merge (#6051)

Citadel-Station-13 · Oct 4, 2023 · 7b65411 · 7b65411
2 parents 37e49c5 + b1ac571
commit 7b65411
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/code/modules/materials/definitions/legacy.dm b/code/modules/materials/definitions/legacy.dm
@@ -8,6 +8,7 @@
 	display_name = "darkglass"
 	icon_base = "darkglass"
 	icon_colour = "#FFFFFF"
+	table_icon_base = "darkglass"
 
 // what the fuck?
 /datum/material/fancyblack
@@ -16,10 +17,12 @@
 	display_name = "fancyblack"
 	icon_base = "fancyblack"
 	icon_colour = "#FFFFFF"
+	table_icon_base = "fancyblack"
 
 // what the fuck?
 /datum/material/alienalloy/alium
 	id = "abductor_alloy"
 	name = "alium"
 	display_name = "alien"
 	icon_colour = "#FFFFFF"
+	table_icon_base = "alien"
diff --git a/code/modules/tables/tables.dm b/code/modules/tables/tables.dm
@@ -1,5 +1,7 @@
 var/list/table_icon_cache = list()
 
+// todo: refactor literally everything, this is atrocious, especially the icongen
+
 /obj/structure/table
 	name = "table frame"
 	icon = 'icons/obj/tables.dmi'

diff --git a/icons/obj/tables.dmi b/icons/obj/tables.dmi