Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cherry picks 6 (#486)

Browse Source 
* inital

* force them to WRITE

* b

* new system

* aaaa

* b

* bbbb

* translations

* add tts support for evacuation reason

* PaddedStool_Sprite&Prototype

8 colors of pudded stool.

* PaddedStool_Crafting

* ComfyChair_Sprites&Prototype

* ComfyChair_Crafting

* Sofa_Sprites&Prototype

* Sofa_Crafting

* Sofa_SpriteFix

* Sofa_RemoveSomeSprites

* Revert "Sofa_RemoveSomeSprites"

This reverts commit b110e9bda9a75cf6337c4efacd4888967d0e1fe6.

* Revert "Sofa_SpriteFix"

This reverts commit bfa8a17c16c57d2f70d64eb8dd54ae94ac48b248.

* Revert "Sofa_Crafting"

This reverts commit 89daadcb1e9d45a84281a5fdf998ab6c6f6b0f9b.

* Revert "Sofa_Sprites&Prototype"

This reverts commit 73cd0be403e03b1852a4632e1b6a8ca7526c5622.

* Revert "ComfyChair_Crafting"

This reverts commit 940f9665dd998090b43bca596ef3800c0c6ba89b.

* Revert "ComfyChair_Sprites&Prototype"

This reverts commit 2c909de5d3e3f4ab5efa1cbef6b5feda32d05a80.

* Revert "PaddedStool_Crafting"

This reverts commit 82040ba82c0190f2a52614fd3573e77586d73802.

* Revert "PaddedStool_Sprite&Prototype"

This reverts commit c5241a03ffeccbb4a18ab0f108d05c4fe1e047ba.

* Sprites&Meta

* Crafting

* Tweaks

* PaddedStool_tweaks

* Add Random Spawners

* remove old colored chairs

* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* add bouquet

* Not very useful functionality has been removed

* Update toys.yml

* Now you need cloth to made bouquet

* Update toys.yml

* I hope. I done right

* Update toys.yml

* Update bouquet.yml

* Update toys.yml

* Update Resources/Prototypes/Recipes/Crafting/Graphs/toys.yml

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* add musician jumpskirt to loadouts

* better bouquet

* pAIs can now be inserted into plushies.

* No more bad bleed

* More Tourniquets, hopefully fixed YML check.

* deals a bit of bloodloss

* Reduce Stack Count.

* fix tourniquet

* add migrations for old chair types and add few new

---------

Co-authored-by: Mr. 27 <koolthunder019@gmail.com>
Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
Co-authored-by: Green resomi <135062489+Yeah-I-listening-Hollywood-undead@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Moomoobeef <moomoobeef@protonmail.com>
Co-authored-by: PoorMansDreams <andyroblox14@gmail.com>
This commit is contained in:
ThereDrD0
2024-07-23 20:37:15 +03:00
committed by GitHub
parent 5a1f7baaa4
commit 1acc84c21c
40 changed files with 1375 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Client/Communications/UI/CommunicationsConsoleBoundUserInterface.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Chat;
using Content.Shared.Communications;
using Robust.Shared.Configuration;
using Robust.Shared.Timing;
using Robust.Shared.Prototypes;
namespace Content.Client.Communications.UI
{

19
Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs
View File

@@ -1,7 +1,9 @@
using Content.Client.UserInterface.Controls;
using System.Threading;
using Content.Shared.CCVar;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Configuration;
using Robust.Shared.Utility;
using Timer = Robust.Shared.Timing.Timer;
@@ -13,6 +15,8 @@ namespace Content.Client.Communications.UI
private CommunicationsConsoleBoundUserInterface Owner { get; set; }
private readonly CancellationTokenSource _timerCancelTokenSource = new();
[Dependency] private readonly IConfigurationManager _cfg = default!;
public CommunicationsConsoleMenu(CommunicationsConsoleBoundUserInterface owner)
{
IoCManager.InjectDependencies(this);
@@ -23,6 +27,21 @@ namespace Content.Client.Communications.UI
var loc = IoCManager.Resolve<ILocalizationManager>();
MessageInput.Placeholder = new Rope.Leaf(loc.GetString("comms-console-menu-announcement-placeholder"));
var maxAnnounceLength = _cfg.GetCVar(CCVars.ChatMaxAnnouncementLength);
MessageInput.OnTextChanged += (args) =>
{
if (args.Control.TextLength > maxAnnounceLength)
{
AnnounceButton.Disabled = true;
AnnounceButton.ToolTip = Loc.GetString("comms-console-message-too-long");
}
else
{
AnnounceButton.Disabled = !owner.CanAnnounce;
AnnounceButton.ToolTip = null;
}
};
AnnounceButton.OnPressed += (_) => Owner.AnnounceButtonPressed(Rope.Collapse(MessageInput.TextRope));
AnnounceButton.Disabled = !owner.CanAnnounce;