merge master
This commit is contained in:
commit
9ece272884
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
using Content.Shared.DeltaV.Implants.Radio;
|
||||
|
||||
namespace Content.Client.DeltaV.Implants.Radio;
|
||||
|
||||
/// <inheritdoc />
|
||||
public sealed class RadioImplantSystem : SharedRadioImplantSystem
|
||||
{
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
using Content.Shared.DeltaV.NanoChat;
|
||||
|
||||
namespace Content.Client.DeltaV.NanoChat;
|
||||
|
||||
public sealed class NanoChatSystem : SharedNanoChatSystem;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
using Content.Shared.DeltaV.Recruiter;
|
||||
|
||||
namespace Content.Client.DeltaV.Recruiter;
|
||||
|
||||
public sealed class RecruiterPenSystem : SharedRecruiterPenSystem;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
using Content.Shared.DeltaV.Shuttles.Systems;
|
||||
|
||||
namespace Content.Client.DeltaV.Shuttles.Systems;
|
||||
|
||||
public sealed class DockingConsoleSystem : SharedDockingConsoleSystem;
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
using Content.Shared.DeltaV.Silicons.Laws;
|
||||
|
||||
namespace Content.Client.DeltaV.Silicons.Laws;
|
||||
|
||||
public sealed class SlavedBorgSystem : SharedSlavedBorgSystem;
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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
|
||||
|
|
@ -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.
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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">
|
||||
|
|
@ -6,7 +6,7 @@ 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;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class DepartmentWhitelistPanel : PanelContainer
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
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;
|
||||
|
|
@ -10,7 +10,7 @@ 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.
|
||||
|
|
@ -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>
|
||||
{
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
namespace Content.Client.DeltaV.Biscuit;
|
||||
namespace Content.Client._DV.Biscuit;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class BiscuitVisualsComponent : Component
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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">
|
||||
|
|
@ -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
|
||||
|
|
@ -2,7 +2,7 @@ using Robust.Client.UserInterface;
|
|||
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
|
||||
{
|
||||
|
|
@ -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"
|
||||
|
|
@ -3,7 +3,7 @@ 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 MailMetricUiFragment : BoxContainer
|
||||
|
|
@ -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
|
||||
|
|
@ -2,7 +2,7 @@ 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 NanoChatLogEntry : BoxContainer
|
||||
|
|
@ -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">
|
||||
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
{
|
||||
|
|
@ -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"
|
||||
|
|
@ -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" />
|
||||
|
|
@ -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
|
||||
|
|
@ -3,7 +3,7 @@ using Robust.Client.AutoGenerated;
|
|||
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
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<cartridges:PriceHistoryTable
|
||||
xmlns="https://spacestation14.io"
|
||||
xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
|
||||
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
|
||||
Orientation="Vertical"
|
||||
HorizontalExpand="True"
|
||||
Margin="0,5,0,0">
|
||||
|
|
@ -4,7 +4,7 @@ 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 PriceHistoryTable : BoxContainer
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<BoxContainer 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"
|
||||
HorizontalExpand="True"
|
||||
VerticalExpand="True"
|
||||
|
|
@ -4,7 +4,7 @@ using Robust.Client.UserInterface;
|
|||
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 SecWatchEntryControl : BoxContainer
|
||||
|
|
@ -3,7 +3,7 @@ using Content.Shared.CartridgeLoader;
|
|||
using Content.Shared.CartridgeLoader.Cartridges;
|
||||
using Robust.Client.UserInterface;
|
||||
|
||||
namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
|
||||
namespace Content.Client._DV.CartridgeLoader.Cartridges;
|
||||
|
||||
public sealed partial class SecWatchUi : UIFragment
|
||||
{
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<cartridges:SecWatchUiFragment xmlns="https://spacestation14.io"
|
||||
xmlns:cartridges="clr-namespace:Content.Client.DeltaV.CartridgeLoader.Cartridges"
|
||||
xmlns:cartridges="clr-namespace:Content.Client._DV.CartridgeLoader.Cartridges"
|
||||
Margin="5"
|
||||
VerticalExpand="True">
|
||||
<BoxContainer Orientation="Vertical" HorizontalExpand="True" VerticalExpand="True">
|
||||
|
|
@ -3,7 +3,7 @@ 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 SecWatchUiFragment : BoxContainer
|
||||
|
|
@ -3,7 +3,7 @@ using Content.Client.UserInterface.Fragments;
|
|||
using Content.Shared.CartridgeLoader;
|
||||
using Content.Shared.CartridgeLoader.Cartridges;
|
||||
|
||||
namespace Content.Client.DeltaV.CartridgeLoader.Cartridges;
|
||||
namespace Content.Client._DV.CartridgeLoader.Cartridges;
|
||||
|
||||
public sealed partial class StockTradingUi : UIFragment
|
||||
{
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<cartridges:StockTradingUiFragment
|
||||
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"
|
||||
Margin="5"
|
||||
VerticalExpand="True">
|
||||
|
|
@ -6,7 +6,7 @@ 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 StockTradingUiFragment : BoxContainer
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
using Content.Shared.DeltaV.Chapel;
|
||||
using Content.Shared._DV.Chapel;
|
||||
|
||||
namespace Content.Client.DeltaV.Chapel;
|
||||
namespace Content.Client._DV.Chapel;
|
||||
|
||||
public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
namespace Content.Client.DeltaV.Harpy;
|
||||
namespace Content.Client._DV.Harpy;
|
||||
|
||||
[RegisterComponent]
|
||||
public sealed partial class HarpyVisualsComponent : Component
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
using Content.Shared.DeltaV.Hologram;
|
||||
using Content.Shared._DV.Hologram;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Client.Graphics;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.Hologram;
|
||||
namespace Content.Client._DV.Hologram;
|
||||
|
||||
public sealed class HologramSystem : SharedHologramSystem
|
||||
{
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
using Content.Shared._DV.Implants.Radio;
|
||||
|
||||
namespace Content.Client._DV.Implants.Radio;
|
||||
|
||||
/// <inheritdoc />
|
||||
public sealed class RadioImplantSystem : SharedRadioImplantSystem
|
||||
{
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using Content.Shared.DeltaV.Mail;
|
||||
using Content.Shared._DV.Mail;
|
||||
|
||||
namespace Content.Client.DeltaV.Mail
|
||||
namespace Content.Client._DV.Mail
|
||||
{
|
||||
[RegisterComponent]
|
||||
public sealed partial class MailComponent : SharedMailComponent
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
using Content.Shared.DeltaV.Mail;
|
||||
using Content.Shared._DV.Mail;
|
||||
using Content.Shared.StatusIcon;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.Mail;
|
||||
namespace Content.Client._DV.Mail;
|
||||
|
||||
/// <summary>
|
||||
/// Display a cool stamp on the parcel based on the job of the recipient.
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
using Content.Shared._DV.NanoChat;
|
||||
|
||||
namespace Content.Client._DV.NanoChat;
|
||||
|
||||
public sealed class NanoChatSystem : SharedNanoChatSystem;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<tabs:DeltaTab xmlns="https://spacestation14.io"
|
||||
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
|
||||
xmlns:tabs="clr-namespace:Content.Client.DeltaV.Options.UI.Tabs"
|
||||
xmlns:tabs="clr-namespace:Content.Client._DV.Options.UI.Tabs"
|
||||
xmlns:xNamespace="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:s="clr-namespace:Content.Client.Stylesheets"
|
||||
xmlns:ui="clr-namespace:Content.Client.Options.UI">
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
using Content.Shared.DeltaV.CCVars;
|
||||
using Content.Shared._DV.CCVars;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Configuration;
|
||||
|
||||
namespace Content.Client.DeltaV.Options.UI.Tabs;
|
||||
namespace Content.Client._DV.Options.UI.Tabs;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class DeltaTab : Control
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
using System.Numerics;
|
||||
using Content.Shared.DeltaV.Pain;
|
||||
using Content.Shared._DV.Pain;
|
||||
using Robust.Client.Graphics;
|
||||
using Robust.Client.Player;
|
||||
using Robust.Shared.Enums;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.Overlays;
|
||||
namespace Content.Client._DV.Overlays;
|
||||
|
||||
public sealed partial class PainOverlay : Overlay
|
||||
{
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
using Content.Shared.DeltaV.Pain;
|
||||
using Content.Shared._DV.Pain;
|
||||
using Robust.Client.Graphics;
|
||||
using Robust.Shared.Player;
|
||||
|
||||
namespace Content.Client.DeltaV.Overlays;
|
||||
namespace Content.Client._DV.Overlays;
|
||||
|
||||
public sealed partial class PainSystem : EntitySystem
|
||||
{
|
||||
|
|
@ -5,7 +5,7 @@ using Robust.Shared.Enums;
|
|||
using Robust.Shared.Prototypes;
|
||||
using Content.Shared.Abilities;
|
||||
|
||||
namespace Content.Client.DeltaV.Overlays;
|
||||
namespace Content.Client._DV.Overlays;
|
||||
|
||||
public sealed partial class UltraVisionOverlay : Overlay
|
||||
{
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
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;
|
||||
|
||||
namespace Content.Client.DeltaV.Overlays;
|
||||
namespace Content.Client._DV.Overlays;
|
||||
|
||||
public sealed partial class UltraVisionSystem : EntitySystem
|
||||
{
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
using Content.Shared._DV.Recruiter;
|
||||
|
||||
namespace Content.Client._DV.Recruiter;
|
||||
|
||||
public sealed class RecruiterPenSystem : SharedRecruiterPenSystem;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared.DeltaV.CCVars;
|
||||
using Content.Shared._DV.CCVars;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
|
|
@ -7,7 +7,7 @@ using Robust.Shared.Configuration;
|
|||
using Robust.Shared.Timing;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Client.DeltaV.RoundEnd;
|
||||
namespace Content.Client._DV.RoundEnd;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class NoEorgPopup : FancyWindow
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
using Content.Shared.GameTicking;
|
||||
using Content.Shared.DeltaV.CCVars;
|
||||
using Content.Shared._DV.CCVars;
|
||||
using Robust.Shared.Configuration;
|
||||
|
||||
namespace Content.Client.DeltaV.RoundEnd;
|
||||
namespace Content.Client._DV.RoundEnd;
|
||||
|
||||
public sealed class NoEorgPopupSystem : EntitySystem
|
||||
{
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
using Content.Shared._DV.Salvage;
|
||||
using Robust.Client.UserInterface;
|
||||
|
||||
namespace Content.Client._DV.Salvage.UI;
|
||||
|
||||
public sealed class MiningVoucherBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
[ViewVariables]
|
||||
private MiningVoucherMenu? _menu;
|
||||
|
||||
public MiningVoucherBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
|
||||
{
|
||||
}
|
||||
|
||||
protected override void Open()
|
||||
{
|
||||
base.Open();
|
||||
|
||||
_menu = this.CreateWindow<MiningVoucherMenu>();
|
||||
_menu.SetEntity(Owner);
|
||||
_menu.OnSelected += i =>
|
||||
{
|
||||
SendMessage(new MiningVoucherSelectMessage(i));
|
||||
Close();
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
<ui:RadialMenu xmlns="https://spacestation14.io"
|
||||
xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
|
||||
BackButtonStyleClass="RadialMenuBackButton"
|
||||
CloseButtonStyleClass="RadialMenuCloseButton"
|
||||
VerticalExpand="True"
|
||||
HorizontalExpand="True"
|
||||
MinSize="450 450">
|
||||
<!-- Populated in SetEntity -->
|
||||
<ui:RadialContainer Name="Main" VerticalExpand="True" HorizontalExpand="True" Radius="64"/>
|
||||
</ui:RadialMenu>
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared._DV.Salvage.Components;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Prototypes;
|
||||
using System.Numerics;
|
||||
|
||||
namespace Content.Client._DV.Salvage.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class MiningVoucherMenu : RadialMenu
|
||||
{
|
||||
[Dependency] private readonly IEntityManager _entMan = default!;
|
||||
[Dependency] private readonly IPrototypeManager _proto = default!;
|
||||
|
||||
private readonly SpriteSystem _sprite;
|
||||
|
||||
public event Action<int>? OnSelected;
|
||||
|
||||
public MiningVoucherMenu()
|
||||
{
|
||||
RobustXamlLoader.Load(this);
|
||||
IoCManager.InjectDependencies(this);
|
||||
|
||||
_sprite = _entMan.System<SpriteSystem>();
|
||||
}
|
||||
|
||||
public void SetEntity(EntityUid owner)
|
||||
{
|
||||
if (!_entMan.TryGetComponent<MiningVoucherComponent>(owner, out var comp))
|
||||
return;
|
||||
|
||||
for (int i = 0; i < comp.Kits.Count; i++)
|
||||
{
|
||||
var index = i; // copy so the closure doesn't borrow it
|
||||
var kit = _proto.Index(comp.Kits[i]);
|
||||
var button = new RadialMenuTextureButton()
|
||||
{
|
||||
StyleClasses = { "RadialMenuButton" },
|
||||
SetSize = new Vector2(64f, 64f),
|
||||
ToolTip = Loc.GetString(kit.Description)
|
||||
};
|
||||
button.AddChild(new TextureRect()
|
||||
{
|
||||
VerticalAlignment = VAlignment.Center,
|
||||
HorizontalAlignment = HAlignment.Center,
|
||||
Texture = _sprite.Frame0(kit.Sprite),
|
||||
TextureScale = new Vector2(2f, 2f)
|
||||
});
|
||||
|
||||
button.OnPressed += _ => OnSelected?.Invoke(index);
|
||||
|
||||
Main.AddChild(button);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@ using Robust.Client.GameObjects;
|
|||
using Robust.Client.Player;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.Shipyard.UI;
|
||||
namespace Content.Client._DV.Shipyard.UI;
|
||||
|
||||
public sealed class ShipyardConsoleBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
|
|
@ -10,7 +10,7 @@ using Robust.Client.UserInterface.Controls;
|
|||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.Shipyard.UI;
|
||||
namespace Content.Client._DV.Shipyard.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class ShipyardConsoleMenu : FancyWindow
|
||||
|
|
@ -5,7 +5,7 @@ using Robust.Client.UserInterface.CustomControls;
|
|||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Utility;
|
||||
|
||||
namespace Content.Client.DeltaV.Shipyard.UI;
|
||||
namespace Content.Client._DV.Shipyard.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class VesselRow : PanelContainer
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
using Content.Shared._DV.Shuttles.Systems;
|
||||
|
||||
namespace Content.Client._DV.Shuttles.Systems;
|
||||
|
||||
public sealed class DockingConsoleSystem : SharedDockingConsoleSystem;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using Content.Shared.DeltaV.Shuttles;
|
||||
using Content.Shared._DV.Shuttles;
|
||||
|
||||
namespace Content.Client.DeltaV.Shuttles.UI;
|
||||
namespace Content.Client._DV.Shuttles.UI;
|
||||
|
||||
public sealed class DockingConsoleBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared.Access.Systems;
|
||||
using Content.Shared.DeltaV.Shuttles;
|
||||
using Content.Shared.DeltaV.Shuttles.Components;
|
||||
using Content.Shared._DV.Shuttles;
|
||||
using Content.Shared._DV.Shuttles.Components;
|
||||
using Content.Shared.Shuttles.Systems;
|
||||
using Content.Shared.Timing;
|
||||
using Robust.Client.AutoGenerated;
|
||||
|
|
@ -10,7 +10,7 @@ using Robust.Client.Player;
|
|||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Client.DeltaV.Shuttles.UI;
|
||||
namespace Content.Client._DV.Shuttles.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class DockingConsoleWindow : FancyWindow
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
using Content.Shared._DV.Silicons.Laws;
|
||||
|
||||
namespace Content.Client._DV.Silicons.Laws;
|
||||
|
||||
public sealed class SlavedBorgSystem : SharedSlavedBorgSystem;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
using Content.Shared.DeltaV.TapeRecorder.Systems;
|
||||
using Content.Shared._DV.TapeRecorder.Systems;
|
||||
|
||||
namespace Content.Client.DeltaV.TapeRecorder;
|
||||
namespace Content.Client._DV.TapeRecorder;
|
||||
|
||||
/// <summary>
|
||||
/// Required for client side prediction stuff
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
using Content.Shared.DeltaV.TapeRecorder;
|
||||
using Content.Shared._DV.TapeRecorder;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Shared.Prototypes;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Client.DeltaV.TapeRecorder.UI;
|
||||
namespace Content.Client._DV.TapeRecorder.UI;
|
||||
|
||||
public sealed class TapeRecorderBoundUserInterface(EntityUid owner, Enum uiKey) : BoundUserInterface(owner, uiKey)
|
||||
{
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared.DeltaV.TapeRecorder;
|
||||
using Content.Shared.DeltaV.TapeRecorder.Components;
|
||||
using Content.Shared._DV.TapeRecorder;
|
||||
using Content.Shared._DV.TapeRecorder.Components;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Timing;
|
||||
|
||||
namespace Content.Client.DeltaV.TapeRecorder.UI;
|
||||
namespace Content.Client._DV.TapeRecorder.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class TapeRecorderWindow : FancyWindow
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
using Content.Shared.DeltaV.VendingMachines;
|
||||
using Content.Shared._DV.VendingMachines;
|
||||
using Content.Shared.VendingMachines;
|
||||
using Robust.Client.Animations;
|
||||
using Robust.Client.GameObjects;
|
||||
|
||||
namespace Content.Client.DeltaV.VendingMachines;
|
||||
namespace Content.Client._DV.VendingMachines;
|
||||
|
||||
public sealed class ShopVendorSystem : SharedShopVendorSystem
|
||||
{
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
using Content.Shared.DeltaV.VendingMachines;
|
||||
using Content.Shared._DV.VendingMachines;
|
||||
using Robust.Client.UserInterface;
|
||||
|
||||
namespace Content.Client.DeltaV.VendingMachines.UI;
|
||||
namespace Content.Client._DV.VendingMachines.UI;
|
||||
|
||||
public sealed class ShopVendorBoundUserInterface : BoundUserInterface
|
||||
{
|
||||
|
|
@ -3,7 +3,7 @@ using Robust.Client.UserInterface.Controls;
|
|||
using Robust.Client.UserInterface.XAML;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Client.DeltaV.VendingMachines.UI;
|
||||
namespace Content.Client._DV.VendingMachines.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class ShopVendorItem : BoxContainer
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
using Content.Client.UserInterface.Controls;
|
||||
using Content.Shared.DeltaV.VendingMachines;
|
||||
using Content.Shared._DV.VendingMachines;
|
||||
using Content.Shared.Stacks;
|
||||
using Robust.Client.AutoGenerated;
|
||||
using Robust.Client.Graphics;
|
||||
|
|
@ -11,7 +11,7 @@ using Robust.Shared.Prototypes;
|
|||
using Robust.Shared.Timing;
|
||||
using System.Numerics;
|
||||
|
||||
namespace Content.Client.DeltaV.VendingMachines.UI;
|
||||
namespace Content.Client._DV.VendingMachines.UI;
|
||||
|
||||
[GenerateTypedNameReferences]
|
||||
public sealed partial class ShopVendorWindow : FancyWindow
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
using System.Linq;
|
||||
using Content.Shared.DeltaV.CartridgeLoader.Cartridges;
|
||||
using Content.Shared._DV.CartridgeLoader.Cartridges;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Map;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
using Content.Server.DeltaV.Cloning;
|
||||
using Content.Server._DV.Cloning;
|
||||
using Content.Shared.Humanoid.Prototypes;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ namespace Content.IntegrationTests.Tests
|
|||
|
||||
private static readonly string[] Grids =
|
||||
{
|
||||
"/Maps/DeltaV/centcomm.yml",
|
||||
"/Maps/_DV/centcomm.yml",
|
||||
"/Maps/Shuttles/cargo.yml",
|
||||
"/Maps/Shuttles/emergency.yml",
|
||||
"/Maps/Shuttles/infiltrator.yml",
|
||||
|
|
@ -49,18 +49,18 @@ namespace Content.IntegrationTests.Tests
|
|||
"TestTeg",
|
||||
"CentComm",
|
||||
"MeteorArena",
|
||||
"Pebble", //DeltaV
|
||||
"Edge", //DeltaV
|
||||
"Shoukou", //DeltaV
|
||||
"Tortuga", //DeltaV
|
||||
"Arena", //DeltaV
|
||||
"Asterisk", //DeltaV
|
||||
"Glacier", //DeltaV
|
||||
"TheHive", //DeltaV
|
||||
"Hammurabi", //DeltaV
|
||||
"Lighthouse", //DeltaV
|
||||
"Micro", //DeltaV
|
||||
"Chibi" //DeltaV
|
||||
"Pebble", // DeltaV
|
||||
"Edge", // DeltaV
|
||||
"Shoukou", // DeltaV
|
||||
"Tortuga", // DeltaV
|
||||
"Arena", // DeltaV
|
||||
"Asterisk", // DeltaV
|
||||
"Glacier", // DeltaV
|
||||
"TheHive", // DeltaV
|
||||
"Hammurabi", // DeltaV
|
||||
"Lighthouse", // DeltaV
|
||||
"Micro", // DeltaV
|
||||
"Chibi" // DeltaV
|
||||
};
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ using Robust.Server.GameObjects;
|
|||
using Robust.Shared.Prototypes;
|
||||
using Content.Shared.Roles;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Content.Shared.DeltaV.NanoChat; // DeltaV
|
||||
using Content.Shared._DV.NanoChat; // DeltaV
|
||||
|
||||
namespace Content.Server.Access.Systems
|
||||
{
|
||||
|
|
|
|||
|
|
@ -412,7 +412,7 @@ public sealed class AdminSystem : EntitySystem
|
|||
_popup.PopupCoordinates(Loc.GetString("admin-erase-popup", ("user", name)), coordinates, PopupType.LargeCaution);
|
||||
var filter = Filter.Pvs(coordinates, 1, EntityManager, _playerManager);
|
||||
var audioParams = new AudioParams().WithVolume(3);
|
||||
_audio.PlayStatic("/Audio/DeltaV/Misc/reducedtoatmos.ogg", filter, coordinates, true, audioParams); // DeltaV
|
||||
_audio.PlayStatic("/Audio/_DV/Misc/reducedtoatmos.ogg", filter, coordinates, true, audioParams); // DeltaV
|
||||
}
|
||||
|
||||
foreach (var item in _inventory.GetHandOrInventoryEntities(entity))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
using Content.Shared.CartridgeLoader.Cartridges;
|
||||
using Content.Shared.DeltaV.CartridgeLoader.Cartridges; // DeltaV
|
||||
using Content.Shared._DV.CartridgeLoader.Cartridges; // DeltaV
|
||||
using Robust.Shared.Audio;
|
||||
|
||||
namespace Content.Server.CartridgeLoader.Cartridges;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ using Content.Shared.Access.Components;
|
|||
using Content.Shared.Audio;
|
||||
using Content.Shared.CartridgeLoader;
|
||||
using Content.Shared.CartridgeLoader.Cartridges;
|
||||
using Content.Shared.DeltaV.NanoChat; // DeltaV
|
||||
using Content.Shared._DV.NanoChat; // DeltaV
|
||||
using Content.Shared.Popups;
|
||||
using Robust.Shared.Audio.Systems;
|
||||
using Robust.Shared.Random;
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue