juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream

Browse Source 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
This commit is contained in:
Ed
2025-07-08 00:40:30 +03:00
parent e7b73354ab 2181585030
commit 7a8326d41e
920 changed files with 19950 additions and 9262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs
View File

@@ -95,7 +95,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
foreach (var entity in target.Value.storageComponent.Contents.ContainedEntities.ToArray())
{
if (EntityManager.HasComponent<MindContainerComponent>(entity))
if (HasComp<MindContainerComponent>(entity))
{
if (!component.BehaviorProperties.TransportSentient)
continue;
@@ -312,7 +312,7 @@ public sealed class BluespaceLockerSystem : EntitySystem
if (component.BehaviorProperties.TransportEntities || component.BehaviorProperties.TransportSentient)
foreach (var entity in entityStorageComponent.Contents.ContainedEntities.ToArray())
{
if (EntityManager.HasComponent<MindContainerComponent>(entity))
if (HasComp<MindContainerComponent>(entity))
{
if (!component.BehaviorProperties.TransportSentient)
continue;

2
Content.Server/Storage/EntitySystems/ItemCounterSystem.cs
View File

@@ -13,7 +13,7 @@ namespace Content.Server.Storage.EntitySystems
[Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!;
protected override int? GetCount(ContainerModifiedMessage msg, ItemCounterComponent itemCounter)
{
if (!EntityManager.TryGetComponent(msg.Container.Owner, out StorageComponent? component))
if (!TryComp(msg.Container.Owner, out StorageComponent? component))
{
return null;
}

4
Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Storage.EntitySystems
// Calculate the average price of the possible spawned items
args.Price += _pricing.GetPrice(protUid) * entry.SpawnProbability * entry.GetAmount(getAverage: true);
EntityManager.DeleteEntity(protUid);
Del(protUid);
}
foreach (var group in orGroups)
@@ -54,7 +54,7 @@ namespace Content.Server.Storage.EntitySystems
(entry.SpawnProbability / group.CumulativeProbability) *
entry.GetAmount(getAverage: true);
EntityManager.DeleteEntity(protUid);
Del(protUid);
}
}