From edf766103117132baeb12a1fbbf8150164f330c4 Mon Sep 17 00:00:00 2001
From: null <56081759+NullWanderer@users.noreply.github.com>
Date: Sat, 18 May 2024 13:26:23 +0200
Subject: [PATCH 001/215] Revert "Temporary CI/CD fix (#1199)"
This reverts commit 7e3ba621d325db4d838c4d0fb675b5173f3111df.
---
.github/workflows/build-map-renderer.yml | 2 +-
.github/workflows/build-test-debug.yml | 2 +-
.github/workflows/publish.yml | 2 +-
.github/workflows/test-packaging.yml | 2 +-
.github/workflows/yaml-linter.yml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build-map-renderer.yml b/.github/workflows/build-map-renderer.yml
index e16d951cfae..01575f64b9b 100644
--- a/.github/workflows/build-map-renderer.yml
+++ b/.github/workflows/build-map-renderer.yml
@@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
with:
- dotnet-version: 8.0.100
+ dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore
diff --git a/.github/workflows/build-test-debug.yml b/.github/workflows/build-test-debug.yml
index 70dc7d3b11c..519f5af6f49 100644
--- a/.github/workflows/build-test-debug.yml
+++ b/.github/workflows/build-test-debug.yml
@@ -36,7 +36,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
with:
- dotnet-version: 8.0.100
+ dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 177e6a0fe6d..74a975be5c6 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -22,7 +22,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
with:
- dotnet-version: 8.0.100
+ dotnet-version: 8.0.x
- name: Get Engine Tag
run: |
diff --git a/.github/workflows/test-packaging.yml b/.github/workflows/test-packaging.yml
index 745f8c092c4..ccece69adb6 100644
--- a/.github/workflows/test-packaging.yml
+++ b/.github/workflows/test-packaging.yml
@@ -51,7 +51,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
with:
- dotnet-version: 8.0.100
+ dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore
diff --git a/.github/workflows/yaml-linter.yml b/.github/workflows/yaml-linter.yml
index d24991ec963..796795b234d 100644
--- a/.github/workflows/yaml-linter.yml
+++ b/.github/workflows/yaml-linter.yml
@@ -26,7 +26,7 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v3.2.0
with:
- dotnet-version: 8.0.100
+ dotnet-version: 8.0.x
- name: Install dependencies
run: dotnet restore
- name: Build
From 0edbdd1f808af7400588a0d6ab992c020e54decf Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Tue, 7 May 2024 06:02:22 +0300
Subject: [PATCH 002/215] Night on Europa (#27731)
night
---
Content.Server/Parallax/BiomeSystem.cs | 4 ++--
Content.Server/Station/Components/StationBiomeComponent.cs | 3 +++
Content.Server/Station/Systems/StationBiomeSystem.cs | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs
index 83cf9b9cb2d..0543518dcc9 100644
--- a/Content.Server/Parallax/BiomeSystem.cs
+++ b/Content.Server/Parallax/BiomeSystem.cs
@@ -973,7 +973,7 @@ private void UnloadChunk(BiomeComponent component, EntityUid gridUid, MapGridCom
///
/// Creates a simple planet setup for a map.
///
- public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate, int? seed = null, MetaDataComponent? metadata = null)
+ public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate, int? seed = null, MetaDataComponent? metadata = null, Color? mapLight = null)
{
if (!Resolve(mapUid, ref metadata))
return;
@@ -998,7 +998,7 @@ public void EnsurePlanet(EntityUid mapUid, BiomeTemplatePrototype biomeTemplate,
// Lava: #A34931
var light = EnsureComp(mapUid);
- light.AmbientLightColor = Color.FromHex("#D8B059");
+ light.AmbientLightColor = mapLight ?? Color.FromHex("#D8B059");
Dirty(mapUid, light, metadata);
var moles = new float[Atmospherics.AdjustedNumberOfGases];
diff --git a/Content.Server/Station/Components/StationBiomeComponent.cs b/Content.Server/Station/Components/StationBiomeComponent.cs
index 38800579a93..0eb64aaff80 100644
--- a/Content.Server/Station/Components/StationBiomeComponent.cs
+++ b/Content.Server/Station/Components/StationBiomeComponent.cs
@@ -16,4 +16,7 @@ public sealed partial class StationBiomeComponent : Component
// If null, its random
[DataField]
public int? Seed = null;
+
+ [DataField]
+ public Color MapLightColor = Color.Black;
}
diff --git a/Content.Server/Station/Systems/StationBiomeSystem.cs b/Content.Server/Station/Systems/StationBiomeSystem.cs
index 821745fc4d7..8c80806ccf5 100644
--- a/Content.Server/Station/Systems/StationBiomeSystem.cs
+++ b/Content.Server/Station/Systems/StationBiomeSystem.cs
@@ -30,6 +30,6 @@ private void OnStationPostInit(Entity map, ref StationPos
var mapId = Transform(station.Value).MapID;
var mapUid = _mapManager.GetMapEntityId(mapId);
- _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed);
+ _biome.EnsurePlanet(mapUid, _proto.Index(map.Comp.Biome), map.Comp.Seed, mapLight: map.Comp.MapLightColor);
}
}
From 6d4841701228d99a53066c392a51105992a83176 Mon Sep 17 00:00:00 2001
From: Kara
Date: Tue, 7 May 2024 05:23:50 +0200
Subject: [PATCH 003/215] Reduce ratking chance severely (#27760)
---
Resources/Prototypes/GameRules/events.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml
index 7b4f421f853..0f46a54b368 100644
--- a/Resources/Prototypes/GameRules/events.yml
+++ b/Resources/Prototypes/GameRules/events.yml
@@ -200,10 +200,11 @@
- id: MobMouse2
prob: 0.02
# DeltaV - Rat King spawns under MidRoundAntag - Comment out Rat King from spawning with MouseMigration gamerule
- # specialEntries:
- # - id: SpawnPointGhostRatKing
- # prob: 0.005
- # End of modified code
+# - id: MobMouseCancer
+# prob: 0.001
+# specialEntries:
+# - id: SpawnPointGhostRatKing
+# prob: 0.001
- type: entity
id: CockroachMigration
From 5ba6cbf65d670ed2827546b82ea5e71b11dac883 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 03:25:14 +0000
Subject: [PATCH 004/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 47d361f0aea..f6691435281 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
Entries:
-- author: Zadeon
- changes:
- - message: Added salt as a new type of ore that can be mined from asteroids. Salt
- can be ground up for its base components.
- type: Add
- id: 6043
- time: '2024-02-26T23:34:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25324
- author: juliangiebel
changes:
- message: The mass media consoles UI got overhauled
@@ -3858,3 +3850,10 @@
id: 6542
time: '2024-05-07T01:48:16.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/26629
+- author: mirrorcult
+ changes:
+ - message: Less ratkings should spawn during the mouse migration event now
+ type: Tweak
+ id: 6543
+ time: '2024-05-07T03:23:50.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27760
From 8689c7f90d0441e89846db98aca56f785fb25229 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers
Date: Tue, 7 May 2024 06:21:03 +0200
Subject: [PATCH 005/215] Fix preference loading bugs (#27742)
First bug: if an error occured during pref loading code, it would fail. If the person then readied up, it would likely cause the round to fail to start.
Why could they ready up? The code only checks that the prefs finished loading, not that they finished loading *successfully*. Whoops.
Anyways, now people get kicked if their prefs fail to load. And I improved the error handling.
Second bug: if a user disconnected while their prefs were loading, it would cause an exception. This exception would go unobserved on lobby servers or raise through gameticker on non-lobby servers.
This happened even on a live server once and then triggered the first bug, but idk how.
Fixed this by properly plumbing through cancellation into the preferences loading code. The stuff is now cancelled properly.
Third bug: if somebody has a loadout item with a playtime requirement active, load-time sanitization of player prefs could run into a race condition because the sanitization can happen *before* play time was loaded.
Fixed by moving pref sanitizations to a later stage in the load process.
---
Content.Server/Database/ServerDbBase.cs | 34 +++++-----
Content.Server/Database/ServerDbManager.cs | 24 ++++---
Content.Server/Database/ServerDbPostgres.cs | 14 +++--
Content.Server/Database/ServerDbSqlite.cs | 20 +++---
Content.Server/Database/UserDbDataManager.cs | 62 +++++++++++++++++--
.../GameTicking/GameTicker.Player.cs | 24 ++++++-
.../PlayTimeTrackingManager.cs | 2 +-
.../Managers/IServerPreferencesManager.cs | 1 +
.../Managers/ServerPreferencesManager.cs | 28 ++++++---
9 files changed, 155 insertions(+), 54 deletions(-)
diff --git a/Content.Server/Database/ServerDbBase.cs b/Content.Server/Database/ServerDbBase.cs
index 9d40d9400f3..12d220512b7 100644
--- a/Content.Server/Database/ServerDbBase.cs
+++ b/Content.Server/Database/ServerDbBase.cs
@@ -33,9 +33,11 @@ public ServerDbBase(ISawmill opsLog)
}
#region Preferences
- public async Task GetPlayerPreferencesAsync(NetUserId userId)
+ public async Task GetPlayerPreferencesAsync(
+ NetUserId userId,
+ CancellationToken cancel = default)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
var prefs = await db.DbContext
.Preference
@@ -47,7 +49,7 @@ public ServerDbBase(ISawmill opsLog)
.ThenInclude(l => l.Groups)
.ThenInclude(group => group.Loadouts)
.AsSingleQuery()
- .SingleOrDefaultAsync(p => p.UserId == userId.UserId);
+ .SingleOrDefaultAsync(p => p.UserId == userId.UserId, cancel);
if (prefs is null)
return null;
@@ -515,13 +517,13 @@ public async Task EditServerRoleBan(int id, string reason, NoteSeverity severity
#endregion
#region Playtime
- public async Task> GetPlayTimes(Guid player)
+ public async Task> GetPlayTimes(Guid player, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
return await db.DbContext.PlayTime
.Where(p => p.PlayerId == player)
- .ToListAsync();
+ .ToListAsync(cancel);
}
public async Task UpdatePlayTimes(IReadOnlyCollection updates)
@@ -673,7 +675,7 @@ public async Task AddServerBanHitsAsync(int connection, IEnumerable GetAdminDataForAsync(NetUserId userId, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
return await db.DbContext.Admin
.Include(p => p.Flags)
@@ -688,7 +690,7 @@ public async Task AddServerBanHitsAsync(int connection, IEnumerable GetAdminRankDataForAsync(int id, CancellationToken cancel = default)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
return await db.DbContext.AdminRank
.Include(r => r.Flags)
@@ -697,7 +699,7 @@ public async Task AddServerBanHitsAsync(int connection, IEnumerable a.UserId == userId.UserId, cancel);
db.DbContext.Admin.Remove(admin);
@@ -707,7 +709,7 @@ public async Task RemoveAdminAsync(NetUserId userId, CancellationToken cancel)
public async Task AddAdminAsync(Admin admin, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
db.DbContext.Admin.Add(admin);
@@ -716,7 +718,7 @@ public async Task AddAdminAsync(Admin admin, CancellationToken cancel)
public async Task UpdateAdminAsync(Admin admin, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
var existing = await db.DbContext.Admin.Include(a => a.Flags).SingleAsync(a => a.UserId == admin.UserId, cancel);
existing.Flags = admin.Flags;
@@ -728,7 +730,7 @@ public async Task UpdateAdminAsync(Admin admin, CancellationToken cancel)
public async Task RemoveAdminRankAsync(int rankId, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
var admin = await db.DbContext.AdminRank.SingleAsync(a => a.Id == rankId, cancel);
db.DbContext.AdminRank.Remove(admin);
@@ -738,7 +740,7 @@ public async Task RemoveAdminRankAsync(int rankId, CancellationToken cancel)
public async Task AddAdminRankAsync(AdminRank rank, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
db.DbContext.AdminRank.Add(rank);
@@ -811,7 +813,7 @@ INSERT INTO player_round (players_id, rounds_id) VALUES ({players[player]}, {id}
public async Task UpdateAdminRankAsync(AdminRank rank, CancellationToken cancel)
{
- await using var db = await GetDb();
+ await using var db = await GetDb(cancel);
var existing = await db.DbContext.AdminRank
.Include(r => r.Flags)
@@ -1594,7 +1596,9 @@ public async Task HasPendingModelChanges()
return db.DbContext.Database.HasPendingModelChanges();
}
- protected abstract Task GetDb([CallerMemberName] string? name = null);
+ protected abstract Task GetDb(
+ CancellationToken cancel = default,
+ [CallerMemberName] string? name = null);
protected void LogDbOp(string? name)
{
diff --git a/Content.Server/Database/ServerDbManager.cs b/Content.Server/Database/ServerDbManager.cs
index 554dd307437..01d15267274 100644
--- a/Content.Server/Database/ServerDbManager.cs
+++ b/Content.Server/Database/ServerDbManager.cs
@@ -29,7 +29,11 @@ public interface IServerDbManager
void Shutdown();
#region Preferences
- Task InitPrefsAsync(NetUserId userId, ICharacterProfile defaultProfile);
+ Task InitPrefsAsync(
+ NetUserId userId,
+ ICharacterProfile defaultProfile,
+ CancellationToken cancel);
+
Task SaveSelectedCharacterIndexAsync(NetUserId userId, int index);
Task SaveCharacterSlotAsync(NetUserId userId, ICharacterProfile? profile, int slot);
@@ -38,7 +42,7 @@ public interface IServerDbManager
// Single method for two operations for transaction.
Task DeleteSlotAndSetSelectedIndex(NetUserId userId, int deleteSlot, int newSlot);
- Task GetPlayerPreferencesAsync(NetUserId userId);
+ Task GetPlayerPreferencesAsync(NetUserId userId, CancellationToken cancel);
#endregion
#region User Ids
@@ -157,8 +161,9 @@ public Task EditServerRoleBan(
/// Look up a player's role timers.
///
/// The player to get the role timer information from.
+ ///
/// All role timers belonging to the player.
- Task> GetPlayTimes(Guid player);
+ Task> GetPlayTimes(Guid player, CancellationToken cancel = default);
///
/// Update play time information in bulk.
@@ -346,7 +351,10 @@ public void Shutdown()
_sqliteInMemoryConnection?.Dispose();
}
- public Task InitPrefsAsync(NetUserId userId, ICharacterProfile defaultProfile)
+ public Task InitPrefsAsync(
+ NetUserId userId,
+ ICharacterProfile defaultProfile,
+ CancellationToken cancel)
{
DbWriteOpsMetric.Inc();
return RunDbCommand(() => _db.InitPrefsAsync(userId, defaultProfile));
@@ -376,10 +384,10 @@ public Task SaveAdminOOCColorAsync(NetUserId userId, Color color)
return RunDbCommand(() => _db.SaveAdminOOCColorAsync(userId, color));
}
- public Task GetPlayerPreferencesAsync(NetUserId userId)
+ public Task GetPlayerPreferencesAsync(NetUserId userId, CancellationToken cancel)
{
DbReadOpsMetric.Inc();
- return RunDbCommand(() => _db.GetPlayerPreferencesAsync(userId));
+ return RunDbCommand(() => _db.GetPlayerPreferencesAsync(userId, cancel));
}
public Task AssignUserIdAsync(string name, NetUserId userId)
@@ -487,10 +495,10 @@ public Task EditServerRoleBan(int id, string reason, NoteSeverity severity, Date
#region Playtime
- public Task> GetPlayTimes(Guid player)
+ public Task> GetPlayTimes(Guid player, CancellationToken cancel)
{
DbReadOpsMetric.Inc();
- return RunDbCommand(() => _db.GetPlayTimes(player));
+ return RunDbCommand(() => _db.GetPlayTimes(player, cancel));
}
public Task UpdatePlayTimes(IReadOnlyCollection updates)
diff --git a/Content.Server/Database/ServerDbPostgres.cs b/Content.Server/Database/ServerDbPostgres.cs
index c81e735868a..fd4699fff4e 100644
--- a/Content.Server/Database/ServerDbPostgres.cs
+++ b/Content.Server/Database/ServerDbPostgres.cs
@@ -527,22 +527,26 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
return time;
}
- private async Task GetDbImpl([CallerMemberName] string? name = null)
+ private async Task GetDbImpl(
+ CancellationToken cancel = default,
+ [CallerMemberName] string? name = null)
{
LogDbOp(name);
await _dbReadyTask;
- await _prefsSemaphore.WaitAsync();
+ await _prefsSemaphore.WaitAsync(cancel);
if (_msLag > 0)
- await Task.Delay(_msLag);
+ await Task.Delay(_msLag, cancel);
return new DbGuardImpl(this, new PostgresServerDbContext(_options));
}
- protected override async Task GetDb([CallerMemberName] string? name = null)
+ protected override async Task GetDb(
+ CancellationToken cancel = default,
+ [CallerMemberName] string? name = null)
{
- return await GetDbImpl(name);
+ return await GetDbImpl(cancel, name);
}
private sealed class DbGuardImpl : DbGuard
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
index 88ecf820020..ffec90bb43d 100644
--- a/Content.Server/Database/ServerDbSqlite.cs
+++ b/Content.Server/Database/ServerDbSqlite.cs
@@ -439,7 +439,7 @@ public override async Task AddConnectionLogAsync(
public override async Task<((Admin, string? lastUserName)[] admins, AdminRank[])> GetAllAdminAndRanksAsync(
CancellationToken cancel)
{
- await using var db = await GetDbImpl();
+ await using var db = await GetDbImpl(cancel);
var admins = await db.SqliteDbContext.Admin
.Include(a => a.Flags)
@@ -514,23 +514,27 @@ protected override DateTime NormalizeDatabaseTime(DateTime time)
return DateTime.SpecifyKind(time, DateTimeKind.Utc);
}
- private async Task GetDbImpl([CallerMemberName] string? name = null)
+ private async Task GetDbImpl(
+ CancellationToken cancel = default,
+ [CallerMemberName] string? name = null)
{
LogDbOp(name);
await _dbReadyTask;
if (_msDelay > 0)
- await Task.Delay(_msDelay);
+ await Task.Delay(_msDelay, cancel);
- await _prefsSemaphore.WaitAsync();
+ await _prefsSemaphore.WaitAsync(cancel);
var dbContext = new SqliteServerDbContext(_options());
return new DbGuardImpl(this, dbContext);
}
- protected override async Task GetDb([CallerMemberName] string? name = null)
+ protected override async Task GetDb(
+ CancellationToken cancel = default,
+ [CallerMemberName] string? name = null)
{
- return await GetDbImpl(name).ConfigureAwait(false);
+ return await GetDbImpl(cancel, name).ConfigureAwait(false);
}
private sealed class DbGuardImpl : DbGuard
@@ -569,9 +573,9 @@ public ConcurrencySemaphore(int maxCount, bool synchronous)
_semaphore = new SemaphoreSlim(maxCount, maxCount);
}
- public Task WaitAsync()
+ public Task WaitAsync(CancellationToken cancel = default)
{
- var task = _semaphore.WaitAsync();
+ var task = _semaphore.WaitAsync(cancel);
if (_synchronous)
{
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index f8b1611fd57..3f6659840ad 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -2,6 +2,7 @@
using System.Threading.Tasks;
using Content.Server.Players.PlayTimeTracking;
using Content.Server.Preferences.Managers;
+using Robust.Server.Player;
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Utility;
@@ -16,17 +17,22 @@ namespace Content.Server.Database;
/// Actual loading code is handled by separate managers such as .
/// This manager is simply a centralized "is loading done" controller for other code to rely on.
///
-public sealed class UserDbDataManager
+public sealed class UserDbDataManager : IPostInjectInit
{
[Dependency] private readonly IServerPreferencesManager _prefs = default!;
+ [Dependency] private readonly ILogManager _logManager = default!;
[Dependency] private readonly PlayTimeTrackingManager _playTimeTracking = default!;
private readonly Dictionary _users = new();
+ private ISawmill _sawmill = default!;
+
// TODO: Ideally connected/disconnected would be subscribed to IPlayerManager directly,
// but this runs into ordering issues with game ticker.
public void ClientConnected(ICommonSession session)
{
+ _sawmill.Verbose($"Initiating load for user {session}");
+
DebugTools.Assert(!_users.ContainsKey(session.UserId), "We should not have any cached data on client connect.");
var cts = new CancellationTokenSource();
@@ -51,11 +57,52 @@ public void ClientDisconnected(ICommonSession session)
private async Task Load(ICommonSession session, CancellationToken cancel)
{
- await Task.WhenAll(
- _prefs.LoadData(session, cancel),
- _playTimeTracking.LoadData(session, cancel));
+ // The task returned by this function is only ever observed by callers of WaitLoadComplete,
+ // which doesn't even happen currently if the lobby is enabled.
+ // As such, this task must NOT throw a non-cancellation error!
+ try
+ {
+ await Task.WhenAll(
+ _prefs.LoadData(session, cancel),
+ _playTimeTracking.LoadData(session, cancel));
+
+ cancel.ThrowIfCancellationRequested();
+ _prefs.SanitizeData(session);
+
+ _sawmill.Verbose($"Load complete for user {session}");
+ }
+ catch (OperationCanceledException)
+ {
+ _sawmill.Debug($"Load cancelled for user {session}");
+
+ // We can rethrow the cancellation.
+ // This will make the task returned by WaitLoadComplete() also return a cancellation.
+ throw;
+ }
+ catch (Exception e)
+ {
+ // Must catch all exceptions here, otherwise task may go unobserved.
+ _sawmill.Error($"Load of user data failed: {e}");
+
+ // Kick them from server, since something is hosed. Let them try again I guess.
+ session.Channel.Disconnect("Loading of server user data failed, this is a bug.");
+
+ // We throw a OperationCanceledException so users of WaitLoadComplete() always see cancellation here.
+ throw new OperationCanceledException("Load of user data cancelled due to unknown error");
+ }
}
+ ///
+ /// Wait for all on-database data for a user to be loaded.
+ ///
+ ///
+ /// The task returned by this function may end up in a cancelled state
+ /// (throwing ) if the user disconnects while loading or an error occurs.
+ ///
+ ///
+ ///
+ /// A task that completes when all on-database data for a user has finished loading.
+ ///
public Task WaitLoadComplete(ICommonSession session)
{
return _users[session.UserId].Task;
@@ -63,7 +110,7 @@ public Task WaitLoadComplete(ICommonSession session)
public bool IsLoadComplete(ICommonSession session)
{
- return GetLoadTask(session).IsCompleted;
+ return GetLoadTask(session).IsCompletedSuccessfully;
}
public Task GetLoadTask(ICommonSession session)
@@ -71,5 +118,10 @@ public Task GetLoadTask(ICommonSession session)
return _users[session.UserId].Task;
}
+ void IPostInjectInit.PostInject()
+ {
+ _sawmill = _logManager.GetSawmill("userdb");
+ }
+
private sealed record UserData(CancellationTokenSource Cancel, Task Task);
}
diff --git a/Content.Server/GameTicking/GameTicker.Player.cs b/Content.Server/GameTicking/GameTicker.Player.cs
index a3e33117cc6..dcf2dc5366d 100644
--- a/Content.Server/GameTicking/GameTicker.Player.cs
+++ b/Content.Server/GameTicking/GameTicker.Player.cs
@@ -145,13 +145,33 @@ private async void PlayerStatusChanged(object? sender, SessionStatusEventArgs ar
async void SpawnWaitDb()
{
- await _userDb.WaitLoadComplete(session);
+ try
+ {
+ await _userDb.WaitLoadComplete(session);
+ }
+ catch (OperationCanceledException)
+ {
+ // Bail, user must've disconnected or something.
+ Log.Debug($"Database load cancelled while waiting to spawn {session}");
+ return;
+ }
+
SpawnPlayer(session, EntityUid.Invalid);
}
async void SpawnObserverWaitDb()
{
- await _userDb.WaitLoadComplete(session);
+ try
+ {
+ await _userDb.WaitLoadComplete(session);
+ }
+ catch (OperationCanceledException)
+ {
+ // Bail, user must've disconnected or something.
+ Log.Debug($"Database load cancelled while waiting to spawn {session}");
+ return;
+ }
+
JoinAsObserver(session);
}
diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
index 6a1292f5dca..9fcd80b72a3 100644
--- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
+++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingManager.cs
@@ -317,7 +317,7 @@ public async Task LoadData(ICommonSession session, CancellationToken cancel)
var data = new PlayTimeData();
_playTimeData.Add(session, data);
- var playTimes = await _db.GetPlayTimes(session.UserId);
+ var playTimes = await _db.GetPlayTimes(session.UserId, cancel);
cancel.ThrowIfCancellationRequested();
foreach (var timer in playTimes)
diff --git a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index 1808592ef5a..92e7adf22ad 100644
--- a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -12,6 +12,7 @@ public interface IServerPreferencesManager
void Init();
Task LoadData(ICommonSession session, CancellationToken cancel);
+ void SanitizeData(ICommonSession session);
void OnClientDisconnected(ICommonSession session);
bool TryGetCachedPreferences(NetUserId userId, [NotNullWhen(true)] out PlayerPreferences? playerPreferences);
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index a1eb8aad82b..55532f1ff5b 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -13,6 +13,7 @@
using Robust.Shared.Network;
using Robust.Shared.Player;
using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
namespace Content.Server.Preferences.Managers
@@ -27,6 +28,7 @@ public sealed class ServerPreferencesManager : IServerPreferencesManager
[Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly IServerDbManager _db = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
+ [Dependency] private readonly IDependencyCollection _dependencies = default!;
[Dependency] private readonly IPrototypeManager _protos = default!;
// Cache player prefs on the server so we don't need as much async hell related to them.
@@ -101,9 +103,8 @@ private async void HandleUpdateCharacterMessage(MsgUpdateCharacter message)
var curPrefs = prefsData.Prefs!;
var session = _playerManager.GetSessionById(userId);
- var collection = IoCManager.Instance!;
- profile.EnsureValid(session, collection);
+ profile.EnsureValid(session, _dependencies);
var profiles = new Dictionary(curPrefs.Characters)
{
@@ -196,7 +197,7 @@ public async Task LoadData(ICommonSession session, CancellationToken cancel)
async Task LoadPrefs()
{
- var prefs = await GetOrCreatePreferencesAsync(session.UserId);
+ var prefs = await GetOrCreatePreferencesAsync(session.UserId, cancel);
prefsData.Prefs = prefs;
prefsData.PrefsLoaded = true;
@@ -211,6 +212,16 @@ async Task LoadPrefs()
}
}
+ public void SanitizeData(ICommonSession session)
+ {
+ // This is a separate step from the actual database load.
+ // Sanitizing preferences requires play time info due to loadouts.
+ // And play time info is loaded concurrently from the DB with preferences.
+ var data = _cachedPlayerPrefs[session.UserId];
+ DebugTools.Assert(data.Prefs != null);
+ data.Prefs = SanitizePreferences(session, data.Prefs, _dependencies);
+ }
+
public void OnClientDisconnected(ICommonSession session)
{
_cachedPlayerPrefs.Remove(session.UserId);
@@ -270,18 +281,15 @@ public PlayerPreferences GetPreferences(NetUserId userId)
return null;
}
- private async Task GetOrCreatePreferencesAsync(NetUserId userId)
+ private async Task GetOrCreatePreferencesAsync(NetUserId userId, CancellationToken cancel)
{
- var prefs = await _db.GetPlayerPreferencesAsync(userId);
+ var prefs = await _db.GetPlayerPreferencesAsync(userId, cancel);
if (prefs is null)
{
- return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random());
+ return await _db.InitPrefsAsync(userId, HumanoidCharacterProfile.Random(), cancel);
}
- var session = _playerManager.GetSessionById(userId);
- var collection = IoCManager.Instance!;
-
- return SanitizePreferences(session, prefs, collection);
+ return prefs;
}
private PlayerPreferences SanitizePreferences(ICommonSession session, PlayerPreferences prefs, IDependencyCollection collection)
From 8cffd8e26ee94faf1a42bf2f3f26d8f7c4574c64 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 04:22:10 +0000
Subject: [PATCH 006/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index f6691435281..b49dad26c8d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
Entries:
-- author: juliangiebel
- changes:
- - message: The mass media consoles UI got overhauled
- type: Tweak
- - message: Added PDA notifications in chat for new news articles. They can be turned
- off in the news reader program and are only visible to you.
- type: Add
- id: 6044
- time: '2024-02-27T01:38:00.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/19610
- author: rosieposieeee
changes:
- message: Added lockable wall buttons and decorative frames for differentiating
@@ -3857,3 +3847,11 @@
id: 6543
time: '2024-05-07T03:23:50.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27760
+- author: PJB3005
+ changes:
+ - message: Fixed preferences not loading sometimes if you had a loadout item with
+ playtime requirement selected in a character profile.
+ type: Fix
+ id: 6544
+ time: '2024-05-07T04:21:03.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27742
From 41408a009c752a5e9293dee6d617d8eaaf362218 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Tue, 7 May 2024 09:26:33 +0200
Subject: [PATCH 007/215] Little morgue overhaul (#27750)
---
Resources/Prototypes/Entities/Structures/Storage/morgue.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
index 725f4c9b0f2..496ea416119 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/morgue.yml
@@ -5,6 +5,8 @@
placement:
mode: SnapgridCenter
components:
+ - type: Pullable
+ - type: Anchorable
- type: Sprite
sprite: Structures/Storage/morgue.rsi
layers:
@@ -28,11 +30,11 @@
shape:
!type:PhysShapeAabb
bounds: "-0.5,-0.5,0.5,0.5"
- density: 190
+ density: 1000
mask:
- MachineMask
layer:
- - WallLayer
+ - HalfWallLayer
- type: EntityStorage
isCollidableWhenOpen: true
showContents: false
From 502d2fe9158d058f31891229a4d5c64dcaf444a9 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 07:27:38 +0000
Subject: [PATCH 008/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b49dad26c8d..af0ce0e4ef9 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
Entries:
-- author: rosieposieeee
- changes:
- - message: Added lockable wall buttons and decorative frames for differentiating
- wall buttons.
- type: Add
- id: 6045
- time: '2024-02-27T07:57:17.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25631
- author: metalgearsloth
changes:
- message: Fix chat bubbles.
@@ -3855,3 +3847,12 @@
id: 6544
time: '2024-05-07T04:21:03.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27742
+- author: lzk228
+ changes:
+ - message: Morgue now can be anchored and unanchored.
+ type: Tweak
+ - message: Changed morgue's collision layer, so items now can go through it.
+ type: Tweak
+ id: 6545
+ time: '2024-05-07T07:26:33.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27750
From 2d48912bc90835df47257f5afe05dd9da1aaeb6f Mon Sep 17 00:00:00 2001
From: ShadowCommander
Date: Tue, 7 May 2024 03:50:22 -0700
Subject: [PATCH 009/215] Make arguments and parameters wrap to one variable
per line (#27766)
---
.editorconfig | 4 +
.../GameTicking/GameTicker.Spawning.cs | 106 +++++++++++++-----
2 files changed, 79 insertions(+), 31 deletions(-)
diff --git a/.editorconfig b/.editorconfig
index 872a068c7c6..f01530bcb18 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -336,7 +336,11 @@ dotnet_naming_symbols.type_parameters_symbols.applicable_kinds = type_parameter
# ReSharper properties
resharper_braces_for_ifelse = required_for_multiline
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_parameters_style = chop_if_long
resharper_keep_existing_attribute_arrangement = true
+resharper_wrap_chained_binary_patterns = chop_if_long
+resharper_wrap_chained_method_calls = chop_if_long
[*.{csproj,xml,yml,yaml,dll.config,msbuildproj,targets,props}]
indent_size = 2
diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs
index 157eff8d3f4..dfe8c5ce905 100644
--- a/Content.Server/GameTicking/GameTicker.Spawning.cs
+++ b/Content.Server/GameTicking/GameTicker.Spawning.cs
@@ -55,7 +55,9 @@ private List GetSpawnableStations()
return spawnableStations;
}
- private void SpawnPlayers(List readyPlayers, Dictionary profiles, bool force)
+ private void SpawnPlayers(List readyPlayers,
+ Dictionary profiles,
+ bool force)
{
// Allow game rules to spawn players by themselves if needed. (For example, nuke ops or wizard)
RaiseLocalEvent(new RulePlayerSpawningEvent(readyPlayers, profiles, force));
@@ -94,7 +96,8 @@ private void SpawnPlayers(List readyPlayers, Dictionary readyPlayers, Dictionary _playerManager.GetSessionById(x)).ToArray(), profiles, force));
+ RaiseLocalEvent(new RulePlayerJobsAssignedEvent(
+ assignedJobs.Keys.Select(x => _playerManager.GetSessionById(x)).ToArray(),
+ profiles,
+ force));
}
- private void SpawnPlayer(ICommonSession player, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
+ private void SpawnPlayer(ICommonSession player,
+ EntityUid station,
+ string? jobId = null,
+ bool lateJoin = true,
+ bool silent = false)
{
var character = GetPlayerProfile(player);
@@ -132,7 +142,12 @@ private void SpawnPlayer(ICommonSession player, EntityUid station, string? jobId
SpawnPlayer(player, character, station, jobId, lateJoin, silent);
}
- private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile character, EntityUid station, string? jobId = null, bool lateJoin = true, bool silent = false)
+ private void SpawnPlayer(ICommonSession player,
+ HumanoidCharacterProfile character,
+ EntityUid station,
+ string? jobId = null,
+ bool lateJoin = true,
+ bool silent = false)
{
// Can't spawn players with a dummy ticker!
if (DummyTicker)
@@ -176,7 +191,9 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
restrictedRoles.UnionWith(jobBans);
// Pick best job best on prefs.
- jobId ??= _stationJobs.PickBestAvailableJobWithPriority(station, character.JobPriorities, true,
+ jobId ??= _stationJobs.PickBestAvailableJobWithPriority(station,
+ character.JobPriorities,
+ true,
restrictedRoles);
// If no job available, stay in lobby, or if no lobby spawn as observer
if (jobId is null)
@@ -185,7 +202,9 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
{
JoinAsObserver(player);
}
- _chatManager.DispatchServerMessage(player, Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
+
+ _chatManager.DispatchServerMessage(player,
+ Loc.GetString("game-ticker-player-no-jobs-available-when-joining"));
return;
}
@@ -199,7 +218,7 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
_mind.SetUserId(newMind, data.UserId);
var jobPrototype = _prototypeManager.Index(jobId);
- var job = new JobComponent { Prototype = jobId };
+ var job = new JobComponent {Prototype = jobId};
_roles.MindAddRole(newMind, job, silent: silent);
var jobName = _jobs.MindTryGetJobName(newMind);
@@ -222,11 +241,10 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
if (lateJoin && !silent)
{
_chatSystem.DispatchStationAnnouncement(station,
- Loc.GetString(
- "latejoin-arrival-announcement",
- ("character", MetaData(mob).EntityName),
- ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))
- ), Loc.GetString("latejoin-arrival-sender"),
+ Loc.GetString("latejoin-arrival-announcement",
+ ("character", MetaData(mob).EntityName),
+ ("job", CultureInfo.CurrentCulture.TextInfo.ToTitleCase(jobName))),
+ Loc.GetString("latejoin-arrival-sender"),
playDefaultSound: false);
}
@@ -238,14 +256,17 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
_stationJobs.TryAssignJob(station, jobPrototype, player.UserId);
if (lateJoin)
- _adminLogger.Add(LogType.LateJoin, LogImpact.Medium, $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+ _adminLogger.Add(LogType.LateJoin,
+ LogImpact.Medium,
+ $"Player {player.Name} late joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
else
- _adminLogger.Add(LogType.RoundStartJoin, LogImpact.Medium, $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
+ _adminLogger.Add(LogType.RoundStartJoin,
+ LogImpact.Medium,
+ $"Player {player.Name} joined as {character.Name:characterName} on station {Name(station):stationName} with {ToPrettyString(mob):entity} as a {jobName:jobName}.");
// Make sure they're aware of extended access.
if (Comp(station).ExtendedAccess
- && (jobPrototype.ExtendedAccess.Count > 0
- || jobPrototype.ExtendedAccessGroups.Count > 0))
+ && (jobPrototype.ExtendedAccess.Count > 0 || jobPrototype.ExtendedAccessGroups.Count > 0))
{
_chatManager.DispatchServerMessage(player, Loc.GetString("job-greet-crew-shortages"));
}
@@ -267,14 +288,20 @@ private void SpawnPlayer(ICommonSession player, HumanoidCharacterProfile charact
}
else
{
- _chatManager.DispatchServerMessage(player, Loc.GetString("latejoin-arrivals-direction-time",
- ("time", $"{arrival:mm\\:ss}")));
+ _chatManager.DispatchServerMessage(player,
+ Loc.GetString("latejoin-arrivals-direction-time", ("time", $"{arrival:mm\\:ss}")));
}
}
// We raise this event directed to the mob, but also broadcast it so game rules can do something now.
PlayersJoinedRoundNormally++;
- var aev = new PlayerSpawnCompleteEvent(mob, player, jobId, lateJoin, PlayersJoinedRoundNormally, station, character);
+ var aev = new PlayerSpawnCompleteEvent(mob,
+ player,
+ jobId,
+ lateJoin,
+ PlayersJoinedRoundNormally,
+ station,
+ character);
RaiseLocalEvent(mob, aev, true);
}
@@ -296,7 +323,10 @@ public void Respawn(ICommonSession player)
/// The station they're spawning on
/// An optional job for them to spawn as
/// Whether or not the player should be greeted upon joining
- public void MakeJoinGame(ICommonSession player, EntityUid station, string? jobId = null, bool silent = false)
+ public void MakeJoinGame(ICommonSession player,
+ EntityUid station,
+ string? jobId = null,
+ bool silent = false)
{
if (!_playerGameStatuses.ContainsKey(player.UserId))
return;
@@ -342,23 +372,29 @@ public void SpawnObserver(ICommonSession player)
_metaData.SetEntityName(ghost, name);
_ghost.SetCanReturnToBody(ghost, false);
_mind.TransferTo(mind.Value, ghost);
- _adminLogger.Add(LogType.LateJoin, LogImpact.Low, $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
+ _adminLogger.Add(LogType.LateJoin,
+ LogImpact.Low,
+ $"{player.Name} late joined the round as an Observer with {ToPrettyString(ghost):entity}.");
}
#region Mob Spawning Helpers
+
private EntityUid SpawnObserverMob()
{
var coordinates = GetObserverSpawnPoint();
return EntityManager.SpawnEntity(ObserverPrototypeName, coordinates);
}
+
#endregion
#region Spawn Points
+
public EntityCoordinates GetObserverSpawnPoint()
{
_possiblePositions.Clear();
- foreach (var (point, transform) in EntityManager.EntityQuery(true))
+ foreach (var (point, transform) in EntityManager
+ .EntityQuery(true))
{
if (point.SpawnType != SpawnPointType.Observer)
continue;
@@ -374,8 +410,7 @@ public EntityCoordinates GetObserverSpawnPoint()
var query = AllEntityQuery();
while (query.MoveNext(out var uid, out var grid))
{
- if (!metaQuery.TryGetComponent(uid, out var meta) ||
- meta.EntityPaused)
+ if (!metaQuery.TryGetComponent(uid, out var meta) || meta.EntityPaused)
{
continue;
}
@@ -396,8 +431,7 @@ public EntityCoordinates GetObserverSpawnPoint()
{
var gridXform = Transform(gridUid);
- return new EntityCoordinates(gridUid,
- gridXform.InvWorldMatrix.Transform(toMap.Position));
+ return new EntityCoordinates(gridUid, gridXform.InvWorldMatrix.Transform(toMap.Position));
}
return spawn;
@@ -413,8 +447,7 @@ public EntityCoordinates GetObserverSpawnPoint()
{
var mapUid = _mapManager.GetMapEntityId(map);
- if (!metaQuery.TryGetComponent(mapUid, out var meta) ||
- meta.EntityPaused)
+ if (!metaQuery.TryGetComponent(mapUid, out var meta) || meta.EntityPaused)
{
continue;
}
@@ -427,6 +460,7 @@ public EntityCoordinates GetObserverSpawnPoint()
_sawmill.Warning("Found no observer spawn points!");
return EntityCoordinates.Invalid;
}
+
#endregion
}
@@ -444,7 +478,11 @@ public sealed class PlayerBeforeSpawnEvent : HandledEntityEventArgs
public bool LateJoin { get; }
public EntityUid Station { get; }
- public PlayerBeforeSpawnEvent(ICommonSession player, HumanoidCharacterProfile profile, string? jobId, bool lateJoin, EntityUid station)
+ public PlayerBeforeSpawnEvent(ICommonSession player,
+ HumanoidCharacterProfile profile,
+ string? jobId,
+ bool lateJoin,
+ EntityUid station)
{
Player = player;
Profile = profile;
@@ -472,7 +510,13 @@ public sealed class PlayerSpawnCompleteEvent : EntityEventArgs
// Ex. If this is the 27th person to join, this will be 27.
public int JoinOrder { get; }
- public PlayerSpawnCompleteEvent(EntityUid mob, ICommonSession player, string? jobId, bool lateJoin, int joinOrder, EntityUid station, HumanoidCharacterProfile profile)
+ public PlayerSpawnCompleteEvent(EntityUid mob,
+ ICommonSession player,
+ string? jobId,
+ bool lateJoin,
+ int joinOrder,
+ EntityUid station,
+ HumanoidCharacterProfile profile)
{
Mob = mob;
Player = player;
From b59ffd6673332d92a006769472c151316681ef43 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 7 May 2024 20:52:18 +1000
Subject: [PATCH 010/215] Revert "Fix turned off thrusters consume power"
(#27755)
Revert "Fix turned off thrusters consume power (#26690)"
This reverts commit 70959e7bb081c1a6e1457a8f8ee7732da91bb270.
---
Content.Server/Shuttles/Systems/ThrusterSystem.cs | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Content.Server/Shuttles/Systems/ThrusterSystem.cs b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
index be55cd9a62a..74c42ccbc53 100644
--- a/Content.Server/Shuttles/Systems/ThrusterSystem.cs
+++ b/Content.Server/Shuttles/Systems/ThrusterSystem.cs
@@ -264,11 +264,6 @@ public void EnableThruster(EntityUid uid, ThrusterComponent component, Transform
return;
}
- if (TryComp(uid, out var apcPower))
- {
- apcPower.NeedsPower = true;
- }
-
component.IsOn = true;
if (!EntityManager.TryGetComponent(xform.GridUid, out ShuttleComponent? shuttleComponent))
@@ -371,11 +366,6 @@ public void DisableThruster(EntityUid uid, ThrusterComponent component, EntityUi
if (!EntityManager.TryGetComponent(gridId, out ShuttleComponent? shuttleComponent))
return;
- if (TryComp(uid, out var apcPower))
- {
- apcPower.NeedsPower = false;
- }
-
// Logger.DebugS("thruster", $"Disabled thruster {uid}");
switch (component.Type)
From 93093f8a25e9a24cbdfb849a8ac065d7a637facc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20M=C4=99drek?=
Date: Tue, 7 May 2024 10:53:59 +0000
Subject: [PATCH 011/215] Fix construction instructions on flippables (#27574)
Fixes #27547
---
.../Entities/Structures/Piping/Atmospherics/trinary.yml | 5 +++++
.../Entities/Structures/Piping/Disposal/pipes.yml | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
index 46eb57c388d..e8025556aa5 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/trinary.yml
@@ -96,6 +96,9 @@
enabled:
True: { state: gasFilterFOn }
False: { state: gasFilterF }
+ - type: Construction
+ node: filterflipped
+
- type: PipeColorVisuals
- type: NodeContainer
nodes:
@@ -196,6 +199,8 @@
!type:PipeNode
nodeGroupID: Pipe
pipeDirection: North
+ - type: Construction
+ node: mixerflipped
- type: entity
parent: GasPipeBase
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
index 02241051179..7aee5896472 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml
@@ -271,6 +271,8 @@
bounds: "-0.25,-0.5,0.5,0.5"
mask:
- SubfloorMask
+ - type: Construction
+ node: routerflipped
- type: entity
id: DisposalJunction
@@ -353,6 +355,8 @@
bounds: "-0.25,-0.5,0.5,0.5"
mask:
- SubfloorMask
+ - type: Construction
+ node: junctionflipped
- type: entity
id: DisposalYJunction
@@ -489,3 +493,5 @@
pipe:
Free: { state: signal-router-flipped-free }
Anchored: { state: signal-router-flipped }
+ - type: Construction
+ node: signal_router_flipped
From b0369388bd035c4840a5fcf79d821b4975db26b1 Mon Sep 17 00:00:00 2001
From: Kara
Date: Tue, 7 May 2024 08:13:28 -0700
Subject: [PATCH 012/215] Log event starts to admin alert chat (#27761)
---
Content.Server/StationEvents/EventManagerSystem.cs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
index d96d3fa7299..26fbde9b3ff 100644
--- a/Content.Server/StationEvents/EventManagerSystem.cs
+++ b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -1,4 +1,5 @@
using System.Linq;
+using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
using Content.Server.StationEvents.Components;
using Content.Shared.CCVar;
@@ -16,6 +17,7 @@ public sealed class EventManagerSystem : EntitySystem
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _prototype = default!;
+ [Dependency] private readonly IChatManager _chat = default!;
[Dependency] public readonly GameTicker GameTicker = default!;
[Dependency] private readonly GlimmerSystem _glimmerSystem = default!; //Nyano - Summary: pulls in the glimmer system.
@@ -45,6 +47,7 @@ public string RunRandomEvent()
var ent = GameTicker.AddGameRule(randomEvent);
var str = Loc.GetString("station-event-system-run-event",("eventName", ToPrettyString(ent)));
+ _chat.SendAdminAlert(str);
Log.Info(str);
return str;
}
From 9534d852667c6feca72b0b2002ad12f0c2bcabc5 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 15:14:35 +0000
Subject: [PATCH 013/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index af0ce0e4ef9..bc73e61291d 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: metalgearsloth
- changes:
- - message: Fix chat bubbles.
- type: Fix
- id: 6046
- time: '2024-02-27T13:01:24.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25643
- author: rosieposieeee
changes:
- message: Added grey stalagmites and made all stalagmites weaker and more fun to
@@ -3856,3 +3849,10 @@
id: 6545
time: '2024-05-07T07:26:33.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27750
+- author: mirrorcult
+ changes:
+ - message: Events that run now get logged to admin alert chat
+ type: Tweak
+ id: 6546
+ time: '2024-05-07T15:13:29.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27761
From d6cc392388b577ae87625e6654320e5f365b16d6 Mon Sep 17 00:00:00 2001
From: ShadowCommander
Date: Tue, 7 May 2024 08:33:00 -0700
Subject: [PATCH 014/215] Set max line width to 120 (#27765)
---
.editorconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/.editorconfig b/.editorconfig
index f01530bcb18..3e44d1a2811 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,6 +12,7 @@ tab_width = 4
#end_of_line = crlf
insert_final_newline = true
trim_trailing_whitespace = true
+max_line_length = 120
#### .NET Coding Conventions ####
From d57b400d74155c1fe973954178a9a8ace5c047ed Mon Sep 17 00:00:00 2001
From: cool dolphin <36332236+Afrokada@users.noreply.github.com>
Date: Tue, 7 May 2024 17:55:03 +0200
Subject: [PATCH 015/215] More trinkets for loadouts (#27292)
* woo yea more tinket
* plushie has no timer
---
.../Loadouts/Miscellaneous/trinkets.yml | 99 +++++++++++++++++++
.../Prototypes/Loadouts/loadout_groups.yml | 8 ++
2 files changed, 107 insertions(+)
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 889b12a08e5..fe826a83340 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -1,3 +1,14 @@
+# Timers
+- type: loadoutEffectGroup
+ id: Command
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Command
+ time: 3600 # 1 hour
+
+# Plushies
- type: loadout
id: PlushieLizard
equipment: PlushieLizard
@@ -7,7 +18,95 @@
storage:
back:
- PlushieLizard
+
+- type: loadout
+ id: PlushieSpaceLizard
+ equipment: PlushieSpaceLizard
+
+- type: startingGear
+ id: PlushieSpaceLizard
+ storage:
+ back:
+ - PlushieSpaceLizard
+
+# Smokeables
+- type: loadout
+ id: Lighter
+ equipment: Lighter
+
+- type: startingGear
+ id: Lighter
+ storage:
+ back:
+ - Lighter
+
+- type: loadout
+ id: CigPackGreen
+ equipment: CigPackGreen
+
+- type: startingGear
+ id: CigPackGreen
+ storage:
+ back:
+ - CigPackGreen
+
+- type: loadout
+ id: CigPackRed
+ equipment: CigPackRed
+
+- type: startingGear
+ id: CigPackRed
+ storage:
+ back:
+ - CigPackRed
+
+- type: loadout
+ id: CigPackBlue
+ equipment: CigPackBlue
+
+- type: startingGear
+ id: CigPackBlue
+ storage:
+ back:
+ - CigPackBlue
+
+- type: loadout
+ id: CigPackBlack
+ equipment: CigPackBlack
+
+- type: startingGear
+ id: CigPackBlack
+ storage:
+ back:
+ - CigPackBlack
+
+- type: loadout
+ id: CigarCase
+ equipment: CigarCase
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: Command
+
+- type: startingGear
+ id: CigarCase
+ storage:
+ back:
+ - CigarCase
+
+- type: loadout
+ id: CigarGold
+ equipment: CigarGold
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: Command
+
+- type: startingGear
+ id: CigarGold
+ storage:
+ back:
+ - CigarGold
+# Pins
- type: loadout
id: ClothingNeckLGBTPin
equipment: ClothingNeckLGBTPin
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 299a3091e73..2205e28cc6b 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -6,6 +6,14 @@
maxLimit: 3
loadouts:
- PlushieLizard
+ - PlushieSpaceLizard
+ - Lighter
+ - CigPackGreen
+ - CigPackRed
+ - CigPackBlue
+ - CigPackBlack
+ - CigarCase
+ - CigarGold
- ClothingNeckLGBTPin
- ClothingNeckAromanticPin
- ClothingNeckAsexualPin
From 03e0c19dcf40ed084c4a138909d9c81fa2f2e018 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 15:56:09 +0000
Subject: [PATCH 016/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bc73e61291d..8b8322cae9b 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
Entries:
-- author: rosieposieeee
- changes:
- - message: Added grey stalagmites and made all stalagmites weaker and more fun to
- break.
- type: Add
- id: 6047
- time: '2024-02-27T19:24:17.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25646
- author: metalgearsloth
changes:
- message: Made NPC movement less janky.
@@ -3856,3 +3848,10 @@
id: 6546
time: '2024-05-07T15:13:29.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27761
+- author: cooldolphin
+ changes:
+ - message: Cigarettes in the loadout menu.
+ type: Add
+ id: 6547
+ time: '2024-05-07T15:55:03.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27292
From b0e86aa103b3d46882e234636161c07eb6cbb7f1 Mon Sep 17 00:00:00 2001
From: Hannah Giovanna Dawson
Date: Tue, 7 May 2024 20:14:58 +0200
Subject: [PATCH 017/215] Weapon Reflection Movement Mechanic (#27219)
* Weapon Reflection Movement Mechanic
Adds a movement mechanic to deflection.
Standing still gives you your best chance of deflecting a shot.
Moving lowers this to 2/3rds. Sprinting to 1/3rd.
This allows for robust players to express better and provides
counterplay to someone finding a goober-strong deflection
weapon, giving more design space.
As part of this PR I've also touched the numbers of a few swords,
shields, etc. and modified some descriptions to make them read
better. The balance numbers are not remotely final, but as intent:
1. All the sidearm swords (katana, cutlass, captain's sabre) have the same damage. There's no good reason the "ceremonial" blade the captain has doing more damage than a katana.
2. The Captain's Sabre has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting. This one is controversial due to the recent nerf, I suspect: This could easily be 15->10->5?
3. The Energy Katana has a flat 30% reflect chance.
4. The meme Throngler has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
5. The E-Sword has a 30% reflect chance, dropping to 20% when moving and 10% when sprinting.
6. The Double E-Sword has a mighty 75% reflect chance, dropping to 50% and then 25%.
7. Both reflective shields - Mirror and Energy - have a 95% deflect chance, dropping to 63% then 31%.
* Resolve PR comments.
* Weh?
* Reign in double esword a tad
* Shield nerfs no longer real
* Improve Mirror Cult desc
* Simple alert for deflection! No art yet.
* Added a new icon for deflecting
---
Content.Shared/Alert/AlertType.cs | 3 +-
.../Weapons/Reflect/ReflectComponent.cs | 35 ++++++--
.../Weapons/Reflect/ReflectSystem.cs | 84 ++++++++++++++++--
Resources/Locale/en-US/alerts/alerts.ftl | 3 +
Resources/Prototypes/Alerts/alerts.yml | 9 ++
Resources/Prototypes/Anomaly/behaviours.yml | 1 +
.../Entities/Clothing/OuterClothing/armor.yml | 1 +
.../Entities/Mobs/NPCs/hellspawn.yml | 1 +
.../Entities/Objects/Shields/shields.yml | 4 +-
.../Objects/Weapons/Melee/e_sword.yml | 7 +-
.../Entities/Objects/Weapons/Melee/sword.yml | 21 +++--
.../Alerts/deflecting.rsi/deflecting0.png | Bin 0 -> 1761 bytes
.../Interface/Alerts/deflecting.rsi/meta.json | 14 +++
13 files changed, 162 insertions(+), 21 deletions(-)
create mode 100644 Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png
create mode 100644 Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs
index b917dd692d7..b989b8d4b6f 100644
--- a/Content.Shared/Alert/AlertType.cs
+++ b/Content.Shared/Alert/AlertType.cs
@@ -52,7 +52,8 @@ public enum AlertType : byte
SuitPower,
BorgHealth,
BorgCrit,
- BorgDead
+ BorgDead,
+ Deflecting
}
}
diff --git a/Content.Shared/Weapons/Reflect/ReflectComponent.cs b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
index 8e7b8975d9d..5d8432ac776 100644
--- a/Content.Shared/Weapons/Reflect/ReflectComponent.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectComponent.cs
@@ -21,17 +21,42 @@ public sealed partial class ReflectComponent : Component
[ViewVariables(VVAccess.ReadWrite), DataField("reflects")]
public ReflectType Reflects = ReflectType.Energy | ReflectType.NonEnergy;
+ [DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
+ public Angle Spread = Angle.FromDegrees(45);
+
+ [DataField("soundOnReflect")]
+ public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
+
///
- /// Probability for a projectile to be reflected.
+ /// Is the deflection an innate power or something actively maintained? If true, this component grants a flat
+ /// deflection chance rather than a chance that degrades when moving/weightless/stunned/etc.
+ ///
+ [DataField]
+ public bool Innate = false;
+
+ ///
+ /// Maximum probability for a projectile to be reflected.
///
[DataField("reflectProb"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
public float ReflectProb = 0.25f;
- [DataField("spread"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
- public Angle Spread = Angle.FromDegrees(45);
+ ///
+ /// The maximum velocity a wielder can move at before losing effectiveness.
+ ///
+ [DataField]
+ public float VelocityBeforeNotMaxProb = 2.5f; // Walking speed for a human. Suitable for a weightless deflector like an e-sword.
- [DataField("soundOnReflect")]
- public SoundSpecifier? SoundOnReflect = new SoundPathSpecifier("/Audio/Weapons/Guns/Hits/laser_sear_wall.ogg");
+ ///
+ /// The velocity a wielder has to be moving at to use the minimum effectiveness value.
+ ///
+ [DataField]
+ public float VelocityBeforeMinProb = 4.5f; // Sprinting speed for a human. Suitable for a weightless deflector like an e-sword.
+
+ ///
+ /// Minimum probability for a projectile to be reflected.
+ ///
+ [DataField]
+ public float MinReflectProb = 0.1f;
}
[Flags]
diff --git a/Content.Shared/Weapons/Reflect/ReflectSystem.cs b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
index 014b3cfe1ff..36dbedb4cb1 100644
--- a/Content.Shared/Weapons/Reflect/ReflectSystem.cs
+++ b/Content.Shared/Weapons/Reflect/ReflectSystem.cs
@@ -1,17 +1,20 @@
using System.Diagnostics.CodeAnalysis;
using System.Numerics;
using Content.Shared.Administration.Logs;
+using Content.Shared.Alert;
using Content.Shared.Audio;
+using Content.Shared.Damage.Components;
using Content.Shared.Database;
+using Content.Shared.Gravity;
using Content.Shared.Hands;
using Content.Shared.Inventory;
using Content.Shared.Inventory.Events;
using Content.Shared.Item.ItemToggle.Components;
using Content.Shared.Popups;
using Content.Shared.Projectiles;
+using Content.Shared.Standing;
using Content.Shared.Weapons.Ranged.Components;
using Content.Shared.Weapons.Ranged.Events;
-using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Network;
using Robust.Shared.Physics.Components;
@@ -35,6 +38,9 @@ public sealed class ReflectSystem : EntitySystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] private readonly InventorySystem _inventorySystem = default!;
+ [Dependency] private readonly SharedGravitySystem _gravity = default!;
+ [Dependency] private readonly StandingStateSystem _standing = default!;
+ [Dependency] private readonly AlertsSystem _alerts = default!;
public override void Initialize()
{
@@ -91,15 +97,20 @@ private void OnReflectCollide(EntityUid uid, ReflectComponent component, ref Pro
private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid projectile, ProjectileComponent? projectileComp = null, ReflectComponent? reflect = null)
{
- if (!Resolve(reflector, ref reflect, false) ||
+ // Do we have the components needed to try a reflect at all?
+ if (
+ !Resolve(reflector, ref reflect, false) ||
!reflect.Enabled ||
!TryComp(projectile, out var reflective) ||
(reflect.Reflects & reflective.Reflective) == 0x0 ||
- !_random.Prob(reflect.ReflectProb) ||
- !TryComp(projectile, out var physics))
- {
+ !TryComp(projectile, out var physics) ||
+ TryComp(reflector, out var staminaComponent) && staminaComponent.Critical ||
+ _standing.IsDown(reflector)
+ )
+ return false;
+
+ if (!_random.Prob(CalcReflectChance(reflector, reflect)))
return false;
- }
var rotation = _random.NextAngle(-reflect.Spread / 2, reflect.Spread / 2).Opposite();
var existingVelocity = _physics.GetMapLinearVelocity(projectile, component: physics);
@@ -137,6 +148,34 @@ private bool TryReflectProjectile(EntityUid user, EntityUid reflector, EntityUid
return true;
}
+ private float CalcReflectChance(EntityUid reflector, ReflectComponent reflect)
+ {
+ /*
+ * The rules of deflection are as follows:
+ * If you innately reflect things via magic, biology etc., you always have a full chance.
+ * If you are standing up and standing still, you're prepared to deflect and have full chance.
+ * If you have velocity, your deflection chance depends on your velocity, clamped.
+ * If you are floating, your chance is the minimum value possible.
+ * You cannot deflect if you are knocked down or stunned.
+ */
+
+ if (reflect.Innate)
+ return reflect.ReflectProb;
+
+ if (_gravity.IsWeightless(reflector))
+ return reflect.MinReflectProb;
+
+ if (!TryComp(reflector, out var reflectorPhysics))
+ return reflect.ReflectProb;
+
+ return MathHelper.Lerp(
+ reflect.MinReflectProb,
+ reflect.ReflectProb,
+ // Inverse progression between velocities fed in as progression between probabilities. We go high -> low so the output here needs to be _inverted_.
+ 1 - Math.Clamp((reflectorPhysics.LinearVelocity.Length() - reflect.VelocityBeforeNotMaxProb) / (reflect.VelocityBeforeMinProb - reflect.VelocityBeforeNotMaxProb), 0, 1)
+ );
+ }
+
private void OnReflectHitscan(EntityUid uid, ReflectComponent component, ref HitScanReflectAttemptEvent args)
{
if (args.Reflected ||
@@ -162,7 +201,14 @@ private bool TryReflectHitscan(
{
if (!TryComp(reflector, out var reflect) ||
!reflect.Enabled ||
- !_random.Prob(reflect.ReflectProb))
+ TryComp(reflector, out var staminaComponent) && staminaComponent.Critical ||
+ _standing.IsDown(reflector))
+ {
+ newDirection = null;
+ return false;
+ }
+
+ if (!_random.Prob(CalcReflectChance(reflector, reflect)))
{
newDirection = null;
return false;
@@ -191,6 +237,9 @@ private void OnReflectEquipped(EntityUid uid, ReflectComponent component, GotEqu
return;
EnsureComp(args.Equipee);
+
+ if (component.Enabled)
+ EnableAlert(args.Equipee);
}
private void OnReflectUnequipped(EntityUid uid, ReflectComponent comp, GotUnequippedEvent args)
@@ -204,6 +253,9 @@ private void OnReflectHandEquipped(EntityUid uid, ReflectComponent component, Go
return;
EnsureComp(args.User);
+
+ if (component.Enabled)
+ EnableAlert(args.User);
}
private void OnReflectHandUnequipped(EntityUid uid, ReflectComponent component, GotUnequippedHandEvent args)
@@ -215,6 +267,11 @@ private void OnToggleReflect(EntityUid uid, ReflectComponent comp, ref ItemToggl
{
comp.Enabled = args.Activated;
Dirty(uid, comp);
+
+ if (comp.Enabled)
+ EnableAlert(uid);
+ else
+ DisableAlert(uid);
}
///
@@ -228,9 +285,22 @@ private void RefreshReflectUser(EntityUid user)
continue;
EnsureComp(user);
+ EnableAlert(user);
+
return;
}
RemCompDeferred(user);
+ DisableAlert(user);
+ }
+
+ private void EnableAlert(EntityUid alertee)
+ {
+ _alerts.ShowAlert(alertee, AlertType.Deflecting);
+ }
+
+ private void DisableAlert(EntityUid alertee)
+ {
+ _alerts.ClearAlert(alertee, AlertType.Deflecting);
}
}
diff --git a/Resources/Locale/en-US/alerts/alerts.ftl b/Resources/Locale/en-US/alerts/alerts.ftl
index 319809da40a..24bc60cbf15 100644
--- a/Resources/Locale/en-US/alerts/alerts.ftl
+++ b/Resources/Locale/en-US/alerts/alerts.ftl
@@ -107,3 +107,6 @@ alerts-revenant-essence-desc = The power of souls. It sustains you and is used f
alerts-revenant-corporeal-name = Corporeal
alerts-revenant-corporeal-desc = You have manifested physically. People around you can see and hurt you.
+
+alerts-deflecting-name = Deflecting
+alerts-deflecting-desc = You have a chance to deflect incoming projectiles. Standing still or moving slowly will increase this chance.
diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml
index e9a7f9c9584..7881cddd4aa 100644
--- a/Resources/Prototypes/Alerts/alerts.yml
+++ b/Resources/Prototypes/Alerts/alerts.yml
@@ -24,6 +24,7 @@
- category: Thirst
- alertType: Magboots
- alertType: Pacified
+ - alertType: Deflecting
- type: entity
id: AlertSpriteView
@@ -474,3 +475,11 @@
state: critical
name: Debug6
description: Debug
+
+- type: alert
+ id: Deflecting
+ icons:
+ - sprite: /Textures/Interface/Alerts/deflecting.rsi
+ state: deflecting0
+ name: alerts-deflecting-name
+ description: alerts-deflecting-desc
diff --git a/Resources/Prototypes/Anomaly/behaviours.yml b/Resources/Prototypes/Anomaly/behaviours.yml
index dea1ddb69c3..e39933c365c 100644
--- a/Resources/Prototypes/Anomaly/behaviours.yml
+++ b/Resources/Prototypes/Anomaly/behaviours.yml
@@ -84,6 +84,7 @@
description: anomaly-behavior-reflect
components:
- type: Reflect
+ innate: true
reflectProb: 0.5
reflects:
- Energy
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
index ecc4156affa..6da428ee5f6 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
@@ -96,6 +96,7 @@
Heat: 0.4 # this technically means it protects against fires pretty well? -heat is just for lasers and stuff, not atmos temperature
- type: Reflect
reflectProb: 1
+ innate: true # armor grants a passive shield that does not require concentration to maintain
reflects:
- Energy
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
index 26fbe4e0734..74658f0a2db 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/hellspawn.yml
@@ -55,6 +55,7 @@
- type: Perishable
- type: Reflect
reflectProb: 0.7
+ innate: true
reflects:
- Energy
- type: Fixtures
diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index b794e42ff7d..e7ebb1b98d4 100644
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -313,7 +313,7 @@
name: mirror shield
parent: BaseShield
id: MirrorShield
- description: Eerily glows red... you hear the geometer whispering
+ description: Glows an eerie red. You hear the Geometer whispering...
components:
- type: Sprite
state: mirror-icon
@@ -321,6 +321,7 @@
heldPrefix: mirror
- type: Reflect
reflectProb: 0.95
+ innate: true
reflects:
- Energy
- type: Blocking #Mirror shield reflects heat/laser, but is relatively weak to everything else.
@@ -408,6 +409,7 @@
- type: Reflect
enabled: false
reflectProb: 0.95
+ innate: true
reflects:
- Energy
- type: Blocking
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
index bc376df5eab..dcf65d03827 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
@@ -78,6 +78,8 @@
malus: 0
- type: Reflect
enabled: false
+ reflectProb: 0.5
+ minReflectProb: 0.25
- type: IgnitionSource
temperature: 700
@@ -225,7 +227,7 @@
name: double-bladed energy sword
parent: EnergySword
id: EnergySwordDouble
- description: Syndicate Command Interns thought that having one blade on the energy sword was not enough. This can be stored in pockets.
+ description: Syndicate Command's intern thought that having only one blade on energy swords was not cool enough. This can be stored in pockets.
components:
- type: EnergySword
- type: ItemToggle
@@ -276,7 +278,8 @@
size: Small
sprite: Objects/Weapons/Melee/e_sword_double-inhands.rsi
- type: Reflect
- reflectProb: .80 #DeltaV: 80% Energy Reflection but no ballistics.
+ reflectProb: .80
+ minReflectProb: .65
spread: 75
reflects:
- Energy #DeltaV: 80% Energy Reflection but no ballistics.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
index 5ffe16d3b53..dd41468892c 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -13,12 +13,17 @@
attackRate: 1.5
damage:
types:
- Slash: 17 #cmon, it has to be at least BETTER than the rest.
+ Slash: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Reflect
enabled: true
- reflectProb: .1
+ # Design intent: a robust captain or tot can sacrifice movement to make the most of this weapon, but they have to
+ # really restrict themselves to walking speed or less.
+ reflectProb: 0.5
+ velocityBeforeNotMaxProb: 1.0
+ velocityBeforeMinProb: 3.0
+ minReflectProb: 0.1
spread: 90
- type: Item
size: Normal
@@ -83,6 +88,9 @@
- Back
- Belt
- type: Reflect
+ reflectProb: 0.3
+ velocityBeforeNotMaxProb: 6.0 # don't punish ninjas for being ninjas
+ velocityBeforeMinProb: 10.0
- type: entity
name: machete
@@ -152,7 +160,7 @@
wideAnimationRotation: -135
damage:
types:
- Slash: 16
+ Slash: 15
soundHit:
path: /Audio/Weapons/bladeslice.ogg
- type: Item
@@ -164,7 +172,7 @@
name: The Throngler
parent: BaseItem
id: Throngler
- description: Why would you make this?
+ description: Why would someone make this?
components:
- type: Sharp
- type: Sprite
@@ -185,7 +193,10 @@
path: /Audio/Effects/explosion_small1.ogg
- type: Reflect
enabled: true
- reflectProb: .25
+ reflectProb: 0.5 # In robust hands, deflects as well as an e-sword
+ velocityBeforeNotMaxProb: 1.0
+ velocityBeforeMinProb: 3.0
+ minReflectProb: 0.1
spread: 90
- type: Item
size: Ginormous
diff --git a/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png b/Resources/Textures/Interface/Alerts/deflecting.rsi/deflecting0.png
new file mode 100644
index 0000000000000000000000000000000000000000..37404e77f76444946eaa481b8f4ec861f85736c6
GIT binary patch
literal 1761
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P;
zT0k}j5QD&_;K@Lev%n*=n1MmW7law7oa)tQU|_Dx42dX-@b$4u&d=3LOvz75)vL%Y
z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq
z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3
znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z
z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv
z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8
zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Uod0?Yb6da36%JYk|ZS*0kQB8q}q8e_akHsA}
zAm3X>2Bj9~=ahoN-_Fq3$OarHD58j%far+8ssmXRT}MDhen~zsWff&6d*+p-78Mi$
zQyJJsn0>fapqquTJTxz}#13WvnlO?sq*$_o23!a@MlgdDr&6eKkf23Mv5@Qljs{?U
zu;a4PhvzLjuD|Ez{a|2VdgSTi7!twxHf(>ll%q)9>g)3aH%&4L?C@0f=sKY3^-_5x?PXMg=&dwlOg7bU|>CT~x9
zb_T6CWpZ@TUF_5_Lklimk-JuS7}Ko>mE&-XwT%@
zz~AnCsWjGS_c!$k_qyy%=bv{x)ZwDkSM>CArNyI_f|-FzCbQ0}DK0pe;IJ{`jA%$K
z$3xdA@?HlRJyy6KS>*1mHaTQ%m}f)%-=FRGo-dZ+d604WWl4U)jbbK=2$gdI!WH>j
zqh6HV`q?dPS6*4`o*(~j>3RD+3qv0!n~cdU8!k@z*R#?f>E!~ag&Ur}|8vr7UvkaQ
z=;b+Pr=RmN9(OaAd3jBxQDi~KqKg_A7l)U0m1^@YVz=nh@z^ISVL63sg*fk&6Deo1
z6F1+ypsT#ltU+0H_0+W;yW~=II3G+hT(|GUqiho?6S@AK`V$0rA1qp_DOl|Id#y;u
z%5t^N%geXT-<=&@XLj20rd8Jjj+DHd=yt)~@iJ*|HCHywVB%a6_`e{Ld3DQ-g`9e2
zJHC5NO!Nqp7KGu&fThp?^U)%zxfj8D>H6YSo*o)!HwtY_Bk?~
z3617rwSO<0-|6{uH|pctX{S|7cgLQ8@i3*mA^1zdvC9PwTy;L%{TO><_x)_sd|sTk
z@bjThlf;icpI+^l)7}u_&|l5Ce9_&!$2uEl8U5J%o_$~c7pCKr88jzx3*G2gzbKlU
ziBEnW%e&>y6Ao;Tv%SAUaD|Y_o#_q1Q<_}#rY|nA(CNRW_~66)T7N6U4bP6eznPTy
lZ%sw4nOvUSG&zw4^;={Tb>7Fkn+K|1JYD@<);T3K0RY#fl2ZTx
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json b/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
new file mode 100644
index 00000000000..f5d94c891a7
--- /dev/null
+++ b/Resources/Textures/Interface/Alerts/deflecting.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Deflecting icon by Ubaser",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "deflecting0"
+ }
+ ]
+}
From f7b243ae04f06d4256814d7f83b21d58a7a7e187 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 18:16:04 +0000
Subject: [PATCH 018/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 8b8322cae9b..fe201e3a1fe 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: metalgearsloth
- changes:
- - message: Made NPC movement less janky.
- type: Fix
- id: 6048
- time: '2024-02-28T06:41:15.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25666
- author: musicmanvr
changes:
- message: Added the Syndicate decoy bundle, a creative way to trick your foes.
@@ -3855,3 +3848,12 @@
id: 6547
time: '2024-05-07T15:55:03.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27292
+- author: FairlySadPanda
+ changes:
+ - message: Weapons that deflect shots, like the e-sword, now are most effective
+ at doing so when standing still, with moving or sprinting making the deflection
+ chance worse.
+ type: Tweak
+ id: 6548
+ time: '2024-05-07T18:14:59.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27219
From 51d94f2022a3feadd85f585ca397bfa7284ea87c Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 7 May 2024 18:20:43 +0000
Subject: [PATCH 019/215] make lube speed up lathes (#25515)
* add LatheGetSpeedEvent
* add LatheLube system
* make typical lathes accept lube
* spill
* :trollface:
* rework to generic ReagentSpeedSystem
* hyperlathe ops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
---
Content.Server/Lathe/LatheSystem.cs | 6 +-
.../ReagentSpeed/ReagentSpeedComponent.cs | 34 +++++++++++
.../ReagentSpeed/ReagentSpeedSystem.cs | 33 ++++++++++
.../Entities/Structures/Machines/lathe.yml | 61 +++++++++++++------
4 files changed, 116 insertions(+), 18 deletions(-)
create mode 100644 Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs
create mode 100644 Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs
diff --git a/Content.Server/Lathe/LatheSystem.cs b/Content.Server/Lathe/LatheSystem.cs
index 2b3b810fba7..7448a9b84dd 100644
--- a/Content.Server/Lathe/LatheSystem.cs
+++ b/Content.Server/Lathe/LatheSystem.cs
@@ -14,6 +14,7 @@
using Content.Shared.Emag.Components;
using Content.Shared.Lathe;
using Content.Shared.Materials;
+using Content.Shared.ReagentSpeed;
using Content.Shared.Research.Components;
using Content.Shared.Research.Prototypes;
using JetBrains.Annotations;
@@ -35,6 +36,7 @@ public sealed class LatheSystem : SharedLatheSystem
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly UserInterfaceSystem _uiSys = default!;
[Dependency] private readonly MaterialStorageSystem _materialStorage = default!;
+ [Dependency] private readonly ReagentSpeedSystem _reagentSpeed = default!;
[Dependency] private readonly StackSystem _stack = default!;
[Dependency] private readonly TransformSystem _transform = default!;
@@ -186,9 +188,11 @@ public bool TryStartProducing(EntityUid uid, LatheComponent? component = null)
var recipe = component.Queue.First();
component.Queue.RemoveAt(0);
+ var time = _reagentSpeed.ApplySpeed(uid, recipe.CompleteTime);
+
var lathe = EnsureComp(uid);
lathe.StartTime = _timing.CurTime;
- lathe.ProductionLength = recipe.CompleteTime * component.TimeMultiplier;
+ lathe.ProductionLength = time * component.TimeMultiplier;
component.CurrentRecipe = recipe;
var ev = new LatheStartPrintingEvent(recipe);
diff --git a/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs b/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs
new file mode 100644
index 00000000000..d233cad2a00
--- /dev/null
+++ b/Content.Shared/ReagentSpeed/ReagentSpeedComponent.cs
@@ -0,0 +1,34 @@
+using Content.Shared.Chemistry.Reagent;
+using Content.Shared.FixedPoint;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.ReagentSpeed;
+
+///
+/// Makes a device work faster by consuming reagents on each use.
+/// Other systems must use for this to do anything.
+///
+[RegisterComponent, Access(typeof(ReagentSpeedSystem))]
+public sealed partial class ReagentSpeedComponent : Component
+{
+ ///
+ /// Solution that will be checked.
+ /// Anything that isn't in Modifiers is left alone.
+ ///
+ [DataField(required: true)]
+ public string Solution = string.Empty;
+
+ ///
+ /// How much reagent from the solution to use up for each use.
+ /// This is per-modifier-reagent and not shared between them.
+ ///
+ [DataField]
+ public FixedPoint2 Cost = 5;
+
+ ///
+ /// Reagents and how much they modify speed at full purity.
+ /// Small number means faster large number means slower.
+ ///
+ [DataField(required: true)]
+ public Dictionary, float> Modifiers = new();
+}
diff --git a/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs
new file mode 100644
index 00000000000..8561c7b12a1
--- /dev/null
+++ b/Content.Shared/ReagentSpeed/ReagentSpeedSystem.cs
@@ -0,0 +1,33 @@
+using Content.Shared.Chemistry.EntitySystems;
+
+namespace Content.Shared.ReagentSpeed;
+
+public sealed class ReagentSpeedSystem : EntitySystem
+{
+ [Dependency] private readonly SharedSolutionContainerSystem _solution = default!;
+
+ ///
+ /// Consumes reagents and modifies the duration.
+ /// This can be production time firing delay etc.
+ ///
+ public TimeSpan ApplySpeed(Entity ent, TimeSpan time)
+ {
+ if (!Resolve(ent, ref ent.Comp, false))
+ return time;
+
+ if (!_solution.TryGetSolution(ent.Owner, ent.Comp.Solution, out _, out var solution))
+ return time;
+
+ foreach (var (reagent, fullModifier) in ent.Comp.Modifiers)
+ {
+ var used = solution.RemoveReagent(reagent, ent.Comp.Cost);
+ var efficiency = (used / ent.Comp.Cost).Float();
+ // scale the speed modifier so microdosing has less effect
+ var reduction = (1f - fullModifier) * efficiency;
+ var modifier = 1f - reduction;
+ time *= modifier;
+ }
+
+ return time;
+ }
+}
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 235a998c190..7b5e7362353 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -50,9 +50,44 @@
- type: ResearchClient
- type: TechnologyDatabase
+# a lathe that can be sped up with space lube / slowed down with glue
- type: entity
- id: Autolathe
+ abstract: true
parent: BaseLathe
+ id: BaseLatheLube
+ components:
+ - type: ReagentSpeed
+ solution: lube
+ modifiers:
+ SpaceLube: 0.25
+ SpaceGlue: 5
+ - type: SolutionContainerManager
+ solutions:
+ lube:
+ maxVol: 250
+ - type: Spillable
+ solution: lube
+ - type: RefillableSolution
+ solution: lube
+ - type: ExaminableSolution
+ solution: lube
+
+- type: entity
+ abstract: true
+ id: BaseHyperlathe
+ components:
+ - type: Lathe
+ materialUseMultiplier: 0.5
+ timeMultiplier: 1.5
+ - type: LatheHeatProducing
+ - type: ReagentSpeed
+ modifiers:
+ SpaceLube: 0.8 # being faster means less heat so lube needs to be nerfed
+ SpaceGlue: 5 # no change from normal lathe, overheat!!!
+
+- type: entity
+ id: Autolathe
+ parent: BaseLatheLube
name: autolathe
description: It produces items using metal and glass.
components:
@@ -226,22 +261,18 @@
- type: entity
id: AutolatheHyperConvection
- parent: Autolathe
+ parent: [Autolathe, BaseHyperlathe]
name: hyper convection autolathe
description: A highly-experimental autolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
components:
- type: Sprite
sprite: Structures/Machines/autolathe_hypercon.rsi
- - type: Lathe
- materialUseMultiplier: 0.5
- timeMultiplier: 1.5
- - type: LatheHeatProducing
- type: Machine
board: AutolatheHyperConvectionMachineCircuitboard
- type: entity
id: Protolathe
- parent: BaseLathe
+ parent: BaseLatheLube
name: protolathe
description: Converts raw materials into useful objects.
components:
@@ -351,22 +382,18 @@
- type: entity
id: ProtolatheHyperConvection
- parent: Protolathe
+ parent: [Protolathe, BaseHyperlathe]
name: hyper convection protolathe
description: A highly-experimental protolathe that harnesses the power of extreme heat to slowly create objects more cost-effectively.
components:
- type: Sprite
sprite: Structures/Machines/protolathe_hypercon.rsi
- - type: Lathe
- materialUseMultiplier: 0.5
- timeMultiplier: 1.5
- - type: LatheHeatProducing
- type: Machine
board: ProtolatheHyperConvectionMachineCircuitboard
- type: entity
id: CircuitImprinter
- parent: BaseLathe
+ parent: BaseLatheLube
name: circuit imprinter
description: Prints circuit boards for machines.
components:
@@ -516,7 +543,7 @@
- type: entity
id: ExosuitFabricator
- parent: BaseLathe
+ parent: BaseLatheLube
name: exosuit fabricator
description: Creates parts for robotics and other mechanical needs
components:
@@ -680,7 +707,7 @@
- type: entity
id: SecurityTechFab
- parent: BaseLathe
+ parent: BaseLatheLube
name: security techfab
description: Prints equipment for use by security crew.
components:
@@ -824,7 +851,7 @@
- type: entity
id: AmmoTechFab
- parent: BaseLathe
+ parent: BaseLatheLube
name: ammo techfab
description: Prints the bare minimum of bullets that any budget military or armory could need. Nothing fancy.
components:
@@ -872,7 +899,7 @@
- type: entity
id: MedicalTechFab
- parent: BaseLathe
+ parent: BaseLatheLube
name: medical techfab
description: Prints equipment for use by the medbay.
components:
From 673ed22525c46b55e6fef8f82a389c17bfce3e8c Mon Sep 17 00:00:00 2001
From: PJBot
Date: Tue, 7 May 2024 18:21:50 +0000
Subject: [PATCH 020/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fe201e3a1fe..3ce8ccd5ec7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,15 +1,4 @@
Entries:
-- author: musicmanvr
- changes:
- - message: Added the Syndicate decoy bundle, a creative way to trick your foes.
- type: Add
- - message: Snap pops have been added to the toy crate.
- type: Add
- - message: Syndicate Commanders now have a trench whistle, Avanti!
- type: Add
- id: 6049
- time: '2024-02-28T21:53:46.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25333
- author: Whisper
changes:
- message: Iron and copper no longer grant infinite blood!
@@ -3857,3 +3846,10 @@
id: 6548
time: '2024-05-07T18:14:59.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27219
+- author: deltanedas
+ changes:
+ - message: Lathes can now be sped up by using Space Lube.
+ type: Tweak
+ id: 6549
+ time: '2024-05-07T18:20:44.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/25515
From be2e38d40835e4d8c6273b5645fd9b89689aff2c Mon Sep 17 00:00:00 2001
From: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com>
Date: Tue, 7 May 2024 20:44:20 +0100
Subject: [PATCH 021/215] Stop Toilets crushing you into walls (#27778)
---
Resources/Prototypes/Entities/Structures/Furniture/toilet.yml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
index 2556b9ddfde..a3124c09f6a 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml
@@ -51,6 +51,10 @@
disposals: !type:Container
- type: Physics
bodyType: Static
+ - type: Fixtures
+ fixtures:
+ fix1:
+ hard: false
- type: Construction
graph: Toilet
node: toilet
From 1a8644d981550514cb1a2715ffdad55e1c1ccfdd Mon Sep 17 00:00:00 2001
From: deltanedas <39013340+deltanedas@users.noreply.github.com>
Date: Tue, 7 May 2024 20:42:28 +0000
Subject: [PATCH 022/215] make hyper printer inherit base lathe (#27777)
Co-authored-by: deltanedas <@deltanedas:kde.org>
---
Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 7b5e7362353..91e65ba48db 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -528,16 +528,12 @@
- type: entity
id: CircuitImprinterHyperConvection
- parent: CircuitImprinter
+ parent: [CircuitImprinter, BaseHyperlathe]
name: hyper convection circuit imprinter
description: A highly-experimental circuit imprinter that harnesses the power of extreme heat to slowly create objects more cost-effectively.
components:
- type: Sprite
sprite: Structures/Machines/circuit_imprinter_hypercon.rsi
- - type: Lathe
- materialUseMultiplier: 0.5
- timeMultiplier: 1.5
- - type: LatheHeatProducing
- type: Machine
board: CircuitImprinterHyperConvectionMachineCircuitboard
From 4dfa5163669b4554b7aef87056698933e56f5341 Mon Sep 17 00:00:00 2001
From: OnsenCapy <101037138+LGRuthes@users.noreply.github.com>
Date: Tue, 7 May 2024 21:19:55 -0300
Subject: [PATCH 023/215] Change combat gloves sprite (#27373)
* Changed combat gloves sprite.
* Edited combat gloves sprite.
---
.../Entities/Clothing/Hands/gloves.yml | 6 ++++
.../Hands/Gloves/combat.rsi/equipped-HAND.png | Bin 0 -> 441 bytes
.../Clothing/Hands/Gloves/combat.rsi/icon.png | Bin 0 -> 591 bytes
.../Hands/Gloves/combat.rsi/inhand-left.png | Bin 0 -> 564 bytes
.../Hands/Gloves/combat.rsi/inhand-right.png | Bin 0 -> 567 bytes
.../Hands/Gloves/combat.rsi/meta.json | 26 ++++++++++++++++++
6 files changed, 32 insertions(+)
create mode 100644 Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
create mode 100644 Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
create mode 100644 Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
create mode 100644 Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
create mode 100644 Resources/Textures/Clothing/Hands/Gloves/combat.rsi/meta.json
diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
index 0c2ded620eb..8b73eee0d24 100644
--- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
+++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml
@@ -242,6 +242,12 @@
name: combat gloves
description: These tactical gloves are fireproof and shock resistant.
components:
+ - type: Sprite
+ sprite: Clothing/Hands/Gloves/combat.rsi
+ - type: Clothing
+ sprite: Clothing/Hands/Gloves/combat.rsi
+ - type: GloveHeatResistance
+ heatResistance: 1400
- type: Insulated
- type: Fiber
fiberMaterial: fibers-insulative
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/equipped-HAND.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca224617c0e6a82898ca646121b94dda88c2a8a
GIT binary patch
literal 441
zcmV;q0Y?6bP)Px$a!Eu%RCr$Pnn4P}Knz8vdqLENC`zx;`{?oPeR>5^6c;LjdnH0QrS?x+ZHLTv
zo6bz~@?saA#6|u~BCp>O01b$o07oEl0r)4#5#R_!PJkm2xd40%a0EC4krUtuGzqX=
zrLV<0b@SQ86-D7r$2|llYqBhJm+Re~4|}gQ-*V{V{KkUHVy5HKC&yi$Ljc>&<|WVG
z9#3y*O#lSuKhO69APH&>(5yiKG<%gz^IZcwDjUjXKKhr1v{};x;h*P20M=g;1Yo_x
zs6HBi2w9KQ0P7t__0a%C$aDbr
zuI|o2-vG4t0jkES0mufw{Qj>Qfp5=t$)^>7UnCvM9t03dCx*&{1`I_$lyhl7D4iH8
j4;nBO`B2V{-hekD=C?uVRmpMy0000
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..eedef5290dbbb293635918f232f898977a718d48
GIT binary patch
literal 591
zcmV-V0Px%2}wjjR9Hvtl-)}LK@`QW8MsohhW4d~P=Q}P2>$R
z&M>RHXub%s^HMv`-1EC*wzOT+)o7i
zv9k+3)5h-u*%o4J06&prI)xyfFPFHnuNf8C*VLa-Dhm;F|m%PMjHM+yg
z0cLE1nGkelbsnsB0s9}8GIL&{)n5DT!&L#s+j$WA1%#kqP}fx2@Ud|e|0UQiX9Ix1
dfxv;lfnQV1WiT-mDvSUC002ovPDHLkV1oQr3V{Fs
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e6ce0b9b9f63977587e93de8f8fc7812843f4d5
GIT binary patch
literal 564
zcmV-40?Yl0P)Px$?ny*JRCr$Pnn6oKK@i91;TJG0q$q?86b*XdLAvw}BItt#QgraxrBmQVQK&;;
zf~6ExP!PPBg$EWU`F6M2ZU67IymfYFe)FGw9wwr|pD6JB2>_sgzzLuQ0v7--L9_r`
zAaDX`fxrcTuK-#AEf6>Xv_Rkjz*pc;TA;jBNp7wOnSJTnFH(8tpcWn4*gr^k|LXE0
z;&rjGLgVQpJw1%+Hz0KFmuYLG05&#DNgT(N%jHxIqx%VQ^8E0-Ubjo-?Gm-y?YVw+
z?UzYB{jD(o&1N%setl8rzQ27?rCL>0X8?nKUnM>q-Ko7=y-ugClP|t??Xx7$Hbwv(
z9vvrKU4B*zd74b06o5{rqu%Y-D%9=uXfJNeZ3SKXtjQY#z?W2ht*EM<_BsPNKWjz2
zm&$(jKH&Qy4P4h=8~_Kv{ky(ZQWxL%wYm?6w<=-YOV_i3>)L09V59}II(NYi09>eo
zWDHP%Bz+frLjf*SK{5s?K$5--zM%jYsvsEy6d+081>aDB3ssPe0Sb_$?}BeAz=bME
z#sCFK(s#i(6yQP?Bx8UAB+Z+^
literal 0
HcmV?d00001
diff --git a/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png b/Resources/Textures/Clothing/Hands/Gloves/combat.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..41ca0dddfb5127675137c8cb082dd3c4be81aba7
GIT binary patch
literal 567
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z-+Q_^hE&A8
zo#p7w6ew^!{Uf)8SdfSlTNj&d#RR?DW{zJA8bxGn%3g|81d6;8n315#DJsGtZM-2U
z@Z%lPv}xb(U*7b7{ejPaI2j%=oabD?YGcmOrVz!T`@oWMOT%-v
z1K|w14PqbWFhm_FW`3ak;0n{zyR{3*hHcbfGuTof3Bvn}YGfMwSrqNu^
z2EXOX=f7o(zWP>GB4FmT%}MGnQ$xE;-C~WaebsXrW8$_j#dYWYFO~aHv%%=Yr5Euk
z2mfx~89eFW_s?<94t|LH_9?0+pVeWFc4wV&=#?f;hNvfNkF+wc332jfms#L?&nw2_
zfS2l)k^_vSN~}4;82PVWL9ik9-2JUuucgX089dM3k8RC(Tg*1$%b!?n!|OZz7%t7(
zznkmgt>-KXXMgSvOIlYrm*K
Date: Wed, 8 May 2024 00:21:01 +0000
Subject: [PATCH 024/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3ce8ccd5ec7..96c8b20e766 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: Whisper
- changes:
- - message: Iron and copper no longer grant infinite blood!
- type: Fix
- id: 6050
- time: '2024-02-28T21:56:22.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25678
- author: Cojoke-dot
changes:
- message: E-sword now lights plasma fires
@@ -3853,3 +3846,12 @@
id: 6549
time: '2024-05-07T18:20:44.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/25515
+- author: OnsenCapy
+ changes:
+ - message: Combat gloves now have their own unique sprite.
+ type: Tweak
+ - message: Combat gloves now have heat resistance to match their fireproof description.
+ type: Tweak
+ id: 6550
+ time: '2024-05-08T00:19:55.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27373
From dc4de10036abd14ff1d936926d370db1dfc6dc2b Mon Sep 17 00:00:00 2001
From: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com>
Date: Tue, 7 May 2024 20:22:25 -0400
Subject: [PATCH 025/215] Make the floppy lizard ears have two colors. (#27679)
* Make the floppy lizard ears have two colors.
* please fix whatever the hell happened
* fix the error
* suggestion from Ubaser
* another suggestion from ubaser
---
Resources/Locale/en-US/markings/reptilian.ftl | 3 ++-
.../Mobs/Customization/Markings/reptilian.yml | 4 +++-
.../Prototypes/Entities/Mobs/NPCs/animals.yml | 1 -
...g => horns_floppy_kobold_ears_primary.png} | Bin 1717 -> 1696 bytes
.../horns_floppy_kobold_ears_secondary.png | Bin 0 -> 197 bytes
.../reptilian_parts.rsi/meta.json | 6 +++++-
6 files changed, 10 insertions(+), 4 deletions(-)
rename Resources/Textures/Mobs/Customization/reptilian_parts.rsi/{horns_floppy_kobold_ears.png => horns_floppy_kobold_ears_primary.png} (74%)
create mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png
diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index 470af07361d..c2a2df4b3ba 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -96,7 +96,8 @@ marking-LizardHornsBighorn = Lizard Horns (Bighorn)
marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
-marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy Kobold)
+marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears_primary = Lizard Ears (Floppy Kobold)
+marking-LizardHornsFloppyKoboldEars-horns-floppy_kobold_ears_secondary = Lizard Ears (Floppy Kobold)
marking-LizardHornsFloppyKoboldEars = Lizard Ears (Floppy Kobold)
marking-LizardChestUnderbelly-body_underbelly = Lizard Chest (Underbelly)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 5a52e09bf2d..95cfb72e875 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -310,7 +310,9 @@
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
- state: horns_floppy_kobold_ears
+ state: horns_floppy_kobold_ears_primary
+ - sprite: Mobs/Customization/reptilian_parts.rsi
+ state: horns_floppy_kobold_ears_secondary
- type: marking
id: LizardChestUnderbelly
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 7fb431fabb5..6bc0d7a598f 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1434,7 +1434,6 @@
horns_bighorn: KoboldHornColors
horns_argali: KoboldHornColors
horns_ayrshire: KoboldHornColors
- horns_floppy_kobold_ears: Inherit
horns_double: Inherit
horns_kobold_ears: Inherit
- type: Butcherable
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png
similarity index 74%
rename from Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
rename to Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png
index 061c0100cc5cc0d2216f0e25819a546421c7d300..89d7eaef817d3abd4702b58e71d92c1ffdda29b4 100644
GIT binary patch
delta 321
zcmV-H0lxmV4WJFM-2plbP)t-sdU|@dx3{FEqyPW_*0rV`00004bW%=J|Ns90Kq{&9
z00009a7bBm001bK001bK0nAOV#j_g%kpq9@Nkl{xl=
z5rPmfAqW8z0xNL#vcg~Ql*syhK<#EN;QiUd8`NrD1&;>qxfAFOw?Qv=C6Ei?*%sSn
z1j|xgF#i`Ipm|*3F0|XxFe0j#lh1%UrL`w`gR^l4TaSl4LJ$Hb1R-F4EvWSapJ^^9
Tc?DQO00000NkvXXu0mjfcEE>}
delta 343
zcmV-d0jU0<4Yduh-2pxiP)t-sdU|@dx3{FEq?DAD0000ux)%Ka000GaQchF<|Ns90
z`?d~K00009a7bBm001bN001bN0lI?#-?JA2kpqA9Nkl
zFrv3a!%{BlYApt#?Mr)@E(BbJ;sIKlvI&s=(hFjD5M)i8U|9%IYhHo3Mh`sz<~!uK
zXaIkpg~bG@=`sM=fodOgwGPheHNaB<0w4-N07L=U0ZuM2^5dP07QYW#vUvqaeyY9E
z60IlTksvd70JS&r0qp{KW@?|>07s}E+P*IU!24&a8{%w7!f@QrZ~g{6*+#X%8@yW=
p;pponPXP#kC;$Nv{Tfi~2lKN%Lkjt^{s0RA002ovPDHLkV1hgVk!An@
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png
new file mode 100644
index 0000000000000000000000000000000000000000..b40d099eabd5c9969e85ab0a30ac36185fdccf56
GIT binary patch
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFv`=#F{C2y?IlCL1_KV(fG=}w?cu7{dLP*Y(}<
Date: Wed, 8 May 2024 00:25:41 +0000
Subject: [PATCH 026/215] make dragons breathe fire (#26746)
* add ActionGun system
* add RepeatingTrigger
* dragons breath projectile, repeatedly explodes
* give dragon fire breathing action, fireproof it
* oop
* oop 2
* prevent troll
* proper repeating thing
* pro
* webedit ops
* realops
---------
Co-authored-by: deltanedas <@deltanedas:kde.org>
---
.../Components/ExplosiveComponent.cs | 7 +++
.../Components/RepeatingTriggerComponent.cs | 25 +++++++++++
.../EntitySystems/ExplosionSystem.cs | 2 +-
.../Explosion/EntitySystems/TriggerSystem.cs | 21 +++++++++
.../Ranged/Components/ActionGunComponent.cs | 37 +++++++++++++++
.../Weapons/Ranged/Systems/ActionGunSystem.cs | 41 +++++++++++++++++
.../Entities/Mobs/Player/dragon.yml | 45 +++++++++++++++++++
.../Weapons/Guns/Projectiles/magic.yml | 33 ++++++++++++++
8 files changed, 210 insertions(+), 1 deletion(-)
create mode 100644 Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
create mode 100644 Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
create mode 100644 Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
diff --git a/Content.Server/Explosion/Components/ExplosiveComponent.cs b/Content.Server/Explosion/Components/ExplosiveComponent.cs
index 04a08955a35..2b27a89d9db 100644
--- a/Content.Server/Explosion/Components/ExplosiveComponent.cs
+++ b/Content.Server/Explosion/Components/ExplosiveComponent.cs
@@ -81,6 +81,13 @@ public sealed partial class ExplosiveComponent : Component
[DataField("deleteAfterExplosion")]
public bool? DeleteAfterExplosion;
+ ///
+ /// Whether to not set to true, allowing it to explode multiple times.
+ /// This should never be used if it is damageable.
+ ///
+ [DataField]
+ public bool Repeatable;
+
///
/// Avoid somehow double-triggering this explosion (e.g. by damaging this entity from its own explosion.
///
diff --git a/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
new file mode 100644
index 00000000000..cc08de53f90
--- /dev/null
+++ b/Content.Server/Explosion/Components/RepeatingTriggerComponent.cs
@@ -0,0 +1,25 @@
+using Content.Server.Explosion.EntitySystems;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server.Explosion.Components;
+
+///
+/// Constantly triggers after being added to an entity.
+///
+[RegisterComponent, Access(typeof(TriggerSystem))]
+[AutoGenerateComponentPause]
+public sealed partial class RepeatingTriggerComponent : Component
+{
+ ///
+ /// How long to wait between triggers.
+ /// The first trigger starts this long after the component is added.
+ ///
+ [DataField]
+ public TimeSpan Delay = TimeSpan.FromSeconds(1);
+
+ ///
+ /// When the next trigger will be.
+ ///
+ [DataField(customTypeSerializer: typeof(TimeOffsetSerializer)), AutoPausedField]
+ public TimeSpan NextTrigger;
+}
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index 23543895e6f..8734c054d64 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -160,7 +160,7 @@ public void TriggerExplosive(EntityUid uid, ExplosiveComponent? explosive = null
if (explosive.Exploded)
return;
- explosive.Exploded = true;
+ explosive.Exploded = !explosive.Repeatable;
// Override the explosion intensity if optional arguments were provided.
if (radius != null)
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 3675c214b14..8e0a75ea24f 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -94,6 +94,7 @@ public override void Initialize()
SubscribeLocalEvent(OnStepTriggered);
SubscribeLocalEvent(OnSlipTriggered);
SubscribeLocalEvent(OnEmptyTriggered);
+ SubscribeLocalEvent(OnRepeatInit);
SubscribeLocalEvent(OnSpawnTrigger);
SubscribeLocalEvent(HandleDeleteTrigger);
@@ -241,6 +242,11 @@ private void OnEmptyTriggered(EntityUid uid, TriggerWhenEmptyComponent component
Trigger(uid, args.EmptyGun);
}
+ private void OnRepeatInit(Entity ent, ref MapInitEvent args)
+ {
+ ent.Comp.NextTrigger = _timing.CurTime + ent.Comp.Delay;
+ }
+
public bool Trigger(EntityUid trigger, EntityUid? user = null)
{
var triggerEvent = new TriggerEvent(trigger, user);
@@ -323,6 +329,7 @@ public override void Update(float frameTime)
UpdateProximity();
UpdateTimer(frameTime);
UpdateTimedCollide(frameTime);
+ UpdateRepeat();
}
private void UpdateTimer(float frameTime)
@@ -357,5 +364,19 @@ private void UpdateTimer(float frameTime)
_appearance.SetData(uid, TriggerVisuals.VisualState, TriggerVisualState.Unprimed, appearance);
}
}
+
+ private void UpdateRepeat()
+ {
+ var now = _timing.CurTime;
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var comp))
+ {
+ if (comp.NextTrigger > now)
+ continue;
+
+ comp.NextTrigger = now + comp.Delay;
+ Trigger(uid);
+ }
+ }
}
}
diff --git a/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
new file mode 100644
index 00000000000..112339efd74
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Components/ActionGunComponent.cs
@@ -0,0 +1,37 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Systems;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+
+namespace Content.Shared.Weapons.Ranged.Components;
+
+///
+/// Lets you shoot a gun using an action.
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(ActionGunSystem))]
+public sealed partial class ActionGunComponent : Component
+{
+ ///
+ /// Action to create, must use .
+ ///
+ [DataField(required: true)]
+ public EntProtoId Action = string.Empty;
+
+ [DataField]
+ public EntityUid? ActionEntity;
+
+ ///
+ /// Prototype of gun entity to spawn.
+ /// Deleted when this component is removed.
+ ///
+ [DataField(required: true)]
+ public EntProtoId GunProto = string.Empty;
+
+ [DataField]
+ public EntityUid? Gun;
+}
+
+///
+/// Action event for to shoot at a position.
+///
+public sealed partial class ActionGunShootEvent : WorldTargetActionEvent;
diff --git a/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
new file mode 100644
index 00000000000..f3dfe8a2a03
--- /dev/null
+++ b/Content.Shared/Weapons/Ranged/Systems/ActionGunSystem.cs
@@ -0,0 +1,41 @@
+using Content.Shared.Actions;
+using Content.Shared.Weapons.Ranged.Components;
+
+namespace Content.Shared.Weapons.Ranged.Systems;
+
+public sealed class ActionGunSystem : EntitySystem
+{
+ [Dependency] private readonly SharedActionsSystem _actions = default!;
+ [Dependency] private readonly SharedGunSystem _gun = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnMapInit);
+ SubscribeLocalEvent(OnShutdown);
+ SubscribeLocalEvent(OnShoot);
+ }
+
+ private void OnMapInit(Entity ent, ref MapInitEvent args)
+ {
+ if (string.IsNullOrEmpty(ent.Comp.Action))
+ return;
+
+ _actions.AddAction(ent, ref ent.Comp.ActionEntity, ent.Comp.Action);
+ ent.Comp.Gun = Spawn(ent.Comp.GunProto);
+ }
+
+ private void OnShutdown(Entity ent, ref ComponentShutdown args)
+ {
+ if (ent.Comp.Gun is {} gun)
+ QueueDel(gun);
+ }
+
+ private void OnShoot(Entity ent, ref ActionGunShootEvent args)
+ {
+ if (TryComp(ent.Comp.Gun, out var gun))
+ _gun.AttemptShoot(ent, ent.Comp.Gun.Value, gun, args.Target);
+ }
+}
+
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
index ee0db34fc2d..cb9dc1c911a 100644
--- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml
@@ -91,6 +91,12 @@
speedModifierThresholds:
250: 0.7
400: 0.5
+ # disable taking damage from fire, since its a fire breathing dragon
+ - type: Flammable
+ damage:
+ types: {}
+ - type: Temperature
+ heatDamageThreshold: 800
- type: Metabolizer
solutionOnBody: false
updateInterval: 0.25
@@ -141,10 +147,33 @@
spawnRiftAction: ActionSpawnRift
- type: GenericAntag
rule: Dragon
+ - type: ActionGun
+ action: ActionDragonsBreath
+ gunProto: DragonsBreathGun
- type: GuideHelp
guides:
- MinorAntagonists
+- type: entity
+ noSpawn: true
+ id: DragonsBreathGun
+ name: dragon's lung
+ description: For dragon's breathing
+ components:
+ - type: RechargeBasicEntityAmmo
+ rechargeCooldown: 5
+ rechargeSound:
+ path: /Audio/Animals/space_dragon_roar.ogg
+ - type: BasicEntityAmmoProvider
+ proto: ProjectileDragonsBreath
+ capacity: 1
+ count: 1
+ - type: Gun
+ soundGunshot:
+ path: /Audio/Animals/space_dragon_roar.ogg
+ soundEmpty: null
+ projectileSpeed: 5
+
- type: entity
parent: BaseMobDragon
id: MobDragonDungeon
@@ -183,6 +212,7 @@
state: icon
event: !type:DragonSpawnRiftActionEvent
useDelay: 1
+ priority: 3
- type: entity
id: ActionDevour
@@ -194,3 +224,18 @@
icon: { sprite : Interface/Actions/devour.rsi, state: icon }
iconOn: { sprite : Interface/Actions/devour.rsi, state: icon-on }
event: !type:DevourActionEvent
+ priority: 1
+
+- type: entity
+ noSpawn: true
+ id: ActionDragonsBreath
+ name: "[color=orange]Dragon's Breath[/color]"
+ description: Spew out flames at anyone foolish enough to attack you!
+ components:
+ - type: WorldTargetAction
+ # TODO: actual sprite
+ icon: { sprite : Objects/Weapons/Guns/Projectiles/magic.rsi, state: fireball }
+ event: !type:ActionGunShootEvent
+ priority: 2
+ checkCanAccess: false
+ range: 0
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
index 3556d1c8f8b..d6adcd614e3 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml
@@ -30,6 +30,39 @@
- type: IgniteOnCollide
fireStacks: 0.35
+- type: entity
+ noSpawn: true
+ parent: BaseBulletTrigger
+ id: ProjectileDragonsBreath
+ name: dragon's breath
+ description: Try not to get toasted.
+ components:
+ - type: PointLight
+ color: "#E25822"
+ radius: 3.0
+ energy: 5.0
+ - type: Sprite
+ sprite: Objects/Weapons/Guns/Projectiles/magic.rsi
+ layers:
+ - state: fireball
+ shader: unshaded
+ - type: IgnitionSource
+ temperature: 1000
+ ignited: true
+ - type: RepeatingTrigger
+ delay: 0.5 # line of fire as well as if it hits something
+ - type: ExplodeOnTrigger
+ - type: Explosive
+ explosionType: FireBomb
+ totalIntensity: 5 # low intensity, the point is to burn attackers not to break open walls, dragons can just eat them
+ intensitySlope: 1
+ maxIntensity: 3
+ canCreateVacuum: false
+ deleteAfterExplosion: false
+ repeatable: true
+ - type: TimedDespawn
+ lifetime: 5
+
- type: entity
id: ProjectileAnomalyFireball
name: fireball
From fd11738a1d07931f30690bcfdefdfc6b2253a084 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 8 May 2024 00:26:47 +0000
Subject: [PATCH 027/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 96c8b20e766..96ce6aed314 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
Entries:
-- author: Cojoke-dot
- changes:
- - message: E-sword now lights plasma fires
- type: Tweak
- id: 6051
- time: '2024-02-28T21:59:35.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25665
- author: lzk228
changes:
- message: Engineering structures orders in cargo now supplied via flatpacks (e.g.
@@ -3855,3 +3848,10 @@
id: 6550
time: '2024-05-08T00:19:55.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27373
+- author: deltanedas
+ changes:
+ - message: Dragons can now breathe fire.
+ type: Add
+ id: 6551
+ time: '2024-05-08T00:25:41.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/26746
From fa2223ed8deda5b4b3ec6cfc8806cbd4013c997b Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers
Date: Wed, 8 May 2024 04:24:54 +0200
Subject: [PATCH 028/215] Fix preferences sent to client not being sanitized
(#27789)
Fucking whoops
In #27742 I made it so sanitization of character profiles was moved to be *after* database load. Except that means I moved it to be after the copy of all character profiles got sent to the client.
Move the sending to *also* be in that second load stage, and rename it. Fixes the issue.
---
Content.Server/Database/UserDbDataManager.cs | 2 +-
.../Managers/IServerPreferencesManager.cs | 2 +-
.../Managers/ServerPreferencesManager.cs | 27 ++++++++++---------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/Content.Server/Database/UserDbDataManager.cs b/Content.Server/Database/UserDbDataManager.cs
index 3f6659840ad..c58c594dbad 100644
--- a/Content.Server/Database/UserDbDataManager.cs
+++ b/Content.Server/Database/UserDbDataManager.cs
@@ -67,7 +67,7 @@ await Task.WhenAll(
_playTimeTracking.LoadData(session, cancel));
cancel.ThrowIfCancellationRequested();
- _prefs.SanitizeData(session);
+ _prefs.FinishLoad(session);
_sawmill.Verbose($"Load complete for user {session}");
}
diff --git a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
index 92e7adf22ad..63c267f154a 100644
--- a/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/IServerPreferencesManager.cs
@@ -12,7 +12,7 @@ public interface IServerPreferencesManager
void Init();
Task LoadData(ICommonSession session, CancellationToken cancel);
- void SanitizeData(ICommonSession session);
+ void FinishLoad(ICommonSession session);
void OnClientDisconnected(ICommonSession session);
bool TryGetCachedPreferences(NetUserId userId, [NotNullWhen(true)] out PlayerPreferences? playerPreferences);
diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
index 55532f1ff5b..7a80757435e 100644
--- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs
@@ -199,27 +199,28 @@ async Task LoadPrefs()
{
var prefs = await GetOrCreatePreferencesAsync(session.UserId, cancel);
prefsData.Prefs = prefs;
- prefsData.PrefsLoaded = true;
-
- var msg = new MsgPreferencesAndSettings();
- msg.Preferences = prefs;
- msg.Settings = new GameSettings
- {
- MaxCharacterSlots = MaxCharacterSlots
- };
- _netManager.ServerSendMessage(msg, session.Channel);
}
}
}
- public void SanitizeData(ICommonSession session)
+ public void FinishLoad(ICommonSession session)
{
// This is a separate step from the actual database load.
// Sanitizing preferences requires play time info due to loadouts.
// And play time info is loaded concurrently from the DB with preferences.
- var data = _cachedPlayerPrefs[session.UserId];
- DebugTools.Assert(data.Prefs != null);
- data.Prefs = SanitizePreferences(session, data.Prefs, _dependencies);
+ var prefsData = _cachedPlayerPrefs[session.UserId];
+ DebugTools.Assert(prefsData.Prefs != null);
+ prefsData.Prefs = SanitizePreferences(session, prefsData.Prefs, _dependencies);
+
+ prefsData.PrefsLoaded = true;
+
+ var msg = new MsgPreferencesAndSettings();
+ msg.Preferences = prefsData.Prefs;
+ msg.Settings = new GameSettings
+ {
+ MaxCharacterSlots = MaxCharacterSlots
+ };
+ _netManager.ServerSendMessage(msg, session.Channel);
}
public void OnClientDisconnected(ICommonSession session)
From 42e5ecf35b5c7ef57596bb4a1d1053666b69b819 Mon Sep 17 00:00:00 2001
From: Flareguy <78941145+Flareguy@users.noreply.github.com>
Date: Tue, 7 May 2024 22:48:42 -0500
Subject: [PATCH 029/215] Revert "Make the floppy lizard ears have two colors."
(#27790)
Revert "Make the floppy lizard ears have two colors. (#27679)"
This reverts commit bd06aa2365d6ce093ac47462deb69858c6cc18c0.
---
Resources/Locale/en-US/markings/reptilian.ftl | 3 +--
.../Mobs/Customization/Markings/reptilian.yml | 4 +---
.../Prototypes/Entities/Mobs/NPCs/animals.yml | 1 +
...imary.png => horns_floppy_kobold_ears.png} | Bin 1696 -> 1717 bytes
.../horns_floppy_kobold_ears_secondary.png | Bin 197 -> 0 bytes
.../reptilian_parts.rsi/meta.json | 6 +-----
6 files changed, 4 insertions(+), 10 deletions(-)
rename Resources/Textures/Mobs/Customization/reptilian_parts.rsi/{horns_floppy_kobold_ears_primary.png => horns_floppy_kobold_ears.png} (74%)
delete mode 100644 Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png
diff --git a/Resources/Locale/en-US/markings/reptilian.ftl b/Resources/Locale/en-US/markings/reptilian.ftl
index c2a2df4b3ba..470af07361d 100644
--- a/Resources/Locale/en-US/markings/reptilian.ftl
+++ b/Resources/Locale/en-US/markings/reptilian.ftl
@@ -96,8 +96,7 @@ marking-LizardHornsBighorn = Lizard Horns (Bighorn)
marking-LizardHornsKoboldEars-horns_kobold_ears = Lizard Ears (Kobold)
marking-LizardHornsKoboldEars = Lizard Ears (Kobold)
-marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears_primary = Lizard Ears (Floppy Kobold)
-marking-LizardHornsFloppyKoboldEars-horns-floppy_kobold_ears_secondary = Lizard Ears (Floppy Kobold)
+marking-LizardHornsFloppyKoboldEars-horns_floppy_kobold_ears = Lizard Ears (Floppy Kobold)
marking-LizardHornsFloppyKoboldEars = Lizard Ears (Floppy Kobold)
marking-LizardChestUnderbelly-body_underbelly = Lizard Chest (Underbelly)
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
index 95cfb72e875..5a52e09bf2d 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
@@ -310,9 +310,7 @@
speciesRestriction: [Reptilian]
sprites:
- sprite: Mobs/Customization/reptilian_parts.rsi
- state: horns_floppy_kobold_ears_primary
- - sprite: Mobs/Customization/reptilian_parts.rsi
- state: horns_floppy_kobold_ears_secondary
+ state: horns_floppy_kobold_ears
- type: marking
id: LizardChestUnderbelly
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6bc0d7a598f..7fb431fabb5 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1434,6 +1434,7 @@
horns_bighorn: KoboldHornColors
horns_argali: KoboldHornColors
horns_ayrshire: KoboldHornColors
+ horns_floppy_kobold_ears: Inherit
horns_double: Inherit
horns_kobold_ears: Inherit
- type: Butcherable
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
similarity index 74%
rename from Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_primary.png
rename to Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears.png
index 89d7eaef817d3abd4702b58e71d92c1ffdda29b4..061c0100cc5cc0d2216f0e25819a546421c7d300 100644
GIT binary patch
delta 343
zcmV-d0jU0<4Yduh-2pxiP)t-sdU|@dx3{FEq?DAD0000ux)%Ka000GaQchF<|Ns90
z`?d~K00009a7bBm001bN001bN0lI?#-?JA2kpqA9Nkl
zFrv3a!%{BlYApt#?Mr)@E(BbJ;sIKlvI&s=(hFjD5M)i8U|9%IYhHo3Mh`sz<~!uK
zXaIkpg~bG@=`sM=fodOgwGPheHNaB<0w4-N07L=U0ZuM2^5dP07QYW#vUvqaeyY9E
z60IlTksvd70JS&r0qp{KW@?|>07s}E+P*IU!24&a8{%w7!f@QrZ~g{6*+#X%8@yW=
p;pponPXP#kC;$Nv{Tfi~2lKN%Lkjt^{s0RA002ovPDHLkV1hgVk!An@
delta 321
zcmV-H0lxmV4WJFM-2plbP)t-sdU|@dx3{FEqyPW_*0rV`00004bW%=J|Ns90Kq{&9
z00009a7bBm001bK001bK0nAOV#j_g%kpq9@Nkl{xl=
z5rPmfAqW8z0xNL#vcg~Ql*syhK<#EN;QiUd8`NrD1&;>qxfAFOw?Qv=C6Ei?*%sSn
z1j|xgF#i`Ipm|*3F0|XxFe0j#lh1%UrL`w`gR^l4TaSl4LJ$Hb1R-F4EvWSapJ^^9
Tc?DQO00000NkvXXu0mjfcEE>}
diff --git a/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png b/Resources/Textures/Mobs/Customization/reptilian_parts.rsi/horns_floppy_kobold_ears_secondary.png
deleted file mode 100644
index b40d099eabd5c9969e85ab0a30ac36185fdccf56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 197
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFv`=#F{C2y?IlCL1_KV(fG=}w?cu7{dLP*Y(}<
Date: Tue, 7 May 2024 23:23:26 -0700
Subject: [PATCH 030/215] Fix the changelog window being very laggy until a tab
is clicked (#27795)
---
Content.Client/Changelog/ChangelogWindow.xaml.cs | 2 --
1 file changed, 2 deletions(-)
diff --git a/Content.Client/Changelog/ChangelogWindow.xaml.cs b/Content.Client/Changelog/ChangelogWindow.xaml.cs
index e5f492900c2..9b7fd754369 100644
--- a/Content.Client/Changelog/ChangelogWindow.xaml.cs
+++ b/Content.Client/Changelog/ChangelogWindow.xaml.cs
@@ -87,14 +87,12 @@ private void TabsUpdated()
if (!tab.AdminOnly || isAdmin)
{
Tabs.SetTabVisible(i, true);
- tab.Visible = true;
visibleTabs++;
firstVisible ??= i;
}
else
{
Tabs.SetTabVisible(i, false);
- tab.Visible = false;
}
}
From d442be160d8a09579f265cb85382f058719ecda6 Mon Sep 17 00:00:00 2001
From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Date: Wed, 8 May 2024 01:46:03 -0500
Subject: [PATCH 031/215] Shoot Over Racks (#27797)
Racks now have table collisions
---
Resources/Prototypes/Entities/Structures/Storage/storage.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Resources/Prototypes/Entities/Structures/Storage/storage.yml b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
index 79a1e357998..d0b468ca53d 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/storage.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/storage.yml
@@ -27,9 +27,9 @@
bounds: "-0.3,-0.3,0.3,0.3"
density: 140
mask:
- - MachineMask
+ - TableMask
layer:
- - MachineLayer
+ - TableLayer
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
From d6406eafef90852c90116d0ebc5f88154bf6e4ec Mon Sep 17 00:00:00 2001
From: Verm <32827189+Vermidia@users.noreply.github.com>
Date: Wed, 8 May 2024 01:46:48 -0500
Subject: [PATCH 032/215] Fix cak and breaddog not being able to escape
inventories (#27794)
Fix cak and breaddog
---
.../Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml | 1 +
.../Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml | 1 +
2 files changed, 2 insertions(+)
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
index 71b3066a265..e40ac40a289 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -829,6 +829,7 @@
- type: Puller
needsHands: false
- type: Examiner
+ - type: DoAfter
- type: CombatMode
- type: MeleeWeapon
soundHit:
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
index cbb9ff2c45b..c939dec52c6 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -691,6 +691,7 @@
- type: Puller
needsHands: false
- type: Examiner
+ - type: DoAfter
- type: CombatMode
- type: MeleeWeapon
soundHit:
From 0e8c8110d1af646e38d7e94bfe6d127bddd18b86 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 8 May 2024 06:47:10 +0000
Subject: [PATCH 033/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 96ce6aed314..bc1f2b6dd65 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,14 +1,4 @@
Entries:
-- author: lzk228
- changes:
- - message: Engineering structures orders in cargo now supplied via flatpacks (e.g.
- tesla & singulo generators, other stuff for them).
- type: Tweak
- - message: Thrusters and gyroscopes now supplied in crates via flatpacks.
- type: Tweak
- id: 6052
- time: '2024-02-28T22:02:02.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25647
- author: c4llv07e
changes:
- message: Cryo won't remove you from the new body if you chose a new ghost role
@@ -3855,3 +3845,10 @@
id: 6551
time: '2024-05-08T00:25:41.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/26746
+- author: Cojoke-dot
+ changes:
+ - message: You can now shoot over racks
+ type: Tweak
+ id: 6552
+ time: '2024-05-08T06:46:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27797
From bf559f6e275bde59c5f5d7cb14dc452b8cd19497 Mon Sep 17 00:00:00 2001
From: ShadowCommander
Date: Tue, 7 May 2024 23:49:28 -0700
Subject: [PATCH 034/215] Fix pull not stopping when character is downed
(#27796)
---
.../Movement/Pulling/Systems/PullingSystem.cs | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
index 3c265d5a027..81b2fee5695 100644
--- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
+++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs
@@ -13,6 +13,7 @@
using Content.Shared.Movement.Pulling.Events;
using Content.Shared.Movement.Systems;
using Content.Shared.Pulling.Events;
+using Content.Shared.Standing;
using Content.Shared.Throwing;
using Content.Shared.Verbs;
using Robust.Shared.Containers;
@@ -62,6 +63,7 @@ public override void Initialize()
SubscribeLocalEvent(OnPullerUnpaused);
SubscribeLocalEvent(OnVirtualItemDeleted);
SubscribeLocalEvent(OnRefreshMovespeed);
+ SubscribeLocalEvent(OnDropHandItems);
CommandBinds.Builder
.Bind(ContentKeyFunctions.MovePulledObject, new PointerInputCmdHandler(OnRequestMovePulledObject))
@@ -69,6 +71,17 @@ public override void Initialize()
.Register();
}
+ private void OnDropHandItems(EntityUid uid, PullerComponent pullerComp, DropHandItemsEvent args)
+ {
+ if (pullerComp.Pulling == null || pullerComp.NeedsHands)
+ return;
+
+ if (!TryComp(pullerComp.Pulling, out PullableComponent? pullableComp))
+ return;
+
+ TryStopPull(pullerComp.Pulling.Value, pullableComp, uid);
+ }
+
private void OnPullerContainerInsert(Entity ent, ref EntGotInsertedIntoContainerMessage args)
{
if (ent.Comp.Pulling == null) return;
From 49e26b17829f195928d513d7b8addc7dd9e314ef Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 8 May 2024 06:50:34 +0000
Subject: [PATCH 035/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bc1f2b6dd65..e078db59e76 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
Entries:
-- author: c4llv07e
- changes:
- - message: Cryo won't remove you from the new body if you chose a new ghost role
- before cryo deleted your old body.
- type: Fix
- id: 6053
- time: '2024-02-28T22:09:02.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/24991
- author: Nairodian
changes:
- message: You can now remove the rust from reinforced walls with a welder.
@@ -3852,3 +3844,10 @@
id: 6552
time: '2024-05-08T06:46:04.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27797
+- author: ShadowCommander
+ changes:
+ - message: Lizards now stop tail pulling when they are downed.
+ type: Fix
+ id: 6553
+ time: '2024-05-08T06:49:28.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27796
From 540aeb289f69d35b35b64d644170fd2cef528b20 Mon Sep 17 00:00:00 2001
From: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com>
Date: Wed, 8 May 2024 09:57:21 +0300
Subject: [PATCH 036/215] Secoff senior uniform fix (#27775)
* weh.
* get the weh out of my repository
* add best lizard figurine
* remove umbra stuff from master
* remove the additional pixels from the senior secoff jumpskirt sprite
* fix the fix
---
.../equipped-INNERCLOTHING.png | Bin 1316 -> 1245 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
index b3ecbd97129997ad4c081960cc16e9231023ace4..7dce3cbc9b1d6851e24e3f95c75047d1e19824f9 100644
GIT binary patch
delta 1205
zcmV;m1WNm)3f&2iBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%m=a!Eu%RCr$P
zn$JsAQ546Izsk`8Ar%o7GzEolA`){U;i80yf*`P+yB0w~iyb4V
zk%XWLk&OfiPD&VqxEdLMl*%;U+nnk8oMzs6zV{5e9~kbB_vU`jIrqLd=s9FC7z_r3
z!C(*&4u?~juEIL@n%>@j-jwx|xg@42)7oOFxlIXu>}aFT&Q6L%B1Le1VPS#JeOXfX
zjI1n))|3GK*79|kAsd{ysfxZlq)~Nx@){Zmz6SLrICc
z_HJ|2lOS02;q2E7=jrtO56XF``o)bsC*Sa|VR=(Z4qguAR5P6>!jy{}=_w~~H>nSxKDlJv5
z{u1Ko16=1LdzANofv(T%V{JYWI($#r~t
zx|$Lj8&q6eO!M>es>K-dxb7uZ{k65VBkPL-0GgVbsJ6D2y1Kd!w3zn;xAkoYpuN34
z1);jSIyFZ0dwP0kc6L^^%gf8u-QBJ3Q#ZH_*2VhJ(RE=5fL*XpsxLYLEiEkv9AHp5Agr&iD-lE+(MLNs
zH>c+K+Vu3a>%Ro}lb6>=%Z~%wp=bUjAgn~#I@5J#n$YINEc#9m1z=`ohTdGcmMuQu3@pTBu~>HOCCb^f
z7CWqKI@t(O08k*o!szEpi~9+*VFTmj6o>-A4zts2K(2}nud&u8uw8mU>>zq$BPnsB
ztSmG7Lm&{y)(eb}k9+znFfcHX;+ll*^vBA7&)r>7f<*i)P@R4QLqu=&dI7J|YZ7wV
zB1Ig4a7e)Cd?127|#aM85#$L_`}9
Tg<@cy00000NkvXXu0mjfQIt&a
delta 1278
zcmVYXc~GI%D|?*eQN^fNd(NGg>IB$G*ZdwZJ?Uc3ZgHv3X(PF4NBa2U&RkT^tF&a3Lz
zJa{J7@7`@~1z@jK;+I%AhlhtmA`w2x?$Tu#0IU`YO-VwfzU4T)8of>L;|==4;kxyM
zD&nh!0svixakA*Hf38!DzuVgCRZ63%)ED;m_sgEwqkmxn=H}+y2alH6E0stWi|mz3
zz)2E1Iy$_?%j-ZxlOSaec>0#(&=(HV*4E~gzF+^rqb26%=4#TvFag=w6ab|!KL_yc
zze?nM>n}b7{*C)0&b?Rsn@(4lkO2IPm2r}kh23l*T`aO%D4ZIn
zieG4$0wqVl<1g-uRAe(+tPv))%PRp)gac)Rn$MOSyt1&2UO|{m(j23V^9c%LfmR^XaC@U
zU@*wm))v8Fko|)LZnd`)3SC%Gm!eYNw(U#nD6(gG#MTqE<5)0^eBthL!QGd4CxCX-=gWQ0T_f6-!Ro3b3cwm
zyspfRufMwTMEDo}*SFt!vHW&;sGJ0)!BgEae^(lx(vp(LOYgr&@8gZ8Iz-^4Vft$H
zHus)Br^_%{EfhS1g!BVdlAzoeiOnP#_~Uo4AGcR3(PbFid-|M%srwB#NBEhE^}7dC
z_r1l7CqVoG;vi8$DFGinoMCculEuYEaueeWg+iWqWtX;@_?x2Atv<`Qa1lz)w6(Q0
ze~j;cAnQ0VG46GWEyuwEEX%@ZP*=Db>0*(RWtEvF{9Ryiuc)9@0r}+>FVp$ul`^lu
z=0HEjvln&k#I>@pn++JxUa&dP50v{7;B5EGc_>vtr8%O~D{z%m`V#yOk_Cl%loIgk
z4TE;M1&07*qoM6N<$f=N4s-v9sr
From cf43305d9ee4262c7d6e14f9c83e12446cdc9e60 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Wed, 8 May 2024 00:30:03 -0700
Subject: [PATCH 037/215] Reimplement supplybots as non-vehicles (#27769)
* Reimplement supplybots as non-vehicles
* what the hell is a container container?
* Dumpable
* let them hear supply comms
* unmigrate
* no more QM access
* Skill issue
---------
Co-authored-by: plykiya
---
Resources/Migrations/migration.yml | 2 +-
.../Prototypes/Entities/Mobs/NPCs/silicon.yml | 54 +++++++++++++++++++
.../Crafting/Graphs/bots/supplybot.yml | 23 ++++++++
3 files changed, 78 insertions(+), 1 deletion(-)
create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
diff --git a/Resources/Migrations/migration.yml b/Resources/Migrations/migration.yml
index 99b24d98c22..974fca5effb 100644
--- a/Resources/Migrations/migration.yml
+++ b/Resources/Migrations/migration.yml
@@ -188,7 +188,7 @@ ActionVehicleHorn: null
CrateFunATV: null
CrateFunSyndicateSegway: null
MobTaxiBot: null
-MobSupplyBot: null
+# MobSupplyBot: null
SpawnVehicleMotobike: null
SpawnVehicleATV: null
SpawnVehicleSecway: null
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 2423082fd8d..b405a67d069 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -327,3 +327,57 @@
interactFailureString: petting-failure-mimebot
- type: Inventory
templateId: head
+
+- type: entity
+ parent: MobSiliconBase
+ id: MobSupplyBot
+ name: supplybot
+ description: Delivers cargo!
+ components:
+ - type: Sprite
+ sprite: Mobs/Silicon/Bots/supplybot.rsi
+ layers:
+ - state: supplybot
+ - type: GhostRole
+ name: ghost-role-information-supplybot-name
+ description: ghost-role-information-supplybot-description
+ - type: Construction
+ graph: SupplyBot
+ node: bot
+ - type: Access
+ tags:
+ - Cargo
+ - Maintenance
+ - Salvage
+ - type: Dumpable
+ - type: Storage
+ maxItemSize: Huge
+ grid:
+ - 0,0,9,3
+ - type: UserInterface
+ interfaces:
+ enum.StorageUiKey.Key:
+ type: StorageBoundUserInterface
+ - type: ContainerContainer
+ containers:
+ storagebase: !type:Container
+ ents: []
+ - type: UnpoweredFlashlight
+ - type: PointLight
+ enabled: false
+ radius: 3.5
+ softness: 2
+ mask: /Textures/Effects/LightMasks/cone.png
+ autoRot: true
+ - type: FootstepModifier
+ footstepSoundCollection:
+ collection: FootstepBorg
+ - type: Tag
+ tags:
+ - DoorBumpOpener
+ - FootstepSound
+ - type: ActiveRadio
+ channels:
+ - Binary
+ - Common
+ - Supply
diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
new file mode 100644
index 00000000000..efabb849bbc
--- /dev/null
+++ b/Resources/Prototypes/Recipes/Crafting/Graphs/bots/supplybot.yml
@@ -0,0 +1,23 @@
+- type: constructionGraph
+ id: SupplyBot
+ start: start
+ graph:
+ - node: start
+ edges:
+ - to: bot
+ steps:
+ - tag: ProximitySensor
+ icon:
+ sprite: Objects/Misc/proximity_sensor.rsi
+ state: icon
+ name: proximity sensor
+ - tag: BorgHead
+ icon:
+ sprite: Objects/Specific/Robotics/cyborg_parts.rsi
+ state: borg_head
+ name: borg head
+ doAfter: 1
+ - material: Steel
+ amount: 10
+ - node: bot
+ entity: MobSupplyBot
From 5007684cecb361bb8db483c887599f4d3f853528 Mon Sep 17 00:00:00 2001
From: PJBot
Date: Wed, 8 May 2024 07:31:59 +0000
Subject: [PATCH 038/215] Automatic changelog update
---
Resources/Changelog/Changelog.yml | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index e078db59e76..87acc64faf7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,18 +1,4 @@
Entries:
-- author: Nairodian
- changes:
- - message: You can now remove the rust from reinforced walls with a welder.
- type: Fix
- id: 6054
- time: '2024-02-29T00:44:01.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25690
-- author: Ubaser
- changes:
- - message: Eris UI theme has been removed.
- type: Remove
- id: 6055
- time: '2024-02-29T05:53:48.0000000+00:00'
- url: https://github.com/space-wizards/space-station-14/pull/25673
- author: Rainfey
changes:
- message: Disallow multiple antag roles per player
@@ -3851,3 +3837,17 @@
id: 6553
time: '2024-05-08T06:49:28.0000000+00:00'
url: https://github.com/space-wizards/space-station-14/pull/27796
+- author: Plykiya
+ changes:
+ - message: Re-added supplybots.
+ type: Add
+ id: 6554
+ time: '2024-05-08T07:30:04.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27769
+- author: Hobbitmax
+ changes:
+ - message: Replaced Syndicate Jaws Of Life with a Pyjama bundle on the Train map.
+ type: Tweak
+ id: 6555
+ time: '2024-05-08T07:30:53.0000000+00:00'
+ url: https://github.com/space-wizards/space-station-14/pull/27734
From 094ea59b956c6649615efcb4c571108284af223b Mon Sep 17 00:00:00 2001
From: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Date: Wed, 8 May 2024 19:18:03 +1000
Subject: [PATCH 039/215] Added new HTN operations and preconditions (#27486)
* Added new HTN operations & preconditions
* Ok I forgot about partial
* Namespace pierce the skies
* Some fixes, debug and new operators
* Bruh git eat my files
---
.../HTN/Preconditions/GunAmmoPrecondition.cs | 2 +-
.../Preconditions/KeyNotExistsPrecondition.cs | 12 +++
.../Math/KeyBoolEqualsPrecondition.cs | 23 +++++
.../Math/KeyFloatEqualsPrecondition.cs | 18 ++++
.../Math/KeyFloatGreaterPrecondition.cs | 17 ++++
.../Math/KeyFloatLessPrecondition.cs | 17 ++++
.../Operators/Math/AddFloatOperator.cs | 33 +++++++
.../Operators/Math/SetBoolOperator.cs | 28 ++++++
.../Operators/{ => Math}/SetFloatOperator.cs | 18 ++--
.../Operators/Math/SetRandomFloatOperator.cs | 34 +++++++
.../Operators/PlaySoundOperator.cs | 28 ++++++
.../Operators/SayKeyOperator.cs | 36 ++++++++
.../Entities/Mobs/Debugging/debug_counter.yml | 53 +++++++++++
Resources/Prototypes/NPCs/debug.yml | 90 +++++++++++++++++++
14 files changed, 401 insertions(+), 8 deletions(-)
create mode 100644 Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
create mode 100644 Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
create mode 100644 Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
create mode 100644 Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
create mode 100644 Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
rename Content.Server/NPC/HTN/PrimitiveTasks/Operators/{ => Math}/SetFloatOperator.cs (52%)
create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
create mode 100644 Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
create mode 100644 Resources/Prototypes/Entities/Mobs/Debugging/debug_counter.yml
create mode 100644 Resources/Prototypes/NPCs/debug.yml
diff --git a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
index fe3b844ae34..58647d88749 100644
--- a/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
+++ b/Content.Server/NPC/HTN/Preconditions/GunAmmoPrecondition.cs
@@ -35,7 +35,7 @@ public override bool IsMet(NPCBlackboard blackboard)
else
percent = ammoEv.Count / (float) ammoEv.Capacity;
- percent = Math.Clamp(percent, 0f, 1f);
+ percent = System.Math.Clamp(percent, 0f, 1f);
if (MaxPercent < percent)
return false;
diff --git a/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
new file mode 100644
index 00000000000..c12663901c7
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/KeyNotExistsPrecondition.cs
@@ -0,0 +1,12 @@
+namespace Content.Server.NPC.HTN.Preconditions;
+
+public sealed partial class KeyNotExistsPrecondition : HTNPrecondition
+{
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ public override bool IsMet(NPCBlackboard blackboard)
+ {
+ return !blackboard.ContainsKey(Key);
+ }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
new file mode 100644
index 00000000000..8c7920e8be5
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyBoolEqualsPrecondition.cs
@@ -0,0 +1,23 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+///
+/// Checks for the presence of data in the blackboard and makes a comparison with the specified boolean
+///
+public sealed partial class KeyBoolEqualsPrecondition : HTNPrecondition
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ [DataField(required: true)]
+ public bool Value;
+
+ public override bool IsMet(NPCBlackboard blackboard)
+ {
+ if (!blackboard.TryGetValue(Key, out var value, _entManager))
+ return false;
+
+ return Value == value;
+ }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
new file mode 100644
index 00000000000..802fdaf2b9c
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatEqualsPrecondition.cs
@@ -0,0 +1,18 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatEqualsPrecondition : HTNPrecondition
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ [DataField(required: true)]
+ public float Value;
+
+ public override bool IsMet(NPCBlackboard blackboard)
+ {
+ return blackboard.TryGetValue(Key, out var value, _entManager) &&
+ MathHelper.CloseTo(value, value);
+ }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
new file mode 100644
index 00000000000..3a9ac366980
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatGreaterPrecondition.cs
@@ -0,0 +1,17 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatGreaterPrecondition : HTNPrecondition
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ [DataField(required: true)]
+ public float Value;
+
+ public override bool IsMet(NPCBlackboard blackboard)
+ {
+ return blackboard.TryGetValue(Key, out var value, _entManager) && value > Value;
+ }
+}
diff --git a/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
new file mode 100644
index 00000000000..5cd51d7a7c5
--- /dev/null
+++ b/Content.Server/NPC/HTN/Preconditions/Math/KeyFloatLessPrecondition.cs
@@ -0,0 +1,17 @@
+namespace Content.Server.NPC.HTN.Preconditions.Math;
+
+public sealed partial class KeyFloatLessPrecondition : HTNPrecondition
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ [DataField(required: true)]
+ public float Value;
+
+ public override bool IsMet(NPCBlackboard blackboard)
+ {
+ return blackboard.TryGetValue(Key, out var value, _entManager) && value < Value;
+ }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
new file mode 100644
index 00000000000..00404517c9e
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/AddFloatOperator.cs
@@ -0,0 +1,33 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+///
+/// Gets the key, and adds the value to that float
+///
+public sealed partial class AddFloatOperator : HTNOperator
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [DataField(required: true)]
+ public string TargetKey = string.Empty;
+
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public float Amount;
+
+ public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard,
+ CancellationToken cancelToken)
+ {
+ if (!blackboard.TryGetValue(TargetKey, out var value, _entManager))
+ return (false, null);
+
+ return (
+ true,
+ new Dictionary
+ {
+ { TargetKey, value + Amount }
+ }
+ );
+ }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
new file mode 100644
index 00000000000..a40b96798d4
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetBoolOperator.cs
@@ -0,0 +1,28 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+///
+/// Just sets a blackboard key to a bool
+///
+public sealed partial class SetBoolOperator : HTNOperator
+{
+ [DataField(required: true)]
+ public string TargetKey = string.Empty;
+
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public bool Value;
+
+ public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard,
+ CancellationToken cancelToken)
+ {
+ return (
+ true,
+ new Dictionary
+ {
+ { TargetKey, Value }
+ }
+ );
+ }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
similarity index 52%
rename from Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs
rename to Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
index 7a460592cb4..76842b431f7 100644
--- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SetFloatOperator.cs
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetFloatOperator.cs
@@ -1,24 +1,28 @@
using System.Threading;
using System.Threading.Tasks;
-namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
///
/// Just sets a blackboard key to a float
///
public sealed partial class SetFloatOperator : HTNOperator
{
- [DataField("targetKey", required: true)] public string TargetKey = string.Empty;
+ [DataField(required: true)]
+ public string TargetKey = string.Empty;
- [ViewVariables(VVAccess.ReadWrite), DataField("amount")]
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
public float Amount;
public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard,
CancellationToken cancelToken)
{
- return (true, new Dictionary()
- {
- {TargetKey, Amount},
- });
+ return (
+ true,
+ new Dictionary
+ {
+ { TargetKey, Amount }
+ }
+ );
}
}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
new file mode 100644
index 00000000000..999756f1f74
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Math/SetRandomFloatOperator.cs
@@ -0,0 +1,34 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Robust.Shared.Random;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Math;
+
+///
+/// Sets a random float from MinAmount to MaxAmount to blackboard
+///
+public sealed partial class SetRandomFloatOperator : HTNOperator
+{
+ [Dependency] private readonly IRobustRandom _random = default!;
+
+ [DataField(required: true)]
+ public string TargetKey = string.Empty;
+
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public float MaxAmount = 1f;
+
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public float MinAmount = 0f;
+
+ public override async Task<(bool Valid, Dictionary? Effects)> Plan(NPCBlackboard blackboard,
+ CancellationToken cancelToken)
+ {
+ return (
+ true,
+ new Dictionary
+ {
+ { TargetKey, _random.NextFloat(MinAmount, MaxAmount) }
+ }
+ );
+ }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
new file mode 100644
index 00000000000..57cc2e91e44
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/PlaySoundOperator.cs
@@ -0,0 +1,28 @@
+using Robust.Server.Audio;
+using Robust.Shared.Audio;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+
+public sealed partial class PlaySoundOperator : HTNOperator
+{
+ private AudioSystem _audio = default!;
+
+ [DataField(required: true)]
+ public SoundSpecifier? Sound;
+
+ public override void Initialize(IEntitySystemManager sysManager)
+ {
+ base.Initialize(sysManager);
+
+ _audio = IoCManager.Resolve().GetEntitySystem();
+ }
+
+ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+ {
+ var uid = blackboard.GetValue(NPCBlackboard.Owner);
+
+ _audio.PlayPvs(Sound, uid);
+
+ return base.Update(blackboard, frameTime);
+ }
+}
diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
new file mode 100644
index 00000000000..d1c7d619150
--- /dev/null
+++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/SayKeyOperator.cs
@@ -0,0 +1,36 @@
+using Content.Server.Chat.Systems;
+
+namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators;
+
+public sealed partial class SayKeyOperator : HTNOperator
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ private ChatSystem _chat = default!;
+
+ [DataField(required: true)]
+ public string Key = string.Empty;
+
+ ///
+ /// Whether to hide message from chat window and logs.
+ ///
+ [DataField]
+ public bool Hidden;
+
+ public override void Initialize(IEntitySystemManager sysManager)
+ {
+ base.Initialize(sysManager);
+ _chat = IoCManager.Resolve().GetEntitySystem();
+ }
+
+ public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime)
+ {
+ if (!blackboard.TryGetValue