Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream, part 3 #192

Merged
merged 233 commits into from
Jul 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
233 commits
Select commit Hold shift + click to select a range
74df2a3
Try fix even more random mind test failures (#17581)
ElectroJr Jun 23, 2023
476f780
22 New Cargo Bounties (#17582)
EmoGarbage404 Jun 23, 2023
7bb0f36
Automatic changelog update
PJBot Jun 23, 2023
12a44bf
uranium spears make damage sounds (#17575)
JustinTrotter Jun 23, 2023
ecf9206
make mining drills weldable and have struct damage (#17576)
JustinTrotter Jun 23, 2023
6bfccca
encryption-key-component.ftl locale update (#17557)
lzk228 Jun 23, 2023
17254ec
Replace flare ammo with incendiary ammo in Zombie bundle (#17558)
FluidRock Jun 23, 2023
5e83956
Fix jumpskirt parents (#17552)
lzk228 Jun 23, 2023
6d52ca1
Automatic changelog update
PJBot Jun 23, 2023
4bd6f92
add signaler logs (#17556)
Chief-Engineer Jun 23, 2023
9792116
janitorial trolley speed buff (#17524)
CrigCrag Jun 23, 2023
62dc357
Automatic changelog update
PJBot Jun 23, 2023
bdbd01f
node scanner resprite (#17609)
EmoGarbage404 Jun 24, 2023
c64cce4
Automatic changelog update
PJBot Jun 24, 2023
032399c
Change QM's supervisor to Captain (#17605)
crazybrain23 Jun 24, 2023
64a5f2e
Automatic changelog update
PJBot Jun 24, 2023
5d126d7
Remove some dupe prototype components (#17551)
lzk228 Jun 24, 2023
4890778
Artifexium (#17604)
EmoGarbage404 Jun 24, 2023
3e03418
Allow changing alert level delay. (#17435)
PJB3005 Jun 24, 2023
4d493ba
Automatic changelog update
PJBot Jun 24, 2023
f5bd24f
Clean up PDA event subscriptions. (#17434)
PJB3005 Jun 24, 2023
46e9623
Seeds of fly agarics Amanita EMAG (#17598)
Nimfar11 Jun 24, 2023
2b7a304
Automatic changelog update
PJBot Jun 24, 2023
4ae80fb
Issue#15607-Audio/Ambience (#17327)
dakimasu Jun 24, 2023
694ba69
fix galaxythistle bounty locale (#17594)
EmoGarbage404 Jun 24, 2023
ecae023
Remove TickerLobbyReadyEvent (#17522)
ElectroJr Jun 24, 2023
de07c2b
Adds Health Analyzer to Chem PDA (#17603)
LankLTE Jun 24, 2023
084cb7b
Automatic changelog update
PJBot Jun 24, 2023
fcb6516
Hotplate overhaul (#17586)
0x6273 Jun 24, 2023
aea3bf9
Automatic changelog update
PJBot Jun 24, 2023
4c15474
[Sprite] Fix an error in the flannel sprite. (#17618)
OctoRocket Jun 24, 2023
2b7cc01
Capgun Ammo Recolor (#17617)
Alekshhh Jun 24, 2023
f108763
Automatic changelog update
PJBot Jun 24, 2023
8ce0370
Commit trolling (#17607)
misandrie Jun 24, 2023
eec74aa
saltern 4.13 (#17606)
deltanedas Jun 24, 2023
a88c16f
bounty computer + minor deletions/fixes (#17597)
Scribbles0 Jun 24, 2023
25bd1eb
cargo bounty computer (#17596)
Scribbles0 Jun 24, 2023
9fc8d9f
Automatic changelog update
PJBot Jun 24, 2023
c9f6f63
drugs (#17588)
Alekshhh Jun 24, 2023
ee98de4
Automatic changelog update
PJBot Jun 24, 2023
809255f
give regular crowbar same damage as emergency (#17284)
deltanedas Jun 24, 2023
826a015
Automatic changelog update
PJBot Jun 24, 2023
20b55d7
gbookcommits (#17611)
Myakot Jun 24, 2023
204f6ca
Automatic changelog update
PJBot Jun 24, 2023
bbd8ce8
Replays: final boss (#17621)
PJB3005 Jun 24, 2023
7af0ae5
Update Engine (#17622)
moonheart08 Jun 25, 2023
a276b49
Fix replay eye rotation bug (#17625)
ElectroJr Jun 25, 2023
0d086df
Update submodule to 131.1.0 (#17633)
metalgearsloth Jun 25, 2023
5c60a27
Make item size scale with stack size (#17623)
EmoGarbage404 Jun 25, 2023
09d327c
Automatic changelog update
PJBot Jun 25, 2023
c82d1b4
Fix some MapPainter warnings (#17639)
metalgearsloth Jun 25, 2023
7cdfaa0
Procgen asteroids for salvage magnet (#17547)
EmoGarbage404 Jun 25, 2023
4af4a23
Automatic changelog update
PJBot Jun 25, 2023
cb24d88
funny rock... (#17644)
Alekshhh Jun 25, 2023
082aed2
Automatic changelog update
PJBot Jun 25, 2023
6f76ae4
Try fix time offset serialization issues (#17580)
ElectroJr Jun 25, 2023
6a3dc3c
Update engine (#17650)
ElectroJr Jun 25, 2023
ee5eeb9
Adds no access freezer. (#17638)
IamVelcroboy Jun 25, 2023
309fa1a
Add beachball and basketball tweaks (#17285)
lzk228 Jun 26, 2023
bf15bf2
Automatic changelog update
PJBot Jun 26, 2023
06fc012
don't require salvage map prototypes to specify their bounds (#17652)
EmoGarbage404 Jun 26, 2023
5b76549
Disallow tile placement close to grids (#17058)
metalgearsloth Jun 26, 2023
1005c02
Automatic changelog update
PJBot Jun 26, 2023
4c8965a
CVar to promotehost automatically. (#17643)
PJB3005 Jun 26, 2023
25d459a
Add solar tracker electronics to the circuit printer (#17637)
Nimfar11 Jun 26, 2023
335ee13
Taco! (#17635)
lzk228 Jun 26, 2023
b7d10d7
Automatic changelog update
PJBot Jun 26, 2023
2929108
Automatic changelog update
PJBot Jun 26, 2023
7ab5226
Block `TickerJoinGameEvent` in replays (#17649)
ElectroJr Jun 26, 2023
5a85575
bounities (#17628)
Just-a-Unity-Dev Jun 26, 2023
3c1456c
Renames HoS's Trenchcoat (#17573)
LankLTE Jun 26, 2023
604d663
Automatic changelog update
PJBot Jun 26, 2023
a2425cf
Merge pull request #186 from MilenVolf/master-ru
AruMoon Jun 26, 2023
4f7e812
More atmos tweaks (#17656)
CrigCrag Jun 26, 2023
56a363a
Automatic changelog update
PJBot Jun 26, 2023
33f823e
Add alternative emotes channel (#15965)
BasedUser Jun 26, 2023
0b819e7
Automatic changelog update
PJBot Jun 26, 2023
fc939eb
Little experiment. (#17667)
moonheart08 Jun 26, 2023
1056e7b
buff grilles (#17663)
Chief-Engineer Jun 27, 2023
0fdba7f
Automatic changelog update
PJBot Jun 27, 2023
3fa8f90
small update (#17672)
Emisse Jun 27, 2023
3982037
Add Eva crate (#16957)
lzk228 Jun 27, 2023
4475d11
Automatic changelog update
PJBot Jun 27, 2023
b3d395f
Fix badly parsing changelog (#17674)
mirrorcult Jun 27, 2023
cca1a78
Dungeon generation refactor (#17121)
metalgearsloth Jun 27, 2023
64700ef
Automatic changelog update
PJBot Jun 27, 2023
0b8b107
add ability to edit ghost colors (#17662)
Chief-Engineer Jun 27, 2023
0c260e8
Remove landing pad from expeditions (#17681)
metalgearsloth Jun 27, 2023
022ae5d
Automatic changelog update
PJBot Jun 27, 2023
46a0f17
Update submodule to 132.0.1 (#17684)
metalgearsloth Jun 27, 2023
1485666
Ambient music fixes (#17685)
metalgearsloth Jun 27, 2023
4e22325
Automatic changelog update
PJBot Jun 27, 2023
55f57cf
Fix ghost transparency (#17686)
Chief-Engineer Jun 27, 2023
3e00b44
Make basalt clickable (#17689)
metalgearsloth Jun 27, 2023
4d1ab16
Don't disable NPCs in debug (#17690)
metalgearsloth Jun 27, 2023
9011018
Fix a bunch of logger warnings (#17691)
metalgearsloth Jun 27, 2023
76cd2be
bagel hotfix (#17700)
Emisse Jun 27, 2023
6fb7879
Stack storage fixes (#17651)
EmoGarbage404 Jun 28, 2023
19864b4
Automatic changelog update
PJBot Jun 28, 2023
044d5f6
Status Icons (#17529)
EmoGarbage404 Jun 28, 2023
388b3e9
More Pirate Accenting (#17564)
Alekshhh Jun 28, 2023
0d326ac
Automatic changelog update
PJBot Jun 28, 2023
abc2e04
mining shuttle poor (#17701)
Emisse Jun 28, 2023
72607f3
add device linking logs (#17555)
Chief-Engineer Jun 28, 2023
fb126d2
Refactor TriggerSystem.Proximity (#17554)
Vordenburg Jun 28, 2023
ca47e7f
Nerf folding chair (#17699)
EmoGarbage404 Jun 28, 2023
689aa53
Automatic changelog update
PJBot Jun 28, 2023
f9c97e4
welder stuff (#17476)
deltanedas Jun 28, 2023
30841fc
Automatic changelog update
PJBot Jun 28, 2023
684cf3c
Add leech to crusher (#17683)
metalgearsloth Jun 28, 2023
e64f567
Automatic changelog update
PJBot Jun 28, 2023
74b4f2b
Disable smoke reactions (#17693)
metalgearsloth Jun 28, 2023
7c26480
Turns 90% of vomit into actual vomit (#17697)
Arendian Jun 28, 2023
fc29d0b
Automatic changelog update
PJBot Jun 28, 2023
bccee55
Mateba and Decard buff (#17631)
Jackal298 Jun 28, 2023
3794d1c
Automatic changelog update
PJBot Jun 28, 2023
a372661
make it even more obvious extracting is good (#17487)
deltanedas Jun 28, 2023
9c976d5
Add space lube tube (#17387)
Slava0135 Jun 28, 2023
0457325
Automatic changelog update
PJBot Jun 28, 2023
2488dd4
salvage updatety (#17705)
Emisse Jun 28, 2023
44a3db3
Draw MapAtmosphere gasses (#17688)
metalgearsloth Jun 28, 2023
c25f3f0
Automatic changelog update
PJBot Jun 28, 2023
2f85b5e
Little NodeContainer ECS (#17702)
ficcialfaint Jun 28, 2023
4fefd8b
Add snow rocks to planets (#17692)
metalgearsloth Jun 28, 2023
6380268
Automatic changelog update
PJBot Jun 28, 2023
d9de405
ECS AME (#16779)
TemporalOroboros Jun 28, 2023
9cec323
Add basalt walls for lavaland (#17709)
metalgearsloth Jun 28, 2023
200ef24
Automatic changelog update
PJBot Jun 28, 2023
d75d715
ListObjectivesCommand localisation and completion (#17630)
crazybrain23 Jun 28, 2023
b1f7b15
Automatic changelog update
PJBot Jun 28, 2023
9cd8d25
more expedition changes (#17403)
deltanedas Jun 28, 2023
0212aee
Automatic changelog update
PJBot Jun 28, 2023
d0a9cce
Adds Lead & Zinc, nerfs Licoxide. (#17703)
LankLTE Jun 28, 2023
5bbe13a
Automatic changelog update
PJBot Jun 28, 2023
b6c1c34
hopefully make salvage more reliable (#17712)
EmoGarbage404 Jun 28, 2023
11eff74
Automatic changelog update
PJBot Jun 28, 2023
6d31d50
It's no longer possible to unbuckle if you are handcuffed (#17698)
DadeKuma Jun 28, 2023
5e222d6
Automatic changelog update
PJBot Jun 28, 2023
ad25305
Minor tweak to mercenary item sprites (#17713)
Jackal298 Jun 28, 2023
d8857f2
Bounty balance tweaks (#17711)
EmoGarbage404 Jun 28, 2023
cb2b895
Automatic changelog update
PJBot Jun 28, 2023
02c8544
Update speech_emote_sounds.yml (#17627)
lzk228 Jun 28, 2023
afa886d
Automatic changelog update
PJBot Jun 28, 2023
ba753d0
Pulling fasto (#17696)
EmoGarbage404 Jun 28, 2023
367a065
Nerf it. (#17673)
LankLTE Jun 28, 2023
568d7d0
Automatic changelog update
PJBot Jun 28, 2023
23f36b9
Janitor trolley bandaid (#17714)
themias Jun 28, 2023
2465794
Automatic changelog update
PJBot Jun 28, 2023
af19754
Removes all remaining "netsync: false"s (#17543)
Aexxie Jun 28, 2023
9e8c2f2
comit (#17532)
lzk228 Jun 28, 2023
562dd36
Automatic changelog update
PJBot Jun 28, 2023
e2823d8
Revert "It's no longer possible to unbuckle if you are handcuffed" (#…
AJCM-git Jun 28, 2023
5212fc5
No unbuckling while cuffed (#17719)
EmoGarbage404 Jun 29, 2023
c116fac
Automatic changelog update
PJBot Jun 29, 2023
dd17ac1
troooo (#17728)
Emisse Jun 29, 2023
cacf26d
Fix lubed item smart equip (#17727)
Slava0135 Jun 29, 2023
1b17286
Update toys.yml (#17725)
lzk228 Jun 29, 2023
aac717e
Automatic changelog update
PJBot Jun 29, 2023
1ca9745
fix one silly wire (#17730)
Emisse Jun 29, 2023
bc56731
Orderable chemical crates (#17616)
EmoGarbage404 Jun 29, 2023
ccf58fa
Automatic changelog update
PJBot Jun 29, 2023
67df47f
No atmos stacking (attempt 2) (#16687)
tom-leys Jun 29, 2023
c858c76
Anchorable shared (#17422)
benev0 Jun 29, 2023
6f37137
Fix cave ores (#17733)
metalgearsloth Jun 29, 2023
dbd4d89
Automatic changelog update
PJBot Jun 29, 2023
62a142b
Chameleons can mimic clown masks (#17726)
Errant-4 Jun 29, 2023
872a008
Make the remaining masks block identity (#17732)
Errant-4 Jun 29, 2023
8f5282f
make rnd console require science access (#17671)
EmoGarbage404 Jun 29, 2023
f241521
Automatic changelog update
PJBot Jun 29, 2023
e1034d0
Rod: NEW Evacuation shuttle (#17129)
UbaserB Jun 29, 2023
f0f2574
movey solar uppy (#17737)
Emisse Jun 29, 2023
6ab47da
Automatic changelog update
PJBot Jun 29, 2023
d24c75e
resave and power fixes and misc (#17738)
Emisse Jun 29, 2023
b10a7da
Guitar Smashing (#17724)
LankLTE Jun 29, 2023
70db326
Automatic changelog update
PJBot Jun 29, 2023
f2d3ea9
Hamster resprite by RamZ and hamster can wear some clothing, monkey e…
brainfood1183 Jun 29, 2023
03b03e3
Automatic changelog update
PJBot Jun 29, 2023
114a21d
change Salamander whitelist settings (#17718)
LankLTE Jun 29, 2023
0ad7720
fix welder ignoring lit (#17741)
deltanedas Jun 29, 2023
aadcc48
Better glue (#17381)
Slava0135 Jun 30, 2023
9b711d4
Automatic changelog update
PJBot Jun 30, 2023
b4fb089
Imagine if artifacts fucking killed you (#17746)
EmoGarbage404 Jun 30, 2023
b4306df
Sprite tweak for missing Monitor states for Computers in construction…
Jessetriesagain Jun 30, 2023
c6860ec
Automatic changelog update
PJBot Jun 30, 2023
ca8d905
give cargo tech salvage acces on extended (#17747)
lzk228 Jun 30, 2023
3560249
Construction Price Adjustments (#17549)
Nairodian Jun 30, 2023
df4be31
Automatic changelog update
PJBot Jun 30, 2023
cf995de
Fixed canister being unlocked and opening the Ui at the same time whe…
VocalNight Jun 30, 2023
7878162
Automatic changelog update
PJBot Jun 30, 2023
6d4c446
exploding pen tweak (#17739)
kxvvv Jun 30, 2023
b0c893e
Automatic changelog update
PJBot Jun 30, 2023
e79d82e
Fix sprite smg magazine (#17735)
Jackal298 Jun 30, 2023
7d89b9e
Automatic changelog update
PJBot Jun 30, 2023
b85c902
Added sink (#14348)
clorl Jun 30, 2023
69e1c7e
Automatic changelog update
PJBot Jun 30, 2023
53e9bc8
Fix metamorphic glass name mispredict (#16550)
themias Jun 30, 2023
78daca0
Automatic changelog update
PJBot Jun 30, 2023
2fb2375
2 (#17754)
TemporalOroboros Jun 30, 2023
aa6a0ce
Automatic changelog update
PJBot Jun 30, 2023
e7fb605
MRP Rules Update (#16938)
Nairodian Jul 1, 2023
418cf0b
Automatic changelog update
PJBot Jul 1, 2023
0f9c4df
Fix funny listener return (#17760)
metalgearsloth Jul 1, 2023
f4b61d7
Update submodule to 132.1.0 (#17766)
metalgearsloth Jul 1, 2023
432e128
Add constraint to InteractionTest Comp (#17765)
metalgearsloth Jul 1, 2023
67d7be9
Minor radiation thing (#17768)
metalgearsloth Jul 1, 2023
c2e5990
Fix NPC assert (#17770)
metalgearsloth Jul 1, 2023
6f75b18
Fix Content.Benchmark warnings (#17771)
TemporalOroboros Jul 1, 2023
47064ad
Fix changelog author names for 0x6273 (#17776)
PJB3005 Jul 1, 2023
1dadc70
Buff the Cargo Telepad Delay. (#17781)
LankLTE Jul 1, 2023
bda71dc
Network bolting for windoors (#17775)
Arendian Jul 1, 2023
e73e5cc
Make singulo artifact effect more rare (#17774)
EmoGarbage404 Jul 1, 2023
82b33bc
DamageOnHit only damages on successful hits. (#17758)
LankLTE Jul 1, 2023
6bf6723
Automatic changelog update
PJBot Jul 1, 2023
024c8fb
Makes shutters close on certain objects (#17782)
Arendian Jul 1, 2023
70d0630
Automatic changelog update
PJBot Jul 1, 2023
7bfc322
Publish changelogs via RSS (#17788)
PJB3005 Jul 2, 2023
b33e930
Chmod +x changelog RSS (#17789)
PJB3005 Jul 2, 2023
9194c54
Fix bugs when updating paper UI (#17786)
eoineoineoin Jul 2, 2023
41cf8cc
add immovable rod event (#17278)
Slava0135 Jul 2, 2023
b4a89c0
Automatic changelog update
PJBot Jul 2, 2023
a0a3738
Hamlet error on revival fix. (#17797)
brainfood1183 Jul 3, 2023
360ae67
Automatic changelog update
PJBot Jul 3, 2023
2a47302
Add secondary prefix for selecting radio channel, '.' (#16964)
HerCoyote23 Jul 3, 2023
87eab6e
Automatic changelog update
PJBot Jul 3, 2023
b3063fb
add artifact sound effects (#17792)
EmoGarbage404 Jul 3, 2023
7b739e9
Automatic changelog update
PJBot Jul 3, 2023
120e530
Merge remote-tracking branch 'space-station-14/master' into master-ru
MilenVolf Jul 3, 2023
1bb0bd8
Construction guide locale fix
MilenVolf Jul 3, 2023
60edfab
Update english locale files
MilenVolf Jul 3, 2023
8902ca5
Update russian locale files
MilenVolf Jul 3, 2023
b8e2d3a
Upstream localization
MilenVolf Jul 4, 2023
4d00ce4
Merge pull request #191 from MilenVolf/master-ru
AruMoon Jul 4, 2023
6c40375
Merge branch 'master-ru' into Test-merge
MilenVolf Jul 4, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 9 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Install dependencies
run: sudo apt-get install -y python3-paramiko

- uses: actions/checkout@v2
with:
submodules: 'recursive'
Expand Down Expand Up @@ -57,8 +60,13 @@ jobs:
key: ${{ secrets.CENTCOMM_WIZARDS_BUILDS_PUSH_KEY }}
script: /home/wizards-build-push/push.ps1 ${{ github.sha }}

- name: Publish changelog
- name: Publish changelog (Discord)
run: Tools/actions_changelogs_since_last_run.py
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}

- name: Publish changelog (RSS)
run: Tools/actions_changelog_rss.py
env:
CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }}
10 changes: 4 additions & 6 deletions Content.Benchmarks/DeviceNetworkingBenchmark.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Threading.Tasks;
using BenchmarkDotNet.Attributes;
using Content.IntegrationTests;
Expand All @@ -9,7 +8,6 @@
using Robust.Shared;
using Robust.Shared.Analyzers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Map;

namespace Content.Benchmarks;
Expand All @@ -23,8 +21,8 @@ public class DeviceNetworkingBenchmark
private DeviceNetworkSystem _deviceNetworkSystem = default!;
private EntityUid _sourceEntity;
private EntityUid _sourceWirelessEntity;
private List<EntityUid> _targetEntities = new();
private List<EntityUid> _targetWirelessEntities = new();
private readonly List<EntityUid> _targetEntities = new();
private readonly List<EntityUid> _targetWirelessEntities = new();


private NetworkPayload _payload = default!;
Expand Down Expand Up @@ -58,7 +56,7 @@ public class DeviceNetworkingBenchmark
public async Task SetupAsync()
{
ProgramShared.PathOffset = "../../../../";
_pair = await PoolManager.GetServerClient(new PoolSettings{NoClient = true, ExtraPrototypes = Prototypes});
_pair = await PoolManager.GetServerClient(new PoolSettings { NoClient = true, ExtraPrototypes = Prototypes });
var server = _pair.Pair.Server;

await server.WaitPost(() =>
Expand Down
8 changes: 4 additions & 4 deletions Content.Benchmarks/DynamicTreeBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Content.Benchmarks
[Virtual]
public class DynamicTreeBenchmark
{
private static readonly Box2[] _aabbs1 =
private static readonly Box2[] Aabbs1 =
{
((Box2) default).Enlarged(1), //2x2 square
((Box2) default).Enlarged(2), //4x4 square
Expand Down Expand Up @@ -39,11 +39,11 @@ public class DynamicTreeBenchmark
public void Setup()
{
_b2Tree = new B2DynamicTree<int>();
_tree = new DynamicTree<int>((in int value) => _aabbs1[value], capacity: 16);
_tree = new DynamicTree<int>((in int value) => Aabbs1[value], capacity: 16);

for (var i = 0; i < _aabbs1.Length; i++)
for (var i = 0; i < Aabbs1.Length; i++)
{
var aabb = _aabbs1[i];
var aabb = Aabbs1[i];
_b2Tree.CreateProxy(aabb, i);
_tree.Add(i);
}
Expand Down
6 changes: 2 additions & 4 deletions Content.Benchmarks/EntityFetchBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,7 @@ private abstract class EntityStorage<TEntity, TEntityUid> : IEntityStorage<TEnti
public TEntity GetEntity(TEntityUid entityUid)
{
if (!TryGetEntity(entityUid, out var entity))
{
throw new ArgumentException();
}
throw new ArgumentException($"Failed to get entity {entityUid} from storage.");

return entity;
}
Expand All @@ -200,7 +198,7 @@ public TEntity GetEntity(TEntityUid entityUid)
private sealed class GenEntityStorage : EntityStorage<GenEntity, GenEntityUid>
{
private (int generation, GenEntity entity)[] _entities = new (int, GenEntity)[1];
private readonly List<int> _availableSlots = new() {0};
private readonly List<int> _availableSlots = new() { 0 };

public override bool TryGetEntity(GenEntityUid entityUid, out GenEntity entity)
{
Expand Down
2 changes: 1 addition & 1 deletion Content.Benchmarks/EntityManagerGetAllComponents.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void Setup()
var componentFactory = new Mock<IComponentFactory>();
componentFactory.Setup(p => p.GetComponent<DummyComponent>()).Returns(new DummyComponent());
componentFactory.Setup(p => p.GetRegistration(It.IsAny<DummyComponent>())).Returns(dummyReg);
componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] {CompIdx.Index<DummyComponent>()});
componentFactory.Setup(p => p.GetAllRefTypes()).Returns(new[] { CompIdx.Index<DummyComponent>() });

IoCManager.RegisterInstance<IComponentFactory>(componentFactory.Object);

Expand Down
5 changes: 3 additions & 2 deletions Content.Benchmarks/MapLoadBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ public async Task Cleanup()

public static IEnumerable<string> MapsSource { get; set; }

[ParamsSource(nameof(MapsSource))] public string Map;
[ParamsSource(nameof(MapsSource))]
public string Map;

public static Dictionary<string, string> Paths;
public Dictionary<string, string> Paths;

[Benchmark]
public async Task LoadMap()
Expand Down
8 changes: 4 additions & 4 deletions Content.Benchmarks/NetSerializerIntBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class NetSerializerIntBenchmark
{
private MemoryStream _writeStream;
private MemoryStream _readStream;
private ushort _x16 = 5;
private uint _x32 = 5;
private ulong _x64 = 5;
private readonly ushort _x16 = 5;
private readonly uint _x32 = 5;
private readonly ulong _x64 = 5;
private ushort _read16;
private uint _read32;
private ulong _read64;
Expand All @@ -24,7 +24,7 @@ public void Setup()
{
_writeStream = new MemoryStream(64);
_readStream = new MemoryStream();
_readStream.Write(new byte[]{0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8});
_readStream.Write(new byte[] { 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8 });
}

[Benchmark]
Expand Down
Loading
Loading