NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

ffix

Browse source
This commit is contained in:
Dmitry 2026-07-02 12:49:47 +07:00
parent f8bc2e5786
commit 454b818ea3
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Content.Client/Corvax/ExportSprites/EntityScreenshotGenerator.cs
View file

@ -32,7 +32,6 @@ public sealed partial class EntityScreenshotGenerator
[Dependency] private IGameController _gameController = default!;
[Dependency] private IClientGameTiming _gameTiming = default!;
[Dependency] private ILogManager _logManager = default!;
[Dependency] private IMapManager _mapManager = default!;
[Dependency] private IPrototypeManager _prototypeManager = default!;
[Dependency] private IResourceManager _resourceManager = default!;
[Dependency] private ISerializationManager _serialization = default!;
@ -132,7 +131,7 @@ public sealed partial class EntityScreenshotGenerator
.OrderBy(proto => proto.ID)
.ToList();
var previewMap = mapSystem.CreateMap(out var mapId);
var previewGrid = _mapManager.CreateGridEntity(mapId);
var previewGrid = mapSystem.CreateGridEntity(mapId);
if (!_resourceManager.UserData.IsDir(outputDir))
_resourceManager.UserData.CreateDir(outputDir);

2
Content.Server/Corvax/TTS/VoiceMaskSystem.TTS.cs
View file

@ -23,7 +23,7 @@ public partial class VoiceMaskSystem
private void OnChangeVoice(Entity<VoiceMaskComponent> entity, ref VoiceMaskChangeVoiceMessage msg)
{
if (msg.Voice is { } id && !_proto.HasIndex<TTSVoicePrototype>(id))
if (msg.Voice is { } id && !ProtoMan.HasIndex<TTSVoicePrototype>(id))
return;
entity.Comp.VoiceId = msg.Voice;

16
Content.Shared/Humanoid/NamingSystem.cs
View file

@ -49,14 +49,14 @@ namespace Content.Shared.Humanoid
switch (gender)
{
case Gender.Male:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
case Gender.Female:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
default:
if (_random.Prob(0.5f))
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleFirstNames));
else
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleFirstNames));
}
}
@ -66,14 +66,14 @@ namespace Content.Shared.Humanoid
switch (gender)
{
case Gender.Male:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
case Gender.Female:
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
default:
if (_random.Prob(0.5f))
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.MaleLastNames));
else
return _random.Pick(_prototypeManager.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
return _random.Pick(ProtoMan.Index<LocalizedDatasetPrototype>(speciesProto.FemaleLastNames));
}
}
// Corvax-LastnameGender-End