Morb0 c333fc2b20 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Client/Power/PowerMonitoringWindow.xaml.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Entities/Mobs/NPCs/pets.yml # Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml # Resources/Prototypes/Maps/omega.yml # Resources/Textures/Clothing/Back/Backpacks/cargo.rsi/inhand-right.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-12-24 20:02:16 +03:00
..
AdminSystem.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
AdminTestArenaSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
AdminVerbSystem.Antags.cs	New Thief minor antagonist (#21520)	2023-12-24 02:58:28 -07:00
AdminVerbSystem.cs	Fix entity logs verb (#22231)	2023-12-08 22:39:00 -06:00
AdminVerbSystem.Smites.cs	Super Bonk Smite (#22413)	2023-12-18 14:39:23 -05:00
AdminVerbSystem.Tools.cs	Remove uses of TransformComponent.ChildEntities (#22442)	2023-12-17 03:09:50 +11:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	CVar for custom name in client-side ahelp menu. (#22069)	2023-12-19 17:40:37 -06:00
RejuvenateSystem.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00
SuperBonkSystem.cs	Super Bonk Smite (#22413)	2023-12-18 14:39:23 -05:00