Mark van Alphen ba0f6abb02 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/game/objects/items.dm
#	code/modules/power/cable.dm
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	icons/obj/lighting.dmi
#	paradise.dme

2019-04-30 19:26:17 +02:00

..

AI

Casing correction 1

2018-12-17 00:07:37 -05:00

ambience

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-03-30 22:55:09 +01:00

arcade

Casing correction 1

2018-12-17 00:07:37 -05:00

creatures

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-03-30 22:55:09 +01:00

effects

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-04 22:04:55 +02:00

goonstation

Add Beach biodome ruin and other fixes

2019-03-30 22:48:11 +01:00

hallucinations

…

instruments

…

items

Casing correction 1

2018-12-17 00:07:37 -05:00

machines

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE

2019-01-29 17:42:39 -05:00

magic

blood drunk miner

2019-04-04 20:34:26 +01:00

mecha

Gonna have to clean some files after this.

2019-01-19 22:38:47 -05:00

misc

Merge pull request #11090 from Tails2091/Animal_Sounds

2019-03-24 17:55:01 +08:00

music

Added fade-out to the song and slightly reduced volume to the original sound levels

2019-04-04 12:18:13 +02:00

spookoween

…

turntable

Gonna have to clean some files after this.

2019-01-19 22:38:47 -05:00

voice

Adds deathsound for Silicons

2019-04-19 22:04:33 +02:00

vox_fem

Removed happied

2018-11-20 21:10:45 -05:00

weapons

Added bola throw sound, sound equality across all bolas

2019-04-21 20:25:14 +02:00

weather/ashstorm

…

Attributions.txt

Merged license.txt files.

2019-03-23 15:46:37 -04:00

serversound_list.txt

…