Merge remote-tracking branch 'citadel/master' into 12742

2025-12-10 01:49:19 +00:00 · 2020-07-29 01:11:11 -07:00
parent 1416fd08dc fbf81930c3
commit e4148fe4ad
660 changed files with 13702 additions and 6807 deletions
--- a/sound/effects/blood1.ogg
+++ b/sound/effects/blood1.ogg
--- a/sound/effects/blood2.ogg
+++ b/sound/effects/blood2.ogg
--- a/sound/effects/blood3.ogg
+++ b/sound/effects/blood3.ogg
--- a/sound/effects/butcher.ogg
+++ b/sound/effects/butcher.ogg
--- a/sound/effects/crack1.ogg
+++ b/sound/effects/crack1.ogg
--- a/sound/effects/crack2.ogg
+++ b/sound/effects/crack2.ogg
--- a/sound/effects/dismember.ogg
+++ b/sound/effects/dismember.ogg
--- a/sound/effects/sizzle1.ogg
+++ b/sound/effects/sizzle1.ogg
--- a/sound/effects/sizzle2.ogg
+++ b/sound/effects/sizzle2.ogg
--- a/sound/voice/catpeople/distressed.ogg
+++ b/sound/voice/catpeople/distressed.ogg
--- a/sound/voice/catpeople/license.txt
+++ b/sound/voice/catpeople/license.txt
@@ -0,0 +1,2 @@
+distressed_cat.ogg from Cat annoyed meow / wail by jbierfeldt at https://freesound.org/people/jbierfeldt/sounds/440735/, chopped up and ogged 
+cat_puking.ogg from catpuking mp3 by NoiseCollector and Mocha the cat at https://freesound.org/people/NoiseCollector/sounds/80778/, chopped up, volume altered and ogged 
--- a/sound/voice/catpeople/puking.ogg
+++ b/sound/voice/catpeople/puking.ogg
--- a/sound/weapons/guillotine.ogg
+++ b/sound/weapons/guillotine.ogg