Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

some tweaks (#26)

Browse Source 
* - 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
This commit is contained in:
Aviu00
2024-02-04 15:53:50 +09:00
committed by GitHub
parent 23b6c11b4f
commit bc55584a1f
10 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Audio/BackgroundAudioSystem.cs
View File

@@ -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;

6
Content.Client/Lobby/UI/LobbyGui.xaml
View File

@@ -90,6 +90,12 @@
Name="OptionsButton"
Access="Public"
ButtonText="Options"
Margin="0 10 0 10" />
<buttons:OhioLobbyTextButton
Name="QuitButton"
Access="Public"
ButtonText="Quit"
Margin="0 10 0 0" />
</BoxContainer>

3
Content.Client/Lobby/UI/LobbyGui.xaml.cs
View File

@@ -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<OptionsUIController>().ToggleWindow();
QuitButton.OnPressed += _ => _consoleHost.ExecuteCommand("disconnect");
}
public void SwitchState(LobbyGuiState state)

3
Content.Server/GameTicking/GameTicker.RoundFlow.cs
View File

@@ -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)

28
Resources/Prototypes/Catalog/Fills/Items/gas_tanks.yml
View File

@@ -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

10
Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
View File

@@ -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:

2
Resources/Prototypes/Entities/Mobs/base.yml
View File

@@ -72,7 +72,7 @@
actions:
Critical:
- ActionCritSuccumb
#- ActionCritFakeDeath
- ActionCritFakeDeath
- ActionCritLastWords
- type: Deathgasp
- type: HealthExaminable

1
Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
View File

@@ -14,6 +14,7 @@
slots:
- Belt
- type: Gun
resetOnHandSelected: false
fireRate: 0.3
soundGunshot:
path: /Audio/Weapons/click.ogg

6
Resources/Prototypes/Objectives/changeling.yml
View File

@@ -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

4
Resources/Prototypes/Objectives/traitor.yml
View File

@@ -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