Skip to content

Commit

Permalink
Merge pull request #2 from TGRCdev/dwarf-name-patch
Browse files Browse the repository at this point in the history
Fixed missing enum, CRLF and YML errors
  • Loading branch information
widgetbeck authored Sep 11, 2024
2 parents bda38ce + 3c5fe8e commit 1b7b608
Show file tree
Hide file tree
Showing 3 changed files with 287 additions and 287 deletions.
4 changes: 2 additions & 2 deletions Content.Shared/Humanoid/NamingSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ public string GetName(string species, Gender? gender = null)
return Loc.GetString("namepreset-firstdashfirst",
("first1", GetFirstName(speciesProto, gender)), ("first2", GetFirstName(speciesProto, gender)));
case SpeciesNaming.FirstMiddleLast:
return Loc.GetString("namepreset-firstmiddlelast",
("first", GetFirstName(speciesProto, gender)), ("middle", GetMiddleName(speciesProto)), ("last", GetLastName(speciesProto)));
return Loc.GetString("namepreset-firstmiddlelast",
("first", GetFirstName(speciesProto, gender)), ("middle", GetMiddleName(speciesProto)), ("last", GetLastName(speciesProto)));
case SpeciesNaming.FirstLast:
default:
return Loc.GetString("namepreset-firstlast",
Expand Down
5 changes: 3 additions & 2 deletions Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public sealed partial class SpeciesPrototype : IPrototype

[DataField]
public string FemaleFirstNames { get; private set; } = "names_first_female";
[DataField]

[DataField]
public string MiddleNames { get; private set; } = "names_middle";

[DataField]
Expand Down Expand Up @@ -130,5 +130,6 @@ public enum SpeciesNaming : byte
First,
FirstLast,
FirstDashFirst,
FirstMiddleLast,
TheFirstofLast,
}
Loading

0 comments on commit 1b7b608

Please sign in to comment.