Vigers Ray a7131170fa Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs # Content.Server/IoC/ServerContentIoC.cs # Content.Shared.Database/LogType.cs # Resources/Prototypes/Body/Organs/Animal/animal.yml # Resources/Prototypes/Body/Organs/arachnid.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/GameRules/roundstart.yml		2025-08-16 00:12:59 +03:00
..
ControlExtensions	Link to reagent ingredients on the same Guidebook page (#36700)	2025-05-09 10:06:26 +10:00
Controls	Borg hands & hand whitelisting (#38668)	2025-08-12 15:21:42 -07:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Replace ValidatePrototypeId uses with ProtoId or EntProtoId (#38814)	2025-07-07 21:57:05 +02:00
Screens	Нерф и фикс баннихопа	2025-01-06 23:48:07 +03:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-08-16 00:12:59 +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
BuiPredictionState.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
BuiPreTickUpdateSystem.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
ButtonHelpers.cs
IEntityControl.cs	Improve vv /c/enthover and add keybind (#20127)	2023-09-16 14:09:51 +10:00
InputCoalescer.cs	Battery (SMES/substation) interface (#36386)	2025-04-27 21:08:34 +10:00
StatsWindow.xaml	Fix showvalue Ui for melee weapons (#38703)	2025-08-06 15:01:49 -07:00
StatsWindow.xaml.cs
StatValuesEui.cs