Cael Aislinn 6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology ...

Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>

2014-06-19 10:05:27 +10:00

..

admin

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

2014-06-12 18:56:26 +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

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

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

Targeting eyes with book/paper shows book/paper

2014-05-03 19:56:55 +03:00

liquid

…

maps

…

mining

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

2014-06-19 10:05:27 +10:00

mob

Merge branch 'master' into dev

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

nano

…

organs

Fixes bleeding checks not respecting merged wounds

2014-06-16 18:49:20 -04: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 branch 'master' into dev

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

recycling

Merge pull request #5219 from Zuhayr/autolathe

2014-06-12 20:28:44 +04:00

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

2014-06-19 10:05:27 +10:00

scripting

…

security levels

Mutiny Mode

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

shuttles

Fixes special shuttle consoles being...

2014-06-18 09:37:30 -04:00

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

Separates the sharp flag into edge and sharp

2014-06-15 20:25:39 -04:00

vehicles

Cargo train tweaks

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

virus2

Fixes circuit var for other consoles

2014-05-22 18:05:57 -04:00