diff --git a/Content.Packaging/ClientPackaging.cs b/Content.Packaging/ClientPackaging.cs index 6d0a462790..21215d3bcb 100644 --- a/Content.Packaging/ClientPackaging.cs +++ b/Content.Packaging/ClientPackaging.cs @@ -78,7 +78,11 @@ public static class ClientPackaging new[] { "Content.Client", "Content.Shared", "Content.Shared.Database" }, cancel: cancel); - await RobustClientPackaging.WriteClientResources(contentDir, inputPass, cancel); + await RobustClientPackaging.WriteClientResources( + contentDir, + inputPass, + SharedPackaging.AdditionalIgnoredResources, + cancel); inputPass.InjectFinished(); } diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs index a14a22ddee..a15dc7244f 100644 --- a/Content.Packaging/ServerPackaging.cs +++ b/Content.Packaging/ServerPackaging.cs @@ -217,7 +217,11 @@ public static class ServerPackaging contentAssemblies, cancel: cancel); - await RobustServerPackaging.WriteServerResources(contentDir, inputPassResources, ServerContentIgnoresResources, cancel); + await RobustServerPackaging.WriteServerResources( + contentDir, + inputPassResources, + ServerContentIgnoresResources.Concat(SharedPackaging.AdditionalIgnoredResources).ToHashSet(), + cancel); if (hybridAcz) { diff --git a/Content.Packaging/SharedPackaging.cs b/Content.Packaging/SharedPackaging.cs new file mode 100644 index 0000000000..5888845588 --- /dev/null +++ b/Content.Packaging/SharedPackaging.cs @@ -0,0 +1,10 @@ +namespace Content.Packaging; + +public sealed class SharedPackaging +{ + public static readonly IReadOnlySet AdditionalIgnoredResources = new HashSet + { + // MapRenderer outputs into Resources. Avoid these getting included in packaging. + "MapImages", + }; +}