Zuhayr 5b9eefdebf Merge with dev.

2015-05-15 23:22:48 +09:30

..

admin

Added exosuit customisation kits to cargo.

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

alarm

…

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

Fixes #9250

2015-05-15 18:26:53 +09:30

customitems

Very minor oversight.

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

detectivework

…

economy

…

events

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

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

examine

…

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 with dev.

2015-05-15 23:22:48 +09:30

nano

better nanoui caching + fixes

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

organs

…

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 with dev.

2015-05-15 23:22:48 +09:30

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

…

shuttles

…

spells

…

supermatter

…

surgery

…

vehicles

…

virus2

…