Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml # Resources/Prototypes/GameRules/midround.yml # Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml # Resources/Prototypes/Roles/Jobs/Security/warden.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusIcon/antag.yml # Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml # Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/ServerInfo/Guidebook/Engineering/Construction.xml # Resources/ServerInfo/Guidebook/Engineering/Engineering.xml # Resources/ServerInfo/Guidebook/Engineering/Fires.xml # Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml # Resources/ServerInfo/Guidebook/Engineering/Networking.xml # Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Engineering/TEG.xml # Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml # Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml # Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml # Resources/ServerInfo/Guidebook/Security/Forensics.xml # Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png		2024-04-26 11:19:50 +03:00
..
ControlExtensions	Filtering reagents (#18211)	2023-07-26 02:05:09 -06:00
Controls	Various item status fixes/tweaks (#27267)	2024-04-25 00:01:31 +10: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 'refs/remotes/wizards/master' into upstream-sync	2024-04-26 11:19: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
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