Manually ports Virgo's #17646 (#10817)

code/modules/asset_cache/assets/tgui.dm

@@ -13,11 +13,14 @@
 	)
 
 // Let TGUI use all of our custom fonts
-/datum/asset/simple/tgui_extra_fonts
+/datum/asset/simple/namespaced/tgui_extra_fonts
-	keep_local_name = TRUE
 	assets = list(
 		"Grand9K_Pixel.ttf" = file("interface/fonts/Grand9K_Pixel.ttf"),
 		"Pixellari.ttf" = file("interface/fonts/Pixellari.ttf"),
 		"TinyUnicode.ttf" = file("interface/fonts/TinyUnicode.ttf"),
 		"VCR_OSD_Mono.ttf" = file("interface/fonts/VCR_OSD_Mono.ttf"),
 	)
+
+	parents = list(
+		"fonts.css" = file("interface/fonts/fonts.css"),
+	)

code/modules/tgui/tgui.dm

@@ -141,7 +141,7 @@
 	flush_queue |= window.send_asset(get_asset_datum(
 		/datum/asset/simple/namespaced/tgfont))
 	flush_queue |= window.send_asset(get_asset_datum(
-		/datum/asset/simple/tgui_extra_fonts))
+		/datum/asset/simple/namespaced/tgui_extra_fonts))
 	flush_queue |= window.send_asset(get_asset_datum(
 		/datum/asset/json/icon_ref_map))
 	for(var/datum/asset/asset in src_object.ui_assets(user))

interface/fonts/fonts.scss

@@ -2,40 +2,36 @@
  * All of these fonts are duplicated between interface/fonts and here because SCSS doesn't wanna play nice
  */
 
-// Grand9K Pixel
 @font-face {
   font-family: 'Grand9K Pixel';
-  src: url('Grand9K_Pixel.ttf');
+  src: url(Grand9K_Pixel.ttf);
 }
 
 .font-grand9k_pixel {
   font-family: 'Grand9K Pixel';
 }
 
-// Pixellari
 @font-face {
   font-family: 'Pixellari';
-  src: url('Pixellari.ttf');
+  src: url(Pixellari.ttf);
 }
 
 .font-pixellari {
   font-family: 'Pixellari';
 }
 
-// TinyUnicode
 @font-face {
   font-family: 'TinyUnicode';
-  src: url('TinyUnicode.ttf');
+  src: url(TinyUnicode.ttf);
 }
 
 .font-tinyunicode {
   font-family: 'TinyUnicode';
 }
 
-// VCR_OSD_Mono
 @font-face {
   font-family: 'VCR OSD Mono';
-  src: url('VCR_OSD_Mono.ttf');
+  src: url(VCR_OSD_Mono.ttf);
 }
 
 .font-vcr_osd_mono {

tgui/packages/tgui/styles/main.scss

@@ -17,7 +17,6 @@
 @include meta.load-css('./atomic/color.scss');
 @include meta.load-css('./atomic/debug-layout.scss');
 @include meta.load-css('./atomic/fit-text.scss');
-@include meta.load-css('./atomic/fonts.scss');
 @include meta.load-css('./atomic/links.scss');
 @include meta.load-css('./atomic/outline.scss');
 @include meta.load-css('./atomic/text.scss');

tgui/rspack.config-dev.cjs

@@ -65,16 +65,6 @@ module.exports = (env = {}, argv) => {
             },
             {
               loader: require.resolve('css-loader'),
-              options: {
-                url: {
-                  filter: (url, resourcePath) => {
-                    if (url.includes('.ttf')) {
-                      return false;
-                    }
-                    return true;
-                  },
-                },
-              },
             },
             {
               loader: require.resolve('sass-loader'),

tgui/rspack.config.cjs

@@ -72,18 +72,6 @@ module.exports = (env = {}, argv) => {
       },
     },
     module: {
-      parser: {
-        css: {
-          url: {
-            filter: (url, resourcePath) => {
-              if (url.includes('.ttf')) {
-                return false;
-              }
-              return true;
-            },
-          },
-        },
-      },
       rules: [
         {
           test: /\.([tj]s(x)?|cjs)$/,