Morb0 782d82c0cd Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Connection/ConnectionManager.cs # Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Datasets/ion_storm.yml # Resources/Prototypes/Entities/Clothing/Masks/specific.yml # Resources/Prototypes/StatusEffects/health.yml # Resources/Prototypes/StatusEffects/job.yml # Resources/Prototypes/StatusEffects/security.yml # Resources/Textures/Decals/bricktile.rsi/white_box.png		2024-04-12 02:17:14 +03:00
..
Bombs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-03-17 14:01:54 +03:00
Effects	Proto-kinetic crusher (#16277)	2023-05-14 13:15:18 +10:00
Grenades	Merge remote-tracking branch 'upstream/master' into master-syndicate	2024-03-27 01:12:55 +03:00
Guns	Fix CLRF to LF	2024-03-28 11:42:27 +03:00
Melee	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-12 02:17:14 +03:00
pflash.rsi	[Resprite] Structures (#314)	2022-07-20 01:46:32 +03:00
Throwable	Automatic holiday sprites (#22929)	2023-12-24 23:52:43 -07:00