From bc55584a1feeecd20d41a9958467130c6b702b3f Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Sun, 4 Feb 2024 15:53:50 +0900
Subject: [PATCH] some tweaks (#26)
* - fix: Fix RD steal objectives
* - tweak: Mini ebow now doesn't reset on hand select
* - add: Enable fake death
* - fix: Fix round restart sounds
* - tweak: Increase new gas tank volume
* - add: Add quit button
---
Content.Client/Audio/BackgroundAudioSystem.cs | 2 +-
Content.Client/Lobby/UI/LobbyGui.xaml | 6 ++++
Content.Client/Lobby/UI/LobbyGui.xaml.cs | 3 ++
.../GameTicking/GameTicker.RoundFlow.cs | 3 --
.../Catalog/Fills/Items/gas_tanks.yml | 28 +++++++++----------
.../Prototypes/Entities/Mobs/NPCs/animals.yml | 10 +++----
Resources/Prototypes/Entities/Mobs/base.yml | 2 +-
.../Objects/Weapons/Guns/mini_ebow.yml | 1 +
.../Prototypes/Objectives/changeling.yml | 6 +++-
Resources/Prototypes/Objectives/traitor.yml | 4 +++
10 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/Content.Client/Audio/BackgroundAudioSystem.cs b/Content.Client/Audio/BackgroundAudioSystem.cs
index 27b2dcb1b7..dee2a21ea3 100644
--- a/Content.Client/Audio/BackgroundAudioSystem.cs
+++ b/Content.Client/Audio/BackgroundAudioSystem.cs
@@ -135,7 +135,7 @@ public sealed class BackgroundAudioSystem : EntitySystem
private void PlayRestartSound(RoundRestartCleanupEvent ev)
{
- if (!_configManager.GetCVar(CCVars.LobbyMusicEnabled))
+ if (!_configManager.GetCVar(CCVars.RestartSoundsEnabled))
return;
var file = _gameTicker.RestartSound;
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 49f57c4945..a301bf39fb 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -90,6 +90,12 @@
Name="OptionsButton"
Access="Public"
ButtonText="Options"
+ Margin="0 10 0 10" />
+
+
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml.cs b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
index 157fd055c5..8e54c3a8d7 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml.cs
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml.cs
@@ -1,5 +1,6 @@
using Content.Client.UserInterface.Systems.EscapeMenu;
using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
@@ -8,6 +9,7 @@ namespace Content.Client.Lobby.UI
[GenerateTypedNameReferences]
internal sealed partial class LobbyGui : UIScreen
{
+ [Dependency] private readonly IClientConsoleHost _consoleHost = default!;
[Dependency] private readonly IUserInterfaceManager _userInterfaceManager = default!;
public LobbyGui()
@@ -18,6 +20,7 @@ namespace Content.Client.Lobby.UI
SetAnchorPreset(Background, LayoutPreset.Wide);
OptionsButton.OnPressed += _ => _userInterfaceManager.GetUIController().ToggleWindow();
+ QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
}
public void SwitchState(LobbyGuiState state)
diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index 7d97c206ed..9b7be0f635 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -568,9 +568,6 @@ namespace Content.Server.GameTicking
{
_playerGameStatuses[session.UserId] = LobbyEnabled ? PlayerGameStatus.NotReadyToPlay : PlayerGameStatus.ReadyToPlay;
}
-
- // Put a bangin' donk on it.
- _audio.PlayGlobal(_audio.GetSound(new SoundCollectionSpecifier("RoundEnd")), Filter.Broadcast(), true);
}
public bool DelayStart(TimeSpan time)
diff --git a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
index 72274e10b6..f098448dd2 100644
--- a/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
@@ -63,11 +63,11 @@
- type: GasTank
outputPressure: 21.3
air:
- # 4 minutes
- volume: 0.66
+ # 13 minutes
+ volume: 2
moles:
- 0 # oxygen
- - 0.270782035 # nitrogen
+ - 0.820551629 # nitrogen
temperature: 293.15
@@ -93,11 +93,11 @@
- type: GasTank
outputPressure: 21.3
air:
- # 9 minutes
- volume: 1.5
+ # 38 minutes
+ volume: 6
moles:
- 0 # oxygen
- - 0.615413715 # nitrogen
+ - 2.461654887 # nitrogen
temperature: 293.15
@@ -123,11 +123,11 @@
- type: GasTank
outputPressure: 21.3
air:
- # 15 minutes
- volume: 2.5
+ # 63 minutes
+ volume: 10
moles:
- 0 # oxygen
- - 1.025689525 # nitrogen
+ - 4.102758145 # nitrogen
temperature: 293.15
- type: entity
@@ -138,18 +138,18 @@
- type: GasTank
outputPressure: 22.4
air:
- # 4 minutes
- volume: 0.66
+ # 13 minutes
+ volume: 2
moles:
- - 0.270782035 # 95% oxygen
+ - 0.779524047 # 95% oxygen
- 0 # nitrogen
- 0 # CO2
- 0 # plasma
- 0 # tritium
- 0 # water vapor
- 0 # ammonia
- - 0.014251686 # 5% N2O
- # 0.285033721 total
+ - 0.041027581 # 5% N2O
+ # 0.820551628 total
temperature: 293.15
- type: entity
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 50544837fb..d045cbe019 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -234,7 +234,7 @@
- type: NpcFactionMember
factions:
- Passive
-
+
- type: entity
parent: MobChicken
id: MobChicken1
@@ -259,7 +259,7 @@
Base: dead-1
Dead:
Base: dead-1
-
+
- type: entity
parent: MobChicken
id: MobChicken2
@@ -1301,7 +1301,7 @@
- type: GhostTakeoverAvailable
- type: Loadout
prototypes: [SyndicateOperativeGearMonkey]
-
+
- type: entity
id: MobMonkeySyndicateAgent
parent: MobBaseSyndicateMonkey
@@ -1506,7 +1506,7 @@
actions:
Critical:
- ActionCritSuccumb
- #- ActionCritFakeDeath
+ - ActionCritFakeDeath
- ActionCritLastWords
- type: MobThresholds
thresholds:
@@ -2955,7 +2955,7 @@
actions:
Critical:
- ActionCritSuccumb
- #- ActionCritFakeDeath
+ - ActionCritFakeDeath
- ActionCritLastWords
- type: MobThresholds
thresholds:
diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
index e79218a006..c335f731e3 100644
--- a/Resources/Prototypes/Entities/Mobs/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -72,7 +72,7 @@
actions:
Critical:
- ActionCritSuccumb
- #- ActionCritFakeDeath
+ - ActionCritFakeDeath
- ActionCritLastWords
- type: Deathgasp
- type: HealthExaminable
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
index 971abba2bf..aaadbb7aa5 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
@@ -14,6 +14,7 @@
slots:
- Belt
- type: Gun
+ resetOnHandSelected: false
fireRate: 0.3
soundGunshot:
path: /Audio/Weapons/click.ogg
diff --git a/Resources/Prototypes/Objectives/changeling.yml b/Resources/Prototypes/Objectives/changeling.yml
index 17c9b02ef4..965ad84510 100644
--- a/Resources/Prototypes/Objectives/changeling.yml
+++ b/Resources/Prototypes/Objectives/changeling.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
abstract: true
parent: BaseObjective
id: BaseChangelingObjective
@@ -99,6 +99,8 @@
parent: BaseChangelingStealObjective
id: RDHardsuitStealObjectiveCh
components:
+ - type: NotJobRequirement
+ job: ResearchDirector
- type: StealCondition
stealGroup: ClothingOuterHardsuitRd
owner: job-name-rd
@@ -108,6 +110,8 @@
parent: BaseChangelingStealObjective
id: HandTeleporterStealObjectiveCh
components:
+ - type: NotJobRequirement
+ job: ResearchDirector
- type: StealCondition
stealGroup: HandTeleporter
owner: job-name-rd
diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml
index cf0f552577..a13c11b989 100644
--- a/Resources/Prototypes/Objectives/traitor.yml
+++ b/Resources/Prototypes/Objectives/traitor.yml
@@ -164,6 +164,8 @@
parent: BaseTraitorStealObjective
id: RDHardsuitStealObjective
components:
+ - type: NotJobRequirement
+ job: ResearchDirector
- type: StealCondition
stealGroup: ClothingOuterHardsuitRd
owner: job-name-rd
@@ -173,6 +175,8 @@
parent: BaseTraitorStealObjective
id: HandTeleporterStealObjective
components:
+ - type: NotJobRequirement
+ job: ResearchDirector
- type: StealCondition
stealGroup: HandTeleporter
owner: job-name-rd