Morb0 caf8ac8005 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Resources/Prototypes/Entities/Clothing/Shoes/boots.yml # Resources/Textures/Objects/Tools/crowbar.rsi/meta.json # Resources/Textures/Objects/Tools/wrench.rsi/meta.json		2023-12-08 13:54:31 +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	Add verb to spawn players on the spot (#22000)	2023-11-30 16:40:07 -05:00
AdminVerbSystem.cs	Add verb to spawn players on the spot (#22000)	2023-11-30 16:40:07 -05:00
AdminVerbSystem.Smites.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
AdminVerbSystem.Tools.cs	Inventory slot enumerator rejig (#21788)	2023-12-08 08:20:51 +11:00
BufferingSystem.cs	Remove 700 usages of Component.Owner (#21100)	2023-10-19 12:34:31 -07:00
BwoinkSystem.cs	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
RejuvenateSystem.cs	Toolshed (#17895)	2023-08-02 16:09:08 -05:00