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
076d2e339bfb4979b17bb03695cf389f63c45e05
ss14-wl/Content.Client/Credits
History
faint 076d2e339b Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Administration/UI/AdminMenuWindow.xaml.cs
#	Content.Client/LateJoin/LateJoinGui.cs
#	Content.Client/Power/PowerMonitoringWindow.xaml.cs
#	Content.Client/VendingMachines/UI/VendingMachineMenu.xaml.cs
#	Content.Server/VoiceMask/VoiceMaskSystem.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/secret_weights.yml
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
#	Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Vests/kevlar.rsi/inhand-right.png
#	RobustToolbox
2023-07-10 07:03:24 +03:00
..
CreditsWindow.xaml
Fixing some warnings (#6250)
2022-01-21 10:38:35 +01:00
CreditsWindow.xaml.cs
Merge remote-tracking branch 'wizards/master' into upstream-sync
2023-07-10 07:03:24 +03:00