Vigers Ray d791eb37bd Merge remote-tracking branch 'space-wizards/master' ... # Conflicts: # .github/CODEOWNERS # Content.Client/Options/UI/Tabs/AccessibilityTab.xaml # Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml.cs # Content.Server/Access/Systems/AgentIDCardSystem.cs # Content.Server/Clothing/Systems/ChameleonClothingSystem.cs # Content.Server/Entry/IgnoredComponents.cs # Content.Shared/Access/Systems/SharedIdCardSystem.cs # Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs # Content.Shared/Inventory/InventorySystem.Relay.cs # Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.ChamberMagazine.cs # Resources/Locale/en-US/_strings/atmos/atmos-pipe-layers.ftl # Resources/Locale/en-US/_strings/chat/highlights.ftl # Resources/Locale/en-US/_strings/implant/chameleon-controller.ftl # Resources/Locale/en-US/_strings/prototypes/roles/antags.ftl # Resources/Locale/en-US/_strings/reagents/absinthe.ftl # Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml # Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml # Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml # Resources/Prototypes/Entities/Structures/Wallmounts/mirror.yml # Resources/Prototypes/Entities/Structures/cryogenic_sleep_unit.yml # Resources/Prototypes/Recipes/Lathes/categories.yml # Resources/Prototypes/Roles/Jobs/CentComm/cburn.yml # Resources/Prototypes/Roles/Jobs/CentComm/official.yml # Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml # Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml # Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml # Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml # Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml # Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.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/Textures/Structures/Doors/secret_door.rsi/assembly.png # Resources/Textures/Structures/Doors/secret_door.rsi/closed.png # Resources/Textures/Structures/Doors/secret_door.rsi/closing.png # Resources/Textures/Structures/Doors/secret_door.rsi/meta.json # Resources/Textures/Structures/Doors/secret_door.rsi/open.png # Resources/Textures/Structures/Doors/secret_door.rsi/opening.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png # Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png # Resources/migration.yml		2025-06-04 13:39:57 +03:00
..
ControlExtensions	Link to reagent ingredients on the same Guidebook page (#36700)	2025-05-09 10:06:26 +10:00
Controls	Sentry turrets - Part 6: Sentry turret control panels (#35235)	2025-05-26 16:00:50 +03: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-06-04 13:39:57 +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
StatsWindow.xaml.cs
StatValuesEui.cs