Commit Graph

445 Commits

Author SHA1 Message Date
Mark van Alphen
ba3f65049d Port over remaining Lavaland ruins 2019-06-07 01:19:55 +02:00
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
variableundefined
cb3ba0f5d0 Merge pull request #11334 from Arkatos1/BorgDeathSound
Adds deathsound for Silicons
2019-04-30 09:57:16 +08:00
Arkatos1
d31b159813 Added bola throw sound, sound equality across all bolas 2019-04-21 20:25:14 +02:00
Arkatos1
918bee37d3 Adds deathsound for Silicons 2019-04-19 22:04:33 +02:00
Mark van Alphen
f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
2019-04-10 21:54:54 +02:00
Mark van Alphen
a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
Mark van Alphen
d077138c3d Merge pull request #4 from CornMyCob/turfs
blood drunk miner
2019-04-04 21:41:45 +02:00
CornMyCob
e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen
99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Arkatos1
f23c9526b6 Added fade-out to the song and slightly reduced volume to the original sound levels 2019-04-04 12:18:13 +02:00
Arkatos1
a6890ba433 Added higher quality version of Title2.ogg 2019-04-03 19:54:27 +02:00
Fox McCloud
a7cc99ecf7 Merge pull request #11179 from Ty-Omaha/grid-check
Adds super cool powerloss sound to grid check event
2019-04-02 18:16:15 -04:00
Mark van Alphen
57366118af Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 2019-04-01 17:55:37 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00
Mark van Alphen
45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
2019-03-30 22:55:09 +01:00
Mark van Alphen
f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Ty-Omaha
250e8ec7b4 super cool powerloss sound 2019-03-30 12:07:57 -04:00
Mark van Alphen
f0dab66ebc Further turf updates, add Necropolis/boss turfs 2019-03-30 01:24:03 +01:00
Mark van Alphen
fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Ty-Omaha
a622330004 new siren 2019-03-28 22:43:06 -04:00
variableundefined
ec46fdc510 Merge pull request #11090 from Tails2091/Animal_Sounds
Added Emotes and Sounds to Corgis and Cats. Moved Animal Sounds to Creature Folder.
2019-03-24 17:55:01 +08:00
Tails2091
6b4d074458 Merged license.txt files. 2019-03-23 15:46:37 -04:00
Tails2091
f77fbe9d0c Added license information 2019-03-21 15:21:48 -04:00
Tails2091
a34f1054ce Add Cat/Corgi emotes and sounds
Organized creature sounds into creature sound folder.
2019-03-21 14:35:00 -04:00
variableundefined
4521747046 Merge pull request #10750 from Nicaragua1/General_Griefsky
General Griefsky
2019-02-16 18:41:35 +08:00
Shadeykins
36fc8f8935 Update thunderdome.ogg 2019-02-02 06:08:40 -07:00
Shadeykins
0d061463b0 Fixes Thunderdome volume 2019-02-02 06:05:18 -07:00
Aurorablade
bc76ef9123 somtimes when you deconflict/update you will do something stupid 2019-01-29 17:49:52 -05:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
Granodd
e3c0acfd42 ACTUALLY changes file names to lower case 2019-01-26 20:47:33 -05:00
Granodd
6c53564df2 Merge branch 'master' into GunsAndGunAccessories
# Conflicts:
#	code/modules/projectiles/guns/projectile/automatic.dm
2019-01-26 02:17:22 -05:00
Nicaragua
a5bd5875cb removing unnecesary code from beepsky 2019-01-25 04:48:04 -03:00
Nicaragua
8175d67b2e honk_bot from V2
Originaly from PULL

https://github.com/ParadiseSS13/Paradise/pull/10656
2019-01-21 12:31:47 -03:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00
Aurorablade
bbe6370b91 This is why case insensative things suck kids
Repo clean dupe files.
2019-01-19 23:28:34 -05:00
Aurorablade
0ff4d93cb9 Delete Knock.ogg 2019-01-19 23:04:23 -05:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
Nicaragua
c9e613ca9e gamemode vampire sound 2019-01-17 11:48:18 -03:00
variableundefined
e892535b27 Merge pull request #10364 from Allfd/nofunallowed
Remove fart based mechanics
2018-12-24 09:13:47 +08:00
Aurorablade
86d2a1634c Casing correction 1 2018-12-17 00:07:37 -05:00
variableundefined
167975b39e Merge pull request #10427 from Tails2091/smash-fix
Removes 300ms delay to smash sound
2018-12-13 22:59:11 +08:00
Aurorablade
0b5c7d8c2e well this did not push the first time 2018-12-11 00:08:31 -05:00
Tails2091
a7e9fd0ad9 Removes 300ms delay to smash sound
you know, for better feedback and such
2018-12-07 23:14:53 -05:00
Granodd
bdb51ac7c6 make sure the sounds are there 2018-12-02 03:22:05 -05:00
Granodd
9725c7536b Refactors reloading and adds new gun sounds to ballistics 2018-12-02 03:20:05 -05:00
Alffd
e2e5f71ec7 Remove fartbased everything 2018-11-26 21:48:45 -05:00
variableundefined
214cf7b12e Merge pull request #10288 from datlo/basicsofCQC
Snake, try to remember some of the basics of CQC.
2018-11-22 08:53:26 +08:00
variableundefined
c3f86a0629 Merge pull request #10289 from MrKicker/master
Adds more words to ai vox
2018-11-21 13:16:09 +08:00
MrKicker
1775469e81 Removed happied
not a word
2018-11-20 21:10:45 -05:00