Vigers Ray e2aab392db Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # Content.Server/PDA/PdaSystem.cs # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml # Resources/Prototypes/Roles/Jobs/Civilian/chef.yml # Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml # Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/borg.yml # Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml # Resources/Prototypes/Roles/Jobs/Science/scientist.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Security/security_officer.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/borg_types.yml # Resources/Textures/Structures/Walls/shuttleinterior.rsi/full.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/meta.json # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state0.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state1.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state2.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state3.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state4.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state5.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state6.png # Resources/Textures/Structures/Walls/shuttleinterior.rsi/state7.png		2025-04-20 02:52:59 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Cleanup warnings in SimpleRadialMenu (#36690)	2025-04-18 18:28:24 +02:00
Fragments	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
RichText	Monospace Support for Rich Text (#33830)	2024-12-13 15:24:34 +01:00
Screens	Нерф и фикс баннихопа	2025-01-06 23:48:07 +03:00
Systems	Merge remote-tracking branch 'space-wizards/master'	2025-04-20 02:52: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
ButtonHelpers.cs
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