diff --git a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
index 5708b16cc11..25190e09413 100644
--- a/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
+++ b/Content.Shared/Silicons/Borgs/BorgTypePrototype.cs
@@ -13,7 +13,7 @@ namespace Content.Shared.Silicons.Borgs;
/// Information for a borg type that can be selected by .
///
///
-[Prototype]
+[Prototype(-5)] // DeltaV - force load after shaders
public sealed partial class BorgTypePrototype : IPrototype
{
[ValidatePrototypeId]
diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
index fef98ad16f3..a9d7ef4c038 100644
--- a/Resources/Changelog/DeltaVChangelog.yml
+++ b/Resources/Changelog/DeltaVChangelog.yml
@@ -1,10 +1,4 @@
Entries:
-- author: Colin-Tel
- changes:
- - message: Updated Asterisk Station.
- type: Tweak
- id: 214
- time: '2024-01-30T21:09:41.0000000+00:00'
- author: DebugOk
changes:
- message: You should be able to exit cryo even after leaving now, meaning it just
@@ -3777,3 +3771,11 @@
id: 713
time: '2024-11-28T12:04:17.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2301
+- author: Kr8art
+ changes:
+ - message: The nuke core container now displays an appropriate message when hasty
+ syndicate agents try to insert the nuke core while it is still closed!
+ type: Fix
+ id: 714
+ time: '2024-11-28T19:36:26.0000000+00:00'
+ url: https://github.com/DeltaV-Station/Delta-v/pull/2309
diff --git a/Resources/Locale/en-US/nuke/nuke-core-container.ftl b/Resources/Locale/en-US/nuke/nuke-core-container.ftl
index 47ea15a8316..bbed978bd7e 100644
--- a/Resources/Locale/en-US/nuke/nuke-core-container.ftl
+++ b/Resources/Locale/en-US/nuke/nuke-core-container.ftl
@@ -1,2 +1,3 @@
nuke-core-container-whitelist-fail-popup = That doesn't fit into the container.
nuke-core-container-sealed-popup = The {$container} is sealed shut!
+nuke-core-container-closed-fail-popup = You need to open the container first!
diff --git a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml b/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
index 67910888871..bd2a0d871a9 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/plutonium_core.yml
@@ -47,6 +47,7 @@
whitelist:
tags:
- PlutoniumCore
+ lockedFailPopup: nuke-core-container-closed-fail-popup
whitelistFailPopup: nuke-core-container-whitelist-fail-popup
- type: GenericVisualizer
visuals: