corvax-team/ss14-wl
1
0
Fork 0
mirror of https://github.com/corvax-team/ss14-wl.git synced 2026-02-15 03:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
save_upstream_branch
ss14-wl/Content.Client/Options
History
ssdaniel24 3fc0562c41 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-06-10 
Conflicts:
	Content.Server/GameTicking/GameTicker.Spawning.cs
	Resources/Credits/GitHub.txt
	Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
	Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
	Resources/Prototypes/GameRules/cargo_gifts.yml
	Resources/Prototypes/Maps/omega.yml
	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_wagging.png
2025-06-10 22:07:39 +03:00
..
UI
Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-06-10
2025-06-10 22:07:39 +03:00
OptionsVisualizerComponent.cs
Add new "OptionsVisualizer" (#25128)
2024-02-17 15:52:11 -05:00
OptionsVisualizerSystem.cs
Cleanup more SpriteComponent warnings (part 6) (#37607)
2025-05-20 01:52:03 +02:00