Markolie 9adff714b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into sql ...

Conflicts:
	code/controllers/configuration.dm
	config/example/config.txt

2015-09-23 07:07:17 +02:00

..

admin

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

2015-09-23 07:07:17 +02:00

alarm

Display case update, some forceMove updates

2015-09-14 20:21:56 +02:00

assembly

Implement remove_item_from_storage properly, syndi toolbox tool color update

2015-09-16 01:54:34 +02:00

atmos_automation

Pipenet overhaul

2015-09-21 02:11:54 +02:00

awaymissions

…

client

Preference option for instruments/sanitize tempo

2015-09-23 07:00:01 +02:00

clothing

Merge remote-tracking branch 'origin/master' into bay_examine

2015-09-15 14:08:36 -07:00

computer3

…

crafting

…

customitems

SQL update

2015-09-23 06:13:42 +02:00

destilery

…

DetectiveWork

…

economy

Missing variable

2015-09-22 01:51:28 +02:00

events

Pipenet overhaul

2015-09-21 02:11:54 +02:00

examine

Bayxamine: WEAPONS\!

2015-09-15 09:10:17 -07:00

ext_scripts

…

fish

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

flufftext

Pass III

2015-09-18 21:15:08 -04:00

food

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

games

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

garbage collection

gcDestroyed fixes

2015-09-21 02:33:53 +02:00

genetics2

…

holiday

…

hydroponics

Pipenet overhaul

2015-09-21 02:11:54 +02:00

icon generation

…

jungle

Guns update

2015-09-14 04:05:20 +02:00

karma

SQL update

2015-09-23 06:13:42 +02:00

library

Fixes

2015-09-23 06:22:00 +02:00

lighting

Fixes light sources getting destroyed after their colour changes (no updates in between) leaving artifacts.

2015-09-12 22:51:10 +02:00

liquid

…

media

…

mining

Merge pull request #2091 from Fox-McCloud/destroy-them-all

2015-09-18 22:30:49 -04:00

mob

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

2015-09-23 07:07:17 +02:00

nano

Merge pull request #2049 from Markolie/display

2015-09-15 16:02:43 -04:00

ninja

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

organs

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

2015-09-23 07:07:17 +02:00

paperwork

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

2015-09-22 00:17:30 +02:00

pooling

…

power

qdel() dem powernets

2015-09-21 01:17:12 -04:00

procedural mapping

…

projectiles

Saber SMG update, add armour piercing variable

2015-09-21 22:50:07 +02:00

reagents

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

2015-09-22 00:17:30 +02:00

recycling

sprite-revert

2015-09-07 16:55:40 -04:00

research

Research consoles auto sync fix

2015-09-23 02:52:07 +02:00

scripting

…

security levels

…

shieldgen

Pass II

2015-09-04 16:32:18 -04:00

shuttles

R&D Update and Fix & Cargo Tweaks

2015-09-07 20:03:06 -04:00

store

…

surgery

Clans Up Surgery Files

2015-09-21 07:17:23 -04:00

telesci

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

tram

…

vehicle

Bay12 examine overhaul.

2015-09-14 11:51:40 -07:00

virus2

fix for symptom

2015-09-21 21:10:20 -04:00