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

This commit is contained in:
silicons
2020-07-21 11:25:26 -07:00
1726 changed files with 52105 additions and 121253 deletions

View File

@@ -4,3 +4,8 @@ ambidet2.ogg is Night on the Docks, Piano by Kevin Macleod. It has been licensed
It has been cropped for use ingame, and also fades in.
aurora_caelus.ogg is Music for Manatees, by Kevin Macleod. It has been licensed under CC-BY 3.0 license.
It has been cropped for use ingame, and also fades out.
title1.ogg is Flip-Flap created by Jakub "AceMan" Szeląg and taken from http://www.modules.pl/?id=module&mod=453
title2.ogg is Robocop Theme (gameboy) remixed by Eric Schumacker
title3.ogg is Tintin On The Moon remixed by Cuboos https://tgstation13.org/phpBB/viewtopic.php?f=10&t=2157 (assumed CC under allowing it to be submitted to the github, see thread)
CC-BY 3.0: http://creativecommons.org/licenses/by/3.0/

View File

@@ -0,0 +1,2 @@
hit_punch.ogg and hit_kick.ogg are made by Taira Komori
(https://taira-komori.jpn.org/freesounden.html)

BIN
sound/effects/meatslap.ogg Normal file

Binary file not shown.

Binary file not shown.