Morb0 55a91108c1 Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # Content.Server/Chat/Managers/ChatManager.cs # Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml # Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_active.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_deactive.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_off.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/ca_on.png # Resources/Textures/Structures/Power/Generation/Singularity/collector.rsi/meta.json		2023-10-15 17:52:02 +03:00
..
Clothing	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +03:00
Debugging	EasyPry airlocks for arrivals. Now also prying refactor I guess (#19394)	2023-09-28 21:34:21 +10: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-11 16:56:19 +03:00
Mobs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-14 00:39:46 +03:00
Objects	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-10-15 17:52:02 +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-10-15 17:52:02 +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