Merge branch 'master' into zero

DeltaV-Station · Sep 27, 2023 · 8d00eb0 · 8d00eb0
2 parents 1f30022 + b2980d9
commit 8d00eb0
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git 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
@@ -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/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml
@@ -89,3 +89,9 @@ Entries:
       message: Added the PSB emergency snack.
   id: 14
   time: '2023-09-26T02:57:54.0000000+00:00'
+- author: FluffiestFloof
+  changes:
+    - type: Tweak
+      message: Changed chat messages to not have the names bold.
+  id: 15
+  time: '2023-09-26T16:47:58.0000000+00:00'
diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -21,8 +21,8 @@ chat-manager-whisper-headset-on-message = You can't whisper on the radio!
 chat-manager-server-wrap-message = [bold]{$message}[/bold]
 chat-manager-sender-announcement-wrap-message = [font size=14][bold]{$sender} Announcement:[/font][font size=12]
                                                 {$message}[/bold][/font]
-chat-manager-entity-say-wrap-message = [bold]{$entityName}[/bold] {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font]
-chat-manager-entity-say-bold-wrap-message = [bold]{$entityName}[/bold] {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font]
+chat-manager-entity-say-wrap-message = {$entityName} {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font]
+chat-manager-entity-say-bold-wrap-message = {$entityName} {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font]
 
 chat-manager-entity-whisper-wrap-message = [font size=11][italic]{$entityName} whispers, "{$message}"[/italic][/font]
 chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic]Someone whispers, "{$message}"[/italic][/font]
@@ -33,16 +33,16 @@ chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) ->
      [true] {$entityName} {$message}[/italic]
     }
 
-chat-manager-entity-looc-wrap-message = LOOC: [bold]{$entityName}:[/bold] {$message}
-chat-manager-send-ooc-wrap-message = OOC: [bold]{$playerName}:[/bold] {$message}
-chat-manager-send-ooc-patron-wrap-message = OOC: [bold][color={$patronColor}]{$playerName}[/color]:[/bold] {$message}
+chat-manager-entity-looc-wrap-message = LOOC: {$entityName}: {$message}
+chat-manager-send-ooc-wrap-message = OOC: {$playerName}: {$message}
+chat-manager-send-ooc-patron-wrap-message = OOC: [color={$patronColor}]{$playerName}[/color]: {$message}
 
-chat-manager-send-dead-chat-wrap-message = {$deadChannelName}: [bold]{$playerName}:[/bold] {$message}
-chat-manager-send-admin-dead-chat-wrap-message = {$adminChannelName}: [bold]({$userName}):[/bold] {$message}
-chat-manager-send-admin-chat-wrap-message = {$adminChannelName}: [bold]{$playerName}:[/bold] {$message}
-chat-manager-send-admin-announcement-wrap-message = [bold]{$adminChannelName}: {$message}[/bold]
+chat-manager-send-dead-chat-wrap-message = {$deadChannelName}: {$playerName}: {$message}
+chat-manager-send-admin-dead-chat-wrap-message = {$adminChannelName}: ({$userName}): {$message}
+chat-manager-send-admin-chat-wrap-message = {$adminChannelName}: {$playerName}: {$message}
+chat-manager-send-admin-announcement-wrap-message = {$adminChannelName}: {$message}
 
-chat-manager-send-hook-ooc-wrap-message = OOC: [bold](D){$senderName}:[/bold] {$message}
+chat-manager-send-hook-ooc-wrap-message = OOC: (D){$senderName}: {$message}
 
 chat-manager-dead-channel-name = DEAD
 chat-manager-admin-channel-name = ADMIN

diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl
@@ -1,6 +1,6 @@
 # Chat window radio wrap (prefix and postfix)
-chat-radio-message-wrap = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font][/color]
-chat-radio-message-wrap-bold = [color={$color}]{$channel} [bold]{$name}[/bold] {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font][/color]
+chat-radio-message-wrap = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}]"{$message}"[/font][/color]
+chat-radio-message-wrap-bold = [color={$color}]{$channel} {$name} {$verb}, [font={$fontType} size={$fontSize}][bold]"{$message}"[/bold][/font][/color]
 
 examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]).
 

diff --git 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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		namepreset-x-no-y = {$last}-no-{$first}
		namepreset-lastnofirst = {$last}-no-{$first}