Morb0 681762aca7 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/GameTicking/GameTicker.Player.cs # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/Preferences/Managers/ServerPreferencesManager.cs # Content.Server/Shuttles/Systems/EmergencyShuttleSystem.Console.cs # Resources/Prototypes/Objectives/objectiveGroups.yml		2023-10-28 14:14:36 +03:00
..
Clothing	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
Debugging	Revert "Storage TEST MERGE" (#21258)	2023-10-26 00:46:22 -07:00
Effects	Animals make hearts when you pet them (#20859)	2023-10-13 09:34:18 -08:00
Markers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-20 01:50:09 +03:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
Stations	Ion storm event (#20277)	2023-10-26 22:40:13 -04:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-28 14:14:36 +03:00
Tiles	Cave Decoration pack (#21265)	2023-10-26 21:58:27 -04:00
Virtual	remove netsync false from sprite component in prototypes (#17207)	2023-06-10 21:51:26 +10:00
World	Yet Another Asteroid-Related Tile Update (read: asteroid tile variantizing) (#19237)	2023-08-24 23:40:04 -04:00
foldable.yml	Resolves FoldableVisualizer is Obsolete (#13913)	2023-02-06 15:53:07 -04:00