NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-09 04:24:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Prototypes/Voice
History
Arthur Asimov f8d4eea0dc Merge remote-tracking branch 'wizards/master' into upstream-sync 
# Conflicts:
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Content.Server/RoundEnd/RoundEndSystem.cs
#	Resources/Prototypes/Datasets/Names/Operation_suffix.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Maps/core.yml
#	Resources/ServerInfo/Guidebook/Cargo/Salvage.xml
#	Resources/ServerInfo/Guidebook/Science/Robotics.xml
2023-12-03 15:10:26 +03:00
..
auto_emotes.yml Cluwne smite (#13367) 2023-03-06 11:09:24 -08:00
disease_emotes.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-14 00:39:46 +03:00
speech_emote_sounds.yml Unrevert audio (#21330) 2023-11-27 22:12:34 +11:00
speech_emotes.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-10-14 00:39:46 +03:00
speech_sounds.yml Cak Upgrade (#21678) 2023-11-16 01:12:56 -07:00
speech_verbs.yml More Speech Verbs (#19626) 2023-08-31 20:15:31 -07:00