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
Morb0 804c99fcc5 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Datasets/Names/borg.yml
#	Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
#	Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml
#	Resources/Prototypes/SoundCollections/lobby.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Structures/Piping/disposal.rsi/meta.json
#	Resources/Textures/Tiles/attributions.yml
#	Resources/Textures/Tiles/steel.png
2023-11-22 20:22:45 +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 Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +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