Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
deltanedas committed Jan 1, 2025
2 parents e7170f5 + b0965ed commit 54dc8b9
Show file tree
Hide file tree
Showing 5,227 changed files with 4,208 additions and 3,073 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 8 additions & 9 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ Upstream is the [space-wizards/space-station-14](https://github.com/space-wizard

# Content specific to Delta-V

In general anything you create from scratch (not modifying something that exists from upstream) should go in a DeltaV subfolder.
In general anything you create from scratch (not modifying something that exists from upstream) should go in a DeltaV subfolder, `_DV`.

Examples:
- `Content.Server/DeltaV/Chapel/SacrificialAltarSystem.cs`
- `Resources/Prototypes/DeltaV/ai_factions.yml`
- `Resources/Audio/DeltaV/Items/gavel.ogg`
- `Resources/Textures/DeltaV/Icons/cri.rsi`
- `Resources/Locale/en-US/deltav/shipyard/shipyard-console.ftl`
The locale subfolder is lowercase `deltav` instead of `DeltaV`.
- `Resources/ServerInfo/Guidebook/DeltaV/AlertProcedure.xml`
Note that guidebooks go in `ServerInfo/Guidebook/DeltaV` and not `ServerInfo/DeltaV`!
- `Content.Server/_DV/Chapel/SacrificialAltarSystem.cs`
- `Resources/Prototypes/_DV/ai_factions.yml`
- `Resources/Audio/_DV/Items/gavel.ogg`
- `Resources/Textures/_DV/Icons/cri.rsi`
- `Resources/Locale/en-US/_DV/shipyard/shipyard-console.ftl`
- `Resources/ServerInfo/Guidebook/_DV/AlertProcedure.xml`
Note that guidebooks go in `ServerInfo/Guidebook/_DV` and not `ServerInfo/_DV`!

# Changes to upstream files

Expand Down
4 changes: 2 additions & 2 deletions Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Linq; // DeltaV
using Content.Client.DeltaV.CartridgeLoader.Cartridges; // DeltaV
using Content.Client._DV.CartridgeLoader.Cartridges; // DeltaV
using Content.Shared.CartridgeLoader.Cartridges;
using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
using Content.Shared._DV.CartridgeLoader.Cartridges; // DeltaV
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
Expand Down
8 changes: 0 additions & 8 deletions Content.Client/DeltaV/Implants/Radio/RadioImplantSystem.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/DeltaV/NanoChat/NanoChatSystem.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/DeltaV/Recruiter/RecruiterPenSystem.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/DeltaV/Shuttles/Systems/DockingConsoleSystem.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions Content.Client/DeltaV/Silicons/Laws/SlavedBorgSystem.cs
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Content.Client/Lathe/UI/LatheBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Content.Shared.DeltaV.Salvage; // DeltaV
using Content.Shared._DV.Salvage; // DeltaV
using Content.Shared.Lathe;
using Content.Shared.Research.Components;
using JetBrains.Annotations;
Expand Down
4 changes: 2 additions & 2 deletions Content.Client/Lathe/UI/LatheMenu.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Linq;
using System.Text;
using Content.Client.Materials;
using Content.Shared.DeltaV.Salvage.Components; // DeltaV
using Content.Shared.DeltaV.Salvage.Systems; // DeltaV
using Content.Shared._DV.Salvage.Components; // DeltaV
using Content.Shared._DV.Salvage.Systems; // DeltaV
using Content.Shared.Lathe;
using Content.Shared.Lathe.Prototypes;
using Content.Shared.Research.Prototypes;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Content.Shared.Abilities;
using Content.Shared.DeltaV.CCVars;
using Content.Shared._DV.CCVars;
using Robust.Client.Graphics;
using Robust.Shared.Configuration;
using Robust.Shared.Player;
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Options/UI/OptionsMenu.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<DefaultWindow xmlns="https://spacestation14.io"
xmlns:tabs="clr-namespace:Content.Client.Options.UI.Tabs"
xmlns:dtabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
xmlns:dtabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
Title="{Loc 'ui-options-title'}"
MinSize="800 450">
<TabContainer Name="Tabs" Access="Public">
Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Salvage/UI/SalvageMagnetBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Linq;
using Content.Client.Message;
using Content.Shared.DeltaV.Salvage.Systems; // DeltaV
using Content.Shared._DV.Salvage.Systems; // DeltaV
using Content.Shared.Salvage;
using Content.Shared.Salvage.Magnet;
using Robust.Client.Player; // DeltaV
Expand Down
6 changes: 3 additions & 3 deletions ...taV/AACTablet/UI/AACBoundUserInterface.cs → ..._DV/AACTablet/UI/AACBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Content.Shared.DeltaV.AACTablet;
using Content.Shared.DeltaV.QuickPhrase;
using Content.Shared._DV.AACTablet;
using Content.Shared._DV.QuickPhrase;
using Robust.Shared.Prototypes;

namespace Content.Client.DeltaV.AACTablet.UI;
namespace Content.Client._DV.AACTablet.UI;

public sealed class AACBoundUserInterface : BoundUserInterface
{
Expand Down
0 ...Client/DeltaV/AACTablet/UI/AACWindow.xaml → ...nt.Client/_DV/AACTablet/UI/AACWindow.xaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ent/DeltaV/AACTablet/UI/AACWindow.xaml.cs → ...Client/_DV/AACTablet/UI/AACWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using System.Linq;
using System.Numerics;
using Content.Client.UserInterface.Controls;
using Content.Shared.DeltaV.QuickPhrase;
using Content.Shared._DV.QuickPhrase;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;

namespace Content.Client.DeltaV.AACTablet.UI;
namespace Content.Client._DV.AACTablet.UI;

[GenerateTypedNameReferences]
public sealed partial class AACWindow : FancyWindow
Expand Down
4 changes: 2 additions & 2 deletions ...lities/Borgs/RandomizedCandyVisualizer.cs → ...lities/Borgs/RandomizedCandyVisualizer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Content.Shared.DeltaV.Abilities.Borgs;
using Content.Shared._DV.Abilities.Borgs;
using Robust.Client.GameObjects;

namespace Content.Client.DeltaV.Abilities.Borgs;
namespace Content.Client._DV.Abilities.Borgs;

/// <summary>
/// Responsible for coloring randomized candy.
Expand Down
4 changes: 2 additions & 2 deletions ...ltaV/Abilities/CrawlUnderObjectsSystem.cs → .../_DV/Abilities/CrawlUnderObjectsSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Shared.DeltaV.Abilities;
using Content.Shared._DV.Abilities;
using Content.Shared.Popups;
using Robust.Client.GameObjects;
using DrawDepth = Content.Shared.DrawDepth.DrawDepth;

namespace Content.Client.DeltaV.Abilities;
namespace Content.Client._DV.Abilities;

public sealed partial class HideUnderTableAbilitySystem : SharedCrawlUnderObjectsSystem
{
Expand Down
4 changes: 2 additions & 2 deletions ...ient/DeltaV/Addictions/AddictionSystem.cs → ....Client/_DV/Addictions/AddictionSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Content.Shared.DeltaV.Addictions;
using Content.Shared._DV.Addictions;

namespace Content.Client.DeltaV.Addictions;
namespace Content.Client._DV.Addictions;

public sealed class AddictionSystem : SharedAddictionSystem
{
Expand Down
2 changes: 1 addition & 1 deletion ...stration/UI/DepartmentWhitelistPanel.xaml → ...stration/UI/DepartmentWhitelistPanel.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<PanelContainer
xmlns="https://spacestation14.io"
xmlns:cc="clr-namespace:Content.Client.DeltaV.Administration.UI"
xmlns:cc="clr-namespace:Content.Client._DV.Administration.UI"
StyleClasses="BackgroundDark"
HorizontalExpand="True"
Margin="4">
Expand Down
2 changes: 1 addition & 1 deletion ...ation/UI/DepartmentWhitelistPanel.xaml.cs → ...ation/UI/DepartmentWhitelistPanel.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;

namespace Content.Client.DeltaV.Administration.UI;
namespace Content.Client._DV.Administration.UI;

[GenerateTypedNameReferences]
public sealed partial class DepartmentWhitelistPanel : PanelContainer
Expand Down
4 changes: 2 additions & 2 deletions ...taV/Administration/UI/JobWhitelistsEui.cs → ..._DV/Administration/UI/JobWhitelistsEui.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Content.Client.Eui;
using Content.Shared.DeltaV.Administration;
using Content.Shared._DV.Administration;
using Content.Shared.Eui;

namespace Content.Client.DeltaV.Administration.UI;
namespace Content.Client._DV.Administration.UI;

public sealed class JobWhitelistsEui : BaseEui
{
Expand Down
0 ...dministration/UI/JobWhitelistsWindow.xaml → ...dministration/UI/JobWhitelistsWindow.xaml
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...nistration/UI/JobWhitelistsWindow.xaml.cs → ...nistration/UI/JobWhitelistsWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
using Content.Client.UserInterface.Controls;
using Content.Shared.Database;
using Content.Shared.DeltaV.Administration;
using Content.Shared._DV.Administration;
using Content.Shared.Roles;
using Content.Shared.DeltaV.Whitelist;
using Content.Shared._DV.Whitelist;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;

namespace Content.Client.DeltaV.Administration.UI;
namespace Content.Client._DV.Administration.UI;

/// <summary>
/// An admin panel to toggle whitelists for individual jobs or entire departments.
Expand Down
4 changes: 2 additions & 2 deletions ...nt.Client/DeltaV/Biscuit/BiscuitSystem.cs → Content.Client/_DV/Biscuit/BiscuitSystem.cs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Content.Shared.DeltaV.Biscuit;
using Content.Shared._DV.Biscuit;
using Robust.Client.GameObjects;

namespace Content.Client.DeltaV.Biscuit;
namespace Content.Client._DV.Biscuit;

public sealed class BiscuitSystem : VisualizerSystem<BiscuitVisualsComponent>
{
Expand Down
2 changes: 1 addition & 1 deletion ...DeltaV/Biscuit/BiscuitVisualsComponent.cs → ...nt/_DV/Biscuit/BiscuitVisualsComponent.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Content.Client.DeltaV.Biscuit;
namespace Content.Client._DV.Biscuit;

[RegisterComponent]
public sealed partial class BiscuitVisualsComponent : Component
Expand Down
4 changes: 2 additions & 2 deletions ...rtridgeLoader/Cartridges/CrimeAssistUi.cs → ...rtridgeLoader/Cartridges/CrimeAssistUi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Robust.Client.UserInterface;
using Content.Client.UserInterface.Fragments;
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Content.Shared.CartridgeLoader;
using Robust.Shared.Prototypes;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

public sealed partial class CrimeAssistUi : UIFragment
{
Expand Down
2 changes: 1 addition & 1 deletion ...der/Cartridges/CrimeAssistUiFragment.xaml → ...der/Cartridges/CrimeAssistUiFragment.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<cartridges:CrimeAssistUiFragment xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
<cartridges:CrimeAssistUiFragment xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
xmlns="https://spacestation14.io" Margin="1 0 2 0">
<PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
<BoxContainer Name="ExplanationBox" Orientation="Vertical" MaxWidth="400" VerticalExpand="True" Margin="5">
Expand Down
6 changes: 3 additions & 3 deletions .../Cartridges/CrimeAssistUiFragment.xaml.cs → .../Cartridges/CrimeAssistUiFragment.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Content.Client.Message;
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
using static Content.Client.DeltaV.CartridgeLoader.Cartridges.CrimeAssistUi;
using static Content.Client._DV.CartridgeLoader.Cartridges.CrimeAssistUi;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class CrimeAssistUiFragment : BoxContainer
Expand Down
2 changes: 1 addition & 1 deletion ...artridgeLoader/Cartridges/MailMetricUi.cs → ...artridgeLoader/Cartridges/MailMetricUi.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Content.Client.UserInterface.Fragments;
using Content.Shared.CartridgeLoader.Cartridges;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

public sealed partial class MailMetricUi : UIFragment
{
Expand Down
2 changes: 1 addition & 1 deletion ...ader/Cartridges/MailMetricUiFragment.xaml → ...ader/Cartridges/MailMetricUiFragment.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<cartridges:MailMetricUiFragment
xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns="https://spacestation14.io"
Expand Down
2 changes: 1 addition & 1 deletion ...r/Cartridges/MailMetricUiFragment.xaml.cs → ...r/Cartridges/MailMetricUiFragment.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class MailMetricUiFragment : BoxContainer
Expand Down
0 ...ridgeLoader/Cartridges/NanoChatEntry.xaml → ...ridgeLoader/Cartridges/NanoChatEntry.xaml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...geLoader/Cartridges/NanoChatEntry.xaml.cs → ...geLoader/Cartridges/NanoChatEntry.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatEntry : BoxContainer
Expand Down
0 ...geLoader/Cartridges/NanoChatLogEntry.xaml → ...geLoader/Cartridges/NanoChatLogEntry.xaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...oader/Cartridges/NanoChatLogEntry.xaml.cs → ...oader/Cartridges/NanoChatLogEntry.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatLogEntry : BoxContainer
Expand Down
2 changes: 1 addition & 1 deletion ...der/Cartridges/NanoChatMessageBubble.xaml → ...der/Cartridges/NanoChatMessageBubble.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cartridges:NanoChatMessageBubble
xmlns="https://spacestation14.io"
xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
HorizontalExpand="True">

Expand Down
4 changes: 2 additions & 2 deletions .../Cartridges/NanoChatMessageBubble.xaml.cs → .../Cartridges/NanoChatMessageBubble.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.Graphics;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatMessageBubble : BoxContainer
Expand Down
4 changes: 2 additions & 2 deletions .../CartridgeLoader/Cartridges/NanoChatUi.cs → .../CartridgeLoader/Cartridges/NanoChatUi.cs
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Content.Client.UserInterface.Fragments;
using Content.Shared.CartridgeLoader;
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.UserInterface;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

public sealed partial class NanoChatUi : UIFragment
{
Expand Down
6 changes: 3 additions & 3 deletions ...Loader/Cartridges/NanoChatUiFragment.xaml → ...Loader/Cartridges/NanoChatUiFragment.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cartridges:NanoChatUiFragment
xmlns="https://spacestation14.io"
xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Orientation="Vertical"
Expand Down Expand Up @@ -53,12 +53,12 @@
<Control HorizontalExpand="True" VerticalExpand="True">
<TextureRect Name="BellIcon"
StyleClasses="ButtonSquare"
TexturePath="/Textures/DeltaV/Interface/VerbIcons/bell.svg.png"
TexturePath="/Textures/_DV/Interface/VerbIcons/bell.svg.png"
Stretch="KeepAspectCentered"
MinSize="18 18" />
<TextureRect Name="BellMutedIcon"
StyleClasses="ButtonSquare"
TexturePath="/Textures/DeltaV/Interface/VerbIcons/bell_muted.png"
TexturePath="/Textures/_DV/Interface/VerbIcons/bell_muted.png"
Stretch="KeepAspectCentered"
Visible="False"
MinSize="18 18" />
Expand Down
4 changes: 2 additions & 2 deletions ...der/Cartridges/NanoChatUiFragment.xaml.cs → ...der/Cartridges/NanoChatUiFragment.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System.Linq;
using System.Numerics;
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
using Content.Shared._DV.CartridgeLoader.Cartridges;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.XAML;
using Robust.Client.UserInterface;
using Robust.Shared.Timing;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NanoChatUiFragment : BoxContainer
Expand Down
0 ...tridgeLoader/Cartridges/NewChatPopup.xaml → ...tridgeLoader/Cartridges/NewChatPopup.xaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dgeLoader/Cartridges/NewChatPopup.xaml.cs → ...dgeLoader/Cartridges/NewChatPopup.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;

namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
namespace Content.Client._DV.CartridgeLoader.Cartridges;

[GenerateTypedNameReferences]
public sealed partial class NewChatPopup : DefaultWindow
Expand Down
Loading

0 comments on commit 54dc8b9

Please sign in to comment.