Commit Graph

12 Commits

Author SHA1 Message Date
SolStar 429616aea3
Curator Help 2 Electric Boogaloo (#3870)
* Revert #3094

* add button

* Copy over AHelpUIController.cs

* replace ahelp with chelp

* change sound

* updated icon

* check for chelp flag

* switched the files oops

* cwoink

* remove buttons

* Seperate Cwoink System

* loc

* Purple

* fix up cwoink

* check for curatorhelp flag

* Button cleanup

* new cvars yay

* add VV

* description and resizing

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* description update

* fish changes pt 1

* fish guy part 2

* fix fail

* cache so cool

* attributions

* Cwoink verb

* spelling

* file rename

* Update Content.Shared/_DV/CCVars/DCCVars.CHelp.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Commands/OpenCHelpCommand.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby

* Update Content.Client/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkControl.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/Curation/UI/Cwoink/CwoinkWindow.xaml.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Server/_DV/Curation/Systems/CwoinkSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* toby 2

* toby 3

* toby pog

* meow

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* meow

* meow 2

* sawmill

* 2

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* forgor

* Update Content.Client/_DV/UserInterfaces/Systems/Cwoink/CHelpUIController.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>

* Update Resources/Locale/en-US/_DV/curation/cwoink.ftl

Signed-off-by: Tobias Berger <toby@tobot.dev>

---------

Signed-off-by: SolStar <44028047+SolStar2@users.noreply.github.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-06-10 10:56:50 +00:00
deltanedas 9e26db7a9d
return ahelp to f1, add alternate keybind for staff help chooser (#3176)
* fix bad grammar

* return ahelp to f1

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-10 02:19:32 +00:00
SolStar edba14b3f2
Curator Chat (Ported from RMC14 #5084) (#3070)
* Port Add Mentor Help #5084 https://github.com/RMC-14/RMC-14/pull/5084

* Remove de/re-mentoring command and mentor jobs instead tie to admining

* Renamed to Curator Chat

* Make chat 10% less shit

* Fishguy fixes

* oops

* Cherry Pick d4fcd8e8c8

* maybe this is right?

* Revert changes to upstream file

* Revert changes to upstream file

---------

Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2025-03-02 00:03:27 +00:00
Vasilis The Pikachu d3e498fad4 Revert "Simplify separated screen top menu (#33047)"
This reverts commit f27fa1ed30920581c6322d08867cb3334f897589.
2024-12-21 09:37:09 +00:00
metalgearsloth 33fa47e192 Simplify separated screen top menu (#33047) 2024-12-07 21:47:16 +00:00
Morb d11e8db9f9
Emotes Menu (#26702)
* Basic emote radial menu

* Move out from corvax

* Move to UI controller & add to top menu bar and key bind

* Make emote play

* Add name localization for emotes

* Localize chat messages

* Fix emote menu

* Add categories localization

* Fixes

* Fix

* Add emotes entity blacklist

* Fix entity whitelist required all logic

* Remove unused wagging emote

* Revert sprite

* Set default texture for emote icon

* Update Resources/keybinds.yml

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-05-07 02:19:25 +02:00
Nemanja 21548d9cf8
Corner Clothing UI (#22883)
* Corner clothing (save point)

* IT WORKS. YIPPEE

* the last of it

* template rejigs

(cherry picked from commit 9b18357a882d6a9e3dfb3b4fccaa42f65238c9f0)
2024-01-22 18:24:28 +01:00
metalgearsloth a09c4e7bd1
Stretch top bar for separated hud (#14873) 2023-03-27 19:51:40 -07:00
AJCM-git 7a6fddce4f
Moves guidebook UI logic to a UI Controller, some tweaks (#14601) 2023-03-22 23:41:43 -04:00
Mr0maks db4d37a2b7
Fix locale (#12755)
After fixing in the settings, I forgot to change it everywhere
2022-11-30 10:21:23 +01:00
Flipp Syder a3dafd88dc
Oldchat (#11913)
* attempt at moving MainViewport to UIWidget

* oldchat (prototype)

* separate oldchat and default ss14 HUD into their own files

* restores original default game screen logic and adds that logic into separated chat game screen

* hand reloading, several tweaks to port oldchat to main ss14 branch

oldchat is currently not selectable

* screen type cvar, gameplay state screen reloading/loading

* reload screen on ui layout cvar change

* fixes up basic reloading (HUD switching is still very bad)

* some UI widget reloading for main UI screen switching

* alert sync on screen change

* inventory reload

* hotbar margin fix

* chat bubbles above viewport

* whoops

* fixes ordering of speech bubble root

* should fix the chat focus issue (at least in-game, not lobby yet)

* should fix up the lobby/game chat focus

* fixes chat for lobby, turns lobby into a UI state

* viewport UI controller

* viewport ratio selection

* whoops

* adds the /tg/ widescreen ratio

* removes warning from inventory UI controller, adds background to separated chat game screen's chat portion

* menu button reload

* unload menu buttons only from gameplay state shutdown

* bugfix

* character button fix

* adds config options for viewport width/UI layout

* variable naming changes, get or null instead of get to avoid exceptions

* moves entity system get into controller
2022-10-17 17:13:41 -05:00
Jezithyr 571dd4e6d5
Hud refactor (#7202)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00