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

Browse Source

...

This commit is contained in:

kevinz000

2020-05-05 17:38:43 -07:00

parent 3a843f6da4 56fe430a25

commit f034c7c536

1360 changed files with 51317 additions and 49624 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

sound/effects/printer.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_brass/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_brass/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_brass/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_brass/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trombone/C2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trombone/C3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trombone/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trombone/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trumpet/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/brass/crisis_trumpet/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C6.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C7.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/fluid_celeste/C8.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/sgmbox/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/sgmbox/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/sgmbox/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/sgmbox/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/vibraphone1/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/vibraphone1/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/vibraphone1/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/chromatic/vibraphone1/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_clean/C2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_clean/C3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_clean/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_clean/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_muted/C2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_muted/C3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_muted/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_muted/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_nylon/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_nylon/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_nylon/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_nylon/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_steel/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_steel/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_steel/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/guitar/crisis_steel/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_accordian/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_accordian/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_church/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_church/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_church/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_church/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_hammond/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_hammond/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_harmonica/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c6.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c7.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_bright_piano/c8.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c6.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c7.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_grand_piano/c8.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_harpsichord/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_harpsichord/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_harpsichord/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/crisis_harpsichord/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C6.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C7.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_harpsi/C8.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c2.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c3.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c4.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c5.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c6.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c7.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/piano/fluid_piano/c8.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/tones/Sawtooth.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/tones/Sine.ogg

BIN

Binary file not shown.

sound/instruments/synthesis_samples/tones/Square.ogg

BIN

Binary file not shown.

sound/machines/machine_vend.ogg

BIN

Binary file not shown.

sound/voice/medbot/owo.ogg

BIN

Binary file not shown.

sound/vore/pred/death_01.ogg

BIN

Binary file not shown.

sound/vore/pred/death_02.ogg

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More