NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-10 10:51:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Prototypes/Voice
History
Morb0 b1550d7db0 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mwbloody1.png
2023-09-05 00:12:02 +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-04-29 14:53:32 +03:00
speech_emote_sounds.yml small moth changes (#18810) 2023-08-08 22:05:05 -06:00
speech_emotes.yml Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-08-13 05:40:29 +03:00
speech_sounds.yml Arachnid species (#13945) 2023-04-30 02:19:06 +10:00
speech_verbs.yml More Speech Verbs (#19626) 2023-08-31 20:15:31 -07:00