GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables ...

Conflicts:
	code/setup.dm

2015-05-16 08:53:33 +01:00

..

admin

Added exosuit customisation kits to cargo.

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

alarm

…

assembly

…

awaymissions

…

client

Dev merge.

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

clothing

Merge pull request #9286 from Zuhayr/dev

2015-05-16 00:53:14 -04:00

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +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

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01: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

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

2015-05-16 08:53:33 +01:00

mining

…

mob

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

2015-05-16 08:53:33 +01:00

nano

better nanoui caching + fixes

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

organs

Fixes #8842

2015-05-15 23:53:59 +09:30

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

…

research

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

2015-05-16 08:53:33 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

…

surgery

…

tables

Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks

2015-05-15 04:47:18 +01:00

vehicles

…

virus2

…