VigersRay 5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Server/Administration/Commands/PlayTimeCommands.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Station/Systems/StationSpawningSystem.cs # Content.Server/StationEvents/Events/BreakerFlipRule.cs # Content.Shared/Roles/JobPrototype.cs # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml # Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml # Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml # Resources/Prototypes/Entities/Mobs/base.yml # Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml # Resources/Prototypes/GameRules/events.yml # Resources/Prototypes/Roles/Antags/traitor.yml # Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml # Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml # Resources/Prototypes/Roles/Jobs/Civilian/clown.yml # Resources/Prototypes/Roles/Jobs/Civilian/musician.yml # Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml # Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml # Resources/Prototypes/Roles/Jobs/Medical/chemist.yml # Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml # Resources/Prototypes/Roles/Jobs/Science/research_director.yml # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml		2024-06-04 09:41:27 +03:00
..
Commands	Clean up command perms (#28451)	2024-06-01 01:14:43 -07:00
Managers	Merge sunrise build (#2)	2024-05-31 02:16:18 +03:00
Systems	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-04 09:41:27 +03:00
TypingIndicator	Obsolete Logger cleanup for EntitySystems part 2 (#26159)	2024-03-17 18:31:09 +11:00
V2	Chatfactor: Chat Repository, Admin Commands, Chat Created Events (#26113)	2024-04-18 14:59:10 +10:00
AnnounceOnSpawnComponent.cs	nar'sie fake (#20299)	2023-12-06 20:24:33 -05:00
AutoEmoteComponent.cs	Refactor serialization copying to use source generators (#19412)	2023-08-22 18:14:33 -07:00
ChatUser.cs	Fix erase verb not removing chat messages in some cases (#21355)	2023-11-05 19:19:59 -07:00
EmoteOnDamageComponent.cs	Use new ComponentPauseGenerator (#25183)	2024-02-26 14:36:19 +11:00
SuicideSystem.cs	Kill SharedEntityExtensions and all popup extensions (#20909)	2023-10-16 16:56:09 +11:00