Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff ...

Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm

2015-05-15 11:28:05 +03:00

..

admin

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

awaymissions

…

client

Dev merge.

2015-05-12 23:33:29 +09:30

clothing

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-14 22:20:58 +02:00

customitems

Very minor oversight.

2015-05-12 23:56:51 +09:30

detectivework

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

economy

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-09 11:13:05 +02:00

events

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-12 13:40:47 +02:00

examine

The examine tab now lists the available pen commands.

2015-05-05 09:03:43 +02:00

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-12 13:40:47 +02:00

hydroponics

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

icon generation

…

library

…

lighting

fix an issue with destroying light sources that have 0 light_range

2015-05-14 10:58:52 +01:00

liquid

…

maps

…

materials

Fixes several wall issues.

2015-05-15 13:43:00 +09:30

mining

qdel

2015-05-12 13:12:58 +09:30

mob

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

nano

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

organs

Removes unused files added by accident, separates reagent files

2015-04-28 11:00:56 +03:00

overmap

…

paperwork

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

power

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-14 22:20:58 +02:00

projectiles

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

random_map

…

reagents

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

recycling

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

research

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

scripting

…

security levels

…

shieldgen

new object-based lighting system

2015-05-10 20:54:25 +01:00

shuttles

…

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

new object-based lighting system

2015-05-10 20:54:25 +01:00

surgery

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

vehicles

new object-based lighting system

2015-05-10 20:54:25 +01:00

virus2

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00