Morb0 8a0a435965 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json # Resources/Textures/Clothing/Uniforms/Jumpsuit/jester.rsi/meta.json		2024-01-05 00:55:19 +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	Thief hotfix (#22976)	2023-12-27 12:42:15 -08:00
AdminVerbSystem.cs	Replace EntityUid parsing with NetEntity (#23474)	2024-01-04 11:04:31 +11:00
AdminVerbSystem.Smites.cs	exterminator midround minor antag (#19946)	2023-12-24 20:16:56 -07: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	fix ahelp relay times (#23001)	2023-12-26 06:57:52 -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