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.

Sign up for GitHub

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

[minor] Replace XnoY with LastNoFirst #40

Merged
merged 3 commits into from
Sep 26, 2023
Merged

[minor] Replace XnoY with LastNoFirst #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a09585
LastNoFirst
FluffiestFloof Sep 21, 2023
dbccf77
Merge branch 'master' into xnoy
FluffiestFloof Sep 25, 2023
eb3c739
Merge branch 'master' into xnoy
Colin-Tel Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Content.Shared/Humanoid/NamingSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public string GetName(string species, Gender? gender = null)

switch (speciesProto.Naming)
{
//Start of Nyano code for Oni naming
case SpeciesNaming.XnoY:
return Loc.GetString("namepreset-x-no-y",
// Start of Nyano code for Oni naming
case SpeciesNaming.LastNoFirst:
return Loc.GetString("namepreset-lastnofirst",
("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto)));
//End of Nyano code for Oni naming
// End of Nyano code for Oni naming
case SpeciesNaming.TheFirstofLast:
return Loc.GetString("namepreset-thefirstoflast",
("first", GetFirstName(speciesProto, gender)), ("last", GetLastName(speciesProto)));
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public enum SpeciesNaming : byte
FirstLast,
FirstDashFirst,
//Start of Nyano code for Oni naming
XnoY,
LastNoFirst,
//End of Nyano code for Oni naming
TheFirstofLast,
}
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
namepreset-x-no-y = {$last}-no-{$first}
namepreset-lastnofirst = {$last}-no-{$first}
2 changes: 1 addition & 1 deletion Resources/Prototypes/Nyanotrasen/Species/Oni.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
maleFirstNames: names_oni_male
femaleFirstNames: names_oni_female
lastNames: names_oni_location
naming: XnoY
naming: LastNoFirst

- type: markingPoints
id: MobOniMarkingLimits
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@
pocket1: DoubleEmergencyOxygenTankFilled
pocket2: BaseUplinkRadio40TC
belt: ClothingBeltMilitaryWebbing
#inhand:
#right hand: NukeOpsDeclarationOfWar Declaring War is inherently LRP so it has been removed in DeltaV
# inhand: # DeltaV - Prevent commander spawning with the declaration of war
# right hand: NukeOpsDeclarationOfWar
innerclothingskirt: ClothingUniformJumpskirtOperative
satchel: ClothingBackpackDuffelSyndicateOperative
duffelbag: ClothingBackpackDuffelSyndicateOperative
Expand Down
Loading