fish-station/Resources/Prototypes/Loadouts
Vigers Ray d86ad2ba97 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Locale/en-US/_strings/discord/watchlist-connections.ftl
#	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-15 18:23:20 +03:00
..
Jobs Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-10-02 06:45:10 +03:00
Miscellaneous Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-15 18:23:20 +03:00
dummy_entities.yml Multiple items in loadouts (#33193) 2024-12-24 01:24:19 +01:00
loadout_groups.yml Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-15 18:23:20 +03:00
role_loadouts.yml Питомцы (#391) 2025-01-11 07:53:23 +03:00