NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 02:41:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Client/UserInterface
History
Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
#	Content.Server/Power/Generator/GeneratorSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
..
ControlExtensions Filtering reagents (#18211) 2023-07-26 02:05:09 -06:00
Controls make dialog window not evil (#24677) 2024-02-01 23:56:40 +11:00
Fragments Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
RichText Ion law visuals (#22908) 2023-12-23 23:58:02 -07:00
Screens Corner Clothing UI (#22883) 2023-12-22 23:32:23 -07:00
Systems Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-01-26 01:14:50 +03:00
XamlExtensions Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
BoundKeyHelpers.cs Use different chatbox placeholder when dependent keys unbound (#22747) 2023-12-22 11:39:29 -08:00
ButtonHelpers.cs Add ButtonHelpers and the SetButtonDisabledRecursive helper. 2021-07-29 12:55:37 +02:00
IEntityControl.cs Improve vv /c/enthover and add keybind (#20127) 2023-09-16 14:09:51 +10:00
StatsWindow.xaml Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00
StatsWindow.xaml.cs Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00
StatValuesEui.cs Cargo economy balance (#11123) 2022-09-15 11:53:17 +10:00