Morb0 13b3bfa217 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/CODEOWNERS # .github/workflows/update-wiki.yml # Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs # Content.Shared/Humanoid/HumanoidCharacterAppearance.cs # Content.Shared/Humanoid/Markings/MarkingPrototype.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Clothing/Hands/gloves.yml # Resources/ServerInfo/Guidebook/Engineering/AME.xml # Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml # Resources/manifest.yml		2023-09-24 12:56:24 +03:00
..
Clothing	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Debugging	Fix bolt-open for debug swep (#19057)	2023-08-13 01:08:08 -06:00
Effects	Openable refactor (#19750)	2023-09-22 22:10:04 -04:00
Markers	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Stations	1v1 me first to 31 no powerups [Deathmatch Gamemode] (#19467)	2023-08-30 18:06:15 -07:00
Structures	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-09-24 12:56:24 +03:00
Tiles	Add tile entity occlusion (#14626)	2023-08-30 12:32:35 +10: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