Morb0 996b761d80 Merge remote-tracking branch 'wizards/master' into upstream-sync ... # Conflicts: # Content.Packaging/ClientPackaging.cs # Content.Server/Administration/Systems/AdminSystem.cs # Content.Server/GameTicking/GameTicker.StatusShell.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Resources/Prototypes/Entities/Stations/base.yml # Resources/Prototypes/Entities/Structures/Machines/lathe.yml # Resources/Textures/Interface/Misc/job_icons.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json # Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json		2025-01-16 13:37:26 +03:00
..
backgammon.rsi	Add backgammon and board game crate (#5884)	2021-12-24 13:20:20 +01:00
backgammon_tabletop.rsi	Disable meta-atlas for big rare RSIs (#33643)	2025-01-15 00:43:48 +01:00
Battlemaps	Merge remote-tracking branch 'wizards/master' into upstream-sync	2025-01-16 13:37:26 +03:00
checker_pieces.rsi	refactor checkerboard (#18359)	2023-09-03 16:16:09 +10:00
chess_pieces.rsi
chessboard.rsi
chessboard_tabletop.rsi	Disable meta-atlas for big rare RSIs (#33643)	2025-01-15 00:43:48 +01:00
generic_pieces.rsi	Add backgammon and board game crate (#5884)	2021-12-24 13:20:20 +01:00
parchis.rsi
parchis_tabletop.rsi	Disable meta-atlas for big rare RSIs (#33643)	2025-01-15 00:43:48 +01:00