Chinsky 63f9549596 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into whistle ...

Conflicts:
	baystation12.dme

2013-06-01 17:12:51 +04:00

..

AI

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

ambience

added [old] roundstart music, cleaned up folders a bit

2013-02-23 18:54:01 +10:00

effects

some new [old] sound effects, turrets make ambient noise occasionally, bit more roundstart music, some more ambient music for areas

2013-02-23 21:48:48 +10:00

hallucinations

TG: renamed "scary" to "hallucination", organization is the key to success

2012-04-25 00:50:05 +01:00

items

EMP now will have !!FUN!! effects on implants.

2013-01-09 12:43:22 +04:00

machines

- Added voice clip for malfunctioning AI

2012-04-24 20:51:09 +01:00

mecha

Porting much of Aryn's stuff

2012-01-31 02:01:36 -07:00

misc

added [old] roundstart music, cleaned up folders a bit

2013-02-23 18:54:01 +10:00

music

Time to bloat the DB. Added Chris Hadfield's space station cover of Space Oddity. space_oddity.ogg is also a login screen theme.

2013-05-29 13:53:15 -04:00

piano

Reverted to oldpiano until me or somebody else decides to fix baysongs and whatever bugs there are.

2012-12-30 10:03:38 +00:00

violin

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4917 316c924e-a436-60f5-8080-3fe189b3f50e

2012-10-20 02:51:12 +00:00

voice

Squashed commit of the following:

2013-05-29 13:18:44 -04:00

weapons

Merge remote-tracking branch 'remotes/git-svn' tgstation r4838 into bs12_with_tgport

2012-10-09 23:07:41 +10:00