keekee38
88310fef8d
porting RMC pose stuff ( #5558 )
...
* Add set pose (#4682 )
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
# Conflicts:
# Resources/Prototypes/_RMC14/Entities/Mobs/Species/base.yml
* hi
* comment
* uncommenting
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* ok so riders still insistent about the adminlog thingy being weird but did it i think? i may be stupid
* ty kotob <3
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
* ok ipcs should be able to now!
---------
Signed-off-by: keekee38 <iamabanana372456@gmail.com>
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: DisposableCrewmember42 <disposablecrewmember42@proton.me>
Co-authored-by: KOTOB <59124164+kotobdev@users.noreply.github.com>
2026-04-04 15:29:42 +02:00
William Lemon
75a995a730
Skia Tweaks + Removes Nightvision form Lathes ( #4308 )
...
* Adds Direction Requests
* Fix
* Fixed EntryPoint, added back Sec Lathe, and added as a Salvage Points item
* Moved SpecOpsGoggles to appease gods
* Give Skia Thermal Vision
* Removed thermals from research.
* Removed thermal vision, added comment
2025-09-07 08:11:07 +00:00
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
deltanedas
8e1fbe2026
merge master
2025-03-04 08:17:55 +00:00
SolStar
3a3f5b71da
Fixes again ( #3098 )
...
* Fixes again
* fish
2025-03-03 23:31:20 +00:00
deltanedas
0bd022a8eb
grrr... kitten... put on your uniform NOW!
2025-03-03 17:54:55 +00:00
SolStar
44ac7931ab
Fix scroll bar to navigate players Curator Chat ( #3094 )
...
Fix scroll bar to navigate players
2025-03-02 23:31:05 +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