Iamgoofball d091031ca6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into muh_doctors_delight ...

Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm

2015-03-24 18:03:11 -07:00

..

admin

Removes Recursive Explosions

2015-03-19 03:23:14 -04:00

assembly

Bug fixes, update quick create object

2015-03-02 21:20:12 +01:00

awaymissions

Insulated Gloves Fix

2015-03-08 19:12:35 -04:00

client

Adds pref SOUND_HEARTBEAT

2015-03-17 17:30:28 +01:00

clothing

Merge pull request #635 from Fox-McCloud/Taperecorder

2015-03-24 08:01:16 -04:00

computer3

Merge branch 'master' of https://github.com/Markolie/Paradise

2015-03-04 19:34:21 +01:00

crafting

Teleporter Gun, Fixes, and Tweaks

2015-03-22 02:45:02 -04:00

customitems

Custom Item - Telvayne

2015-02-25 12:46:44 -05:00

destilery

…

DetectiveWork

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

economy

Central Command access rework

2015-03-04 16:36:17 +01:00

events

Superhero update

2015-03-05 15:53:15 -05:00

ext_scripts

…

flufftext

Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4

2015-03-08 19:05:36 +01:00

food

Kitchen Overhaul Fixes

2015-03-10 01:50:30 -04:00

games

…

genetics

…

genetics2

…

hydroponics

…

icon generation

…

jungle

Fixes meat harvesting of some simple_animals

2015-03-22 05:08:32 +01:00

karma

Adds Plasmaman to Karma Shop

2015-03-05 14:35:17 -05:00

library

…

liquid

…

media

Switch jukebox from WMP to VLC (CROSS PLATFORM, OGG SUPPORT)

2015-02-26 12:46:56 -05:00

mining

Crayons and Gloves

2015-03-06 21:40:57 -05:00

mob

GOONCHEM

2015-03-24 02:04:47 -07:00

nano

Merge pull request #528 from TheDZD/nano_pai

2015-03-08 13:23:05 -04:00

ninja

Merge pull request #598 from SamCroswell/NinjaDev

2015-03-18 22:45:59 +01:00

organs

Fix blood drip colors

2015-03-04 11:40:26 -05:00

paperwork

Photocopier fix

2015-03-16 18:56:51 +01:00

power

Fixes related issue with spamclicking lights

2015-03-22 18:36:54 +01:00

projectiles

Merge pull request #626 from Fox-McCloud/Guns-Fixes

2015-03-23 15:38:44 +01:00

reagents

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

2015-03-24 18:03:11 -07:00

recycling

ArtVend

2015-03-07 03:26:45 -05:00

research

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

2015-03-24 16:35:06 -07:00

scripting

…

security levels

ERT equipment rework

2015-03-03 22:51:54 +01:00

shieldgen

…

shuttles

Central Command access rework

2015-03-04 16:36:17 +01:00

store

…

supermatter

…

surgery

…

telesci

Fixes

2015-03-16 18:49:47 +01:00

vehicles

Finally got colored blood working properly

2015-03-03 13:45:46 -05:00

virus2

Chemistry Cleanup and Fixes

2015-03-01 16:34:23 -05:00