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
..
Clothing	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Debugging	Grid Inventory (#21931)	2023-12-04 16:04:39 -07:00
Effects	Adds missing suffixes (#22076)	2023-12-02 15:41:22 -05:00
Markers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Stations	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-12-08 13:54:31 +03:00
Tiles	Add shadow biome (#21276)	2023-11-13 23:41:35 +11: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