From 0b7d695b9515c978395bb39eaa19e5d3bd1d4d84 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 26 Sep 2023 18:47:58 +0200 Subject: [PATCH 1/3] Removes most bold names (#29) Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- .../en-US/chat/managers/chat-manager.ftl | 20 +++++++++---------- .../en-US/headset/headset-component.ftl | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index ac8e434e2da..82f598fb4e5 100644 --- 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 index 70b83c1e663..5dad1389be3 100644 --- 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]). From 9d7fe04cdab8a2fbb38c5477b813a83f05401001 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 26 Sep 2023 16:48:26 +0000 Subject: [PATCH 2/3] Automatic Changelog Update (#29) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index 8ec906f35ff..ba970f3bd8c 100644 --- 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' From b2980d93f224eed56155a53569f72bf9922e4b9a Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 26 Sep 2023 19:21:34 +0200 Subject: [PATCH 3/3] LastNoFirst (#40) Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- 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