Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UPSTREAM] TGUI Say #2618

Merged
merged 16 commits into from May 17, 2024
Merged

[UPSTREAM] TGUI Say #2618

merged 16 commits into from May 17, 2024

Conversation

Bobbanz1
Copy link
Contributor

@Bobbanz1 Bobbanz1 commented Mar 21, 2024

About The Pull Request

This PR ports TGUI Say from Beestation

It accomplishes this by pulling from upstream the following PR:

That PR in turn ports TGUI Say from TG Station, those are in particular the following PRs:

What the Beestation port does is it implements TGUI Say. However it does it in such a way that allows the player to choose between either using the TGUI Say interface or the original interface.

The PR also introduces the ability to let the player choose between using TGUI Inputs, such as tgui buttons/tgui lists and the original interface.

Additional Changes ported from Beestations TGUI Say PR:

  • Added explo (although we don't use it), uplink, :l, :r and :h channel handling
  • Added support for .channel prefixes
  • Colors were tweaked
  • The entire new window is draggable, excluding the textbox.
  • The border has been tweaked slightly, it is not animated but has a minor gradient on both the top and bottom
  • Added a border around the text input part of the box.
  • Added LOOC channel (Quickly accessible by pressing L on your keyboard)
  • Legacy support pref, with typing indicators and all
  • Typing ; in Say mode will convert the radio prefix to ;, and removing it will go back to Say.
  • Shift+TAB and right clicking the button will go back in channels.
  • Re-opening the window on a different channel will no longer break the button contents.
  • Added "show prefix" mode which treats :s as text in the input box while still updating the color and button.
  • Pressing ESC on the game window with the say unfocused will exit the say.

SQL Update that needs to be done before test-merge and/or full merge

UPDATE SS13_preferences SET preference_value = preference_value | (1<<14) | (1<<15) | (1<<16) | (1<<17) WHERE preference_tag = 2;

Todo:

  • Figure out how to record this stuff in action without reaching the github's file size limit

Why It's Good For The Game

Keeps the codebase somewhat up to date with Beestation.
This also makes it easier to import a future pull request from Beestation if we have the preferences and code required for it already in the codebase.

Testing Photographs and Procedure

Screenshots&Videos

TGUI Say Enabled:
TGUISayPreferences
withTGUISayEnabled

TGUI Say Disabled:
TGUISayDisabled
withoutTGUISayEnabled

TGUI Input:
Enabled with Large Buttons
tguiinputsettingslargeokcancel
TGUIInputListExampleTwo

Enabled with Small Buttons and Button Locations Swapped
TGUIInputSettingsSmallButtonCancelOK
TguiListStuff

Disabled
TguiInputSettingsDisabled
TguiInputDisabled

How the Preference section looks for TGUI
Skärmbild 2024-03-14 091809

How the various channels look alongside their associated keys/prefixes:
Say (T Key on Keyboard)
withTGUISayEnabled

Me (M Key on Keyboard)
me

LOOC (L Key on Keyboard)
l_looc

OOC (O Key on Keyboard)
o_ooc

Common
common

Engineering (Prefix: :e or .e)
engineering

Security
security

Supply
supply

Command
command

Service (Prefix: :v or .v)
service

Science
science

Hologram
holo

Medical
medical

Munitions
munitions

ATC
atc

Centcom
centcom

Syndicate
syndicate

Pirates
space_pirate

Changelog

🆑itsmeow
add: Added TGUI-Say (can be disabled in prefs, light theme also in prefs) - Tab to switch channels.
add: Added new TGUI Say keybinds - Y for Radio, L for LOOC (not currently rebindable).
add: Added TGUI input preferences (mostly unused currently).
add: Added glorfing to TGUI-Say - if you get hit hard enough, your message will be cut off with "-OW!!!", "-AUGH!!!", "-GLORF!!" or similar.
admin: Added logging to typing indicators.
add: Added OOC Verb "Refresh TGUI".
tweak: Legacy say hotkey macros (Ctrl+T, Ctrl+O) have been replaced with T and O.
/:cl:

@Bokkiewokkie
Copy link
Contributor

Want to add configurable hotkeys for chat messages; z being a permanent hotkey means qwertz keyboard users are getting their keybinds mixed up.

@Bobbanz1
Copy link
Contributor Author

Bobbanz1 commented May 5, 2024

Want to add configurable hotkeys for chat messages; z being a permanent hotkey means qwertz keyboard users are getting their keybinds mixed up.

I can see what I can do when I get the time

And I'll certainly try

Copy link
Contributor

@Bokkiewokkie Bokkiewokkie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can do the hotkey update in a next PR, so we don't have this open forever

@Bokkiewokkie Bokkiewokkie merged commit a44fd72 into BeeStation:master May 17, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants