Mloc-Argent dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm

2014-06-20 22:02:40 +01:00

..

admin

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

2014-06-20 22:02:40 +01:00

assembly

Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this.

2014-06-11 01:14:38 +09:30

awaymissions

…

client

Wheelchairs spawn on footless characters

2014-06-05 22:50:42 -04:00

clothing

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

2014-06-12 18:56:26 +01:00

customitems

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

2014-06-20 22:02:40 +01:00

destilery

…

detectivework

Fixes some printouts causing a runtime error when photocopied

2014-06-07 18:27:22 +02:00

economy

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

events

Merge pull request #5086 from UristMcKerman/spam-filter

2014-06-01 20:09:06 +04:00

ext_scripts

Bot down? Let's not lock up the entire server.

2014-05-29 21:36:34 -05:00

flufftext

…

food

First pass on ore distribution map and stationary drilling rig.

2014-06-07 23:07:49 +09:30

games

Added playing cards.

2014-06-07 23:00:11 +09:30

genetics

…

hydroponics

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

icon generation

…

library

…

liquid

…

maps

…

mining

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

2014-06-20 22:02:40 +01:00

mob

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

2014-06-20 22:02:40 +01:00

nano

…

organs

Fixes #5291 and another wound runtime

2014-06-18 12:44:08 +01:00

paperwork

Merge with dev.

2014-06-12 01:14:40 +09:30

power

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

projectiles

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

reagents

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

2014-06-20 22:02:40 +01:00

recycling

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

2014-06-20 22:02:40 +01:00

research

switched autocloner and replicator artifacts over to a timer system, made replicator use materials to create items (materials can be anything)

2014-06-20 18:42:38 +10:00

scripting

…

security levels

Mutiny Mode

2014-05-11 15:03:50 -05:00

shuttles

Merge pull request #5301 from mwerezak/cargo-shuttle2

2014-06-19 21:08:29 +09:30

supermatter

Supermatter becomes anchored when detonating, and is hence not pushed by mobs than gib against it.

2014-06-02 03:34:58 +08:00

surgery

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

2014-06-20 22:02:40 +01:00

vehicles

Cargo train tweaks

2014-06-16 20:54:18 +12:00

virus2

Merge pull request #5280 from comma/virus-racism

2014-06-19 14:21:19 +01:00