Compare commits

...
6 Commits
Author SHA1 Message Date
Delta-V bot dae1b83ae8 Automatic changelog update 2026-09-29 20:31:16 +02:00
b610bdca72 Content Warning popup (#5953)
* PORT: Content warnings from funkystation (#4373)

* Content warnings (#2922)

Co-authored-by: funkystationbot <funky@funkystation.org>

* lala

* fix: content warning should now display

* taydeo were these on purpose?

* victor hugo mary shelley oscar wilde frankenstein we didnt start the fire

---------

Co-authored-by: taydeo <tay@funkystation.org>
Co-authored-by: funkystationbot <funky@funkystation.org>

* cw size fix

* fixes and adjustments

* two byte ops

* no attribution allowed

* Update Content.Shared/_Funkystation/CCVars/CCVars.Funky.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>

* Update Content.Client/_Funkystation/ContentWarning/ContentWarningPopup.xaml.cs

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>

---------

Signed-off-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Co-authored-by: mq <113324899+mqole@users.noreply.github.com>
Co-authored-by: taydeo <tay@funkystation.org>
Co-authored-by: funkystationbot <funky@funkystation.org>
Co-authored-by: mqole <anactualpanacea@gmail.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2026-09-29 13:30:55 -05:00
Delta-V bot 0497749460 Automatic changelog update 2026-09-29 16:17:20 +02:00
Sir Warock 96512b8ecf Return Hunger Gain to Normal (#6548)
Insane hunger value desintegrated
2026-09-29 16:16:58 +02:00
Delta-V bot cac006d799 Automatic changelog update 2026-09-28 12:54:00 +02:00
AftrLite 5e02536f90 Resprite: Justice Airlocks (#6563)
initial commit
2026-09-28 12:53:33 +02:00
19 changed files with 206 additions and 24 deletions
@@ -0,0 +1,24 @@
<controls:FancyWindow xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc 'content-warning-title'}"
MinSize="700 750"
MaxSize="750 800"> <!-- DeltaV - increased maximum size -->
<BoxContainer Orientation="Vertical" Margin="20">
<Label Name="TitleLabel"
StyleClasses="LabelBig"
HorizontalAlignment="Center"
Margin="0 0 0 5"
Text="{Loc 'content-warning-label'}"/>
<PanelContainer Margin="0 0 0 10">
<RichTextLabel Name="ContentWarningBody" HorizontalAlignment="Center"/>
</PanelContainer>
<BoxContainer Orientation="Vertical" VerticalAlignment="Bottom" Margin="0 10 0 0">
<Button Name="ContentWarningAccept"
MinWidth="75"
Text="{ Loc 'content-warning-accept' }"/>
<Button Name="ContentWarningReject"
MinWidth="75"
Text="{ Loc 'content-warning-reject' }"/>
</BoxContainer>
</BoxContainer>
</controls:FancyWindow>
@@ -0,0 +1,40 @@
using Content.Client.UserInterface.Controls;
using Robust.Client.AutoGenerated;
using Robust.Client.Console;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;
using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Client._Funkystation.ContentWarning;
[GenerateTypedNameReferences]
public sealed partial class ContentWarningPopup : FancyWindow
{
public event Action? OnContentWarningAccept;
public event Action? OnContentWarningReject;
public ContentWarningPopup()
{
IoCManager.InjectDependencies(this);
RobustXamlLoader.Load(this);
InitWindow();
}
private void InitWindow()
{
ContentWarningBody.SetMessage(FormattedMessage.FromMarkupOrThrow(Loc.GetString("content-warning-message")));
ContentWarningReject.OnPressed += _ =>
{
OnContentWarningReject?.Invoke();
};
ContentWarningAccept.OnPressed += obj =>
{
OnContentWarningAccept?.Invoke();
};
}
}
@@ -0,0 +1,60 @@
using Content.Client.Gameplay;
using Content.Client.Lobby;
using Content.Shared._Funkystation.CCVars;
using JetBrains.Annotations;
using Robust.Client.Console;
using Robust.Client.UserInterface.Controllers;
using Robust.Shared.Configuration;
namespace Content.Client._Funkystation.ContentWarning;
[UsedImplicitly]
public sealed class ContentWarningUIController : UIController, IOnStateEntered<LobbyState>, IOnStateEntered<GameplayState>
{
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IClientConsoleHost _consoleHost = default!;
private ContentWarningPopup? _window;
private void AttemptOpenContentWarningPopup()
{
if (!_cfg.GetCVar(CCVars_Funky.ContentWarningDisplay) || _cfg.GetCVar(CCVars_Funky.ContentWarningAcknowledged))
return;
OpenContentWarningPopup();
}
public void OnStateEntered(LobbyState _)
{
AttemptOpenContentWarningPopup();
}
public void OnStateEntered(GameplayState _)
{
AttemptOpenContentWarningPopup();
}
private void OpenContentWarningPopup()
{
if (_window != null)
return;
_window = new ContentWarningPopup();
_window.OpenCentered();
_window.OnContentWarningReject += () =>
{
_window.Close();
_window = null;
if (_cfg.GetCVar(CCVars_Funky.ContentWarningKickOnIgnore))
_consoleHost.ExecuteCommand("quit");
};
_window.OnContentWarningAccept += () =>
{
_window.Close();
_window = null;
_cfg.SetCVar(CCVars_Funky.ContentWarningAcknowledged, true);
_cfg.SaveToFile();
};
}
}
@@ -34,7 +34,7 @@ public sealed partial class HungerComponent : Component
/// </summary>
/// <remarks>Any time this is modified, <see cref="HungerSystem.SetAuthoritativeHungerValue"/> should be called.</remarks>
[DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
public float BaseDecayRate = 0.035f; // DeltaV: changed from 0.01666666666f
public float BaseDecayRate = 0.01666666666f;
/// <summary>
/// The actual amount at which <see cref="LastAuthoritativeHungerValue"/> decays.
@@ -0,0 +1,33 @@
using Robust.Shared.Configuration;
namespace Content.Shared._Funkystation.CCVars;
[CVarDefs]
public sealed class CCVars_Funky
{
// imp start. Automatically disable content warnings in debug builds. // DeltaV - and tools, too
#if DEBUG || TOOLS
private static bool _cwOnBuildType;
#else
private static bool _cwOnBuildType = true;
#endif
// imp end
/// <summary>
/// If the content warning should be displayed.
/// </summary>
public static readonly CVarDef<bool> ContentWarningDisplay =
CVarDef.Create("cw.display", _cwOnBuildType, CVar.SERVER | CVar.REPLICATED); // imp. Automatically disable content warnings in debug builds.
/// <summary>
/// If ignoring the content warning should kick you from the server.
/// </summary>
public static readonly CVarDef<bool> ContentWarningKickOnIgnore =
CVarDef.Create("cw.kick", true, CVar.SERVER | CVar.REPLICATED);
/// <summary>
/// If the content warning popup was acknowledged.
/// </summary>
public static readonly CVarDef<bool> ContentWarningAcknowledged =
CVarDef.Create("cw.acknowledged.deltav", false, CVar.CLIENTONLY | CVar.ARCHIVE);
}
+22 -21
View File
@@ -1,25 +1,4 @@
Entries:
- author: jimbobby-the-FUCKING-first
changes:
- message: You can now saw off the forged shotgun.
type: Add
id: 2171
time: '2026-03-09T13:40:13.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/5120
- author: snowywinters
changes:
- message: Ammo fab can now make all types of ammo
type: Tweak
id: 2172
time: '2026-03-09T21:58:18.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/5476
- author: keekee38
changes:
- message: readded the elite suit to the traitor uplink!
type: Tweak
id: 2173
time: '2026-03-09T22:10:00.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/5459
- author: Coryler
changes:
- message: Toggleable Plant-Box Magnetism
@@ -4448,4 +4427,26 @@
id: 2671
time: '2026-09-25T20:46:48.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/6542
- author: AftrLite
changes:
- message: The justice airlocks have been resprited!
type: Tweak
id: 2672
time: '2026-09-28T10:53:34.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/6563
- author: SirWarock
changes:
- message: Slashed Hunger Gain rate in half, back to normal values!
type: Tweak
id: 2673
time: '2026-09-29T14:16:59.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/6548
- author: kotobdev
changes:
- message: A content warning popup will now appear upon joining the game for the
first time.
type: Add
id: 2674
time: '2026-09-29T18:30:56.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/5953
Order: 1
@@ -0,0 +1,24 @@
content-warning-title = Content Warning
content-warning-label = CONTENT WARNING: BEFORE YOU PLAY
content-warning-accept = I understand.
content-warning-reject = This is not the place for me.
# imp edits: replace mentions of funky with imp # DeltaV - replace mentions of imp with deltav
content-warning-message =
Space Station 14 is a game about surviving a disaster with incompetent and cruel people on a space station. The character you create will endure corporate terrorism, hostile interactions with shitty coworkers, and fates worse than death.
On Delta V, we enjoy telling stories where horrible things happen to ordinary people. With this in mind, we also believe in fully sharing what we consider to be triggering scenarios that may occur in-game.
Be advised that the following situations may happen without warning at any point in a round:
- You losing control of your character
- Violent crime
- Interrogations
- Being a victim to violent crime
- Your own character dying
- Witnessing others dying
- Brainwashing
- Body horror
- You playing someone elses character, or parts of your characters appearance changing
- Being framed for a crime that you did not do
If any of these make you uncomfortable, Delta V may not be the server for you. If you choose to play here anyway, do so with the assumption that these things will happen. Do not make a character who is a stand-in for yourself. Take steps to ensure a healthy separation between what is in-character and what is out-of-character. Understand that if you fail to do this, you may be asked to step away from the game.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 591 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 709 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord)",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by turtlemutt (Discord)",
"size": {
"x": 32,
"y": 32
Binary file not shown.

Before

Width:  |  Height:  |  Size: 760 B

After

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by Gray.",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and recolored by leonardo_dabepis (Discord). Modified by Gray. Modified by turtlemutt (Discord)",
"size": {
"x": 32,
"y": 32
Binary file not shown.

Before

Width:  |  Height:  |  Size: 426 B

After

Width:  |  Height:  |  Size: 388 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB