From 4ccb167f4a533511429738c5bc90ff6932013232 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 26 Sep 2023 04:57:54 +0200 Subject: [PATCH 1/5] Replace Tinned Can starter item (#41) * psb * Fix moth --- .../Prototypes/Catalog/Fills/Boxes/emergency.yml | 12 ++++++------ .../Entities/Objects/Consumable/Food/ration.yml | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index 2cd3960dde3..efe08cacfab 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -11,7 +11,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Sprite layers: - state: internals @@ -30,7 +30,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Sprite layers: - state: internals @@ -50,7 +50,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Sprite layers: - state: internals @@ -70,7 +70,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: EmergencyMedipen - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Sprite layers: - state: internals @@ -90,7 +90,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Sprite layers: - state: internals @@ -115,7 +115,7 @@ - id: SpaceMedipen - id: EmergencyMedipen - id: Flare - - id: FoodTinMRE + - id: FoodPSB # Nyanotrasen - Replace Tinned Meat with PSB - type: Tag tags: - BoxHug diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml index c513b948c7e..eae274aaa11 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/ration.yml @@ -72,6 +72,9 @@ reagents: - ReagentId: Nutriment Quantity: 15 + - type: Tag + tags: + - ClothMade # DeltaV - A dirty fix to allow Moths to eat it. - type: entity name: soy sustenance bar From f4e7925f6becb00a5b2ebc4d0f6d3ce1f04af2e5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Tue, 26 Sep 2023 02:58:22 +0000 Subject: [PATCH 2/5] Automatic Changelog Update (#41) --- Resources/Changelog/DeltaVChangelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/DeltaVChangelog.yml b/Resources/Changelog/DeltaVChangelog.yml index e3dc137a730..8ec906f35ff 100644 --- a/Resources/Changelog/DeltaVChangelog.yml +++ b/Resources/Changelog/DeltaVChangelog.yml @@ -83,3 +83,9 @@ Entries: message: Clown Spiders no longer can squeeze through the vents. id: 13 time: '2023-09-21T20:45:11.0000000+00:00' +- author: FluffiestFloof + changes: + - type: Add + message: Added the PSB emergency snack. + id: 14 + time: '2023-09-26T02:57:54.0000000+00:00' From 1d5c85d886489e00e8c14dab1ab6ad48b5ee590d Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 26 Sep 2023 05:09:39 +0200 Subject: [PATCH 3/5] Add the fox toys into the spawners (#37) Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com> --- Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml | 2 ++ .../Entities/Objects/Consumable/Food/Containers/box.yml | 4 ++++ Resources/Prototypes/Entities/Objects/Decoration/present.yml | 4 ++++ .../Entities/Structures/Machines/Computers/arcades.yml | 2 ++ 4 files changed, 12 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml index cf870daf542..908e89cc46f 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml @@ -70,6 +70,8 @@ - ToyDurand - ToySkeleton - MysteryFigureBox + - ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + - ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index 4d7c06cd434..990a6815616 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -671,3 +671,7 @@ - id: GoldenBikeHorn prob: 0.1 orGroup: GiftPool + - id: ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool + - id: ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index 6241b93f91e..478e5d8401a 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -367,6 +367,10 @@ orGroup: GiftPool - id: RGBStaff orGroup: GiftPool + - id: ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool + - id: ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + orGroup: GiftPool sound: path: /Audio/Effects/unwrap.ogg diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml index b3463f12449..808f2d1d660 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml @@ -85,6 +85,8 @@ - BeachBall - PlushieMoth - PlushieHampter + - ToyRenault # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml + - ToySiobhan # DeltaV Toy, see Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml - type: WiresPanel - type: Wires LayoutId: Arcade From 0b7d695b9515c978395bb39eaa19e5d3bd1d4d84 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Tue, 26 Sep 2023 18:47:58 +0200 Subject: [PATCH 4/5] 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 5/5] 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'