From 1a095855d8570ee1474c2197ce53c66b6d166227 Mon Sep 17 00:00:00 2001
From: Fluffiest Floofers <thebluewulf@gmail.com>
Date: Fri, 22 Sep 2023 00:18:02 +0200
Subject: [PATCH] LastNoFirst

---
 Content.Shared/Humanoid/NamingSystem.cs                   | 8 ++++----
 Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs    | 2 +-
 Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl | 2 +-
 Resources/Prototypes/Nyanotrasen/Species/Oni.yml          | 2 +-
 Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Content.Shared/Humanoid/NamingSystem.cs b/Content.Shared/Humanoid/NamingSystem.cs
index a44f396dcaf..f78e1e490f2 100644
--- a/Content.Shared/Humanoid/NamingSystem.cs
+++ b/Content.Shared/Humanoid/NamingSystem.cs
@@ -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)));
diff --git a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
index ad2562fe141..42418cd0ea3 100644
--- a/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
+++ b/Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
@@ -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,
 }
diff --git a/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl b/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
index 030001e5ef5..4e0092974e1 100644
--- a/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/species/namepreset.ftl
@@ -1 +1 @@
-namepreset-x-no-y = {$last}-no-{$first}
+namepreset-lastnofirst = {$last}-no-{$first}
diff --git a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
index 84c6eac63d2..9cb184b8ef0 100644
--- a/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
+++ b/Resources/Prototypes/Nyanotrasen/Species/Oni.yml
@@ -10,7 +10,7 @@
   maleFirstNames: names_oni_male
   femaleFirstNames: names_oni_female
   lastNames: names_oni_location
-  naming: XnoY
+  naming: LastNoFirst
 
 - type: markingPoints
   id: MobOniMarkingLimits
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index 16ae43653e8..12b3229ec11 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -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