mwerezak 1c91b2984d Supply controller now holds a ref to it's shuttle ...

Instead of having to look it up every time.

2014-06-22 14:18:52 -04: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

…

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 branch 'master' into dev

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

mob

Armour can turn sharp attacks into blunt ones

2014-06-18 10:28:23 -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

Fixes human/checkarmor getting the armour...

2014-06-18 10:05:04 -04:00

recycling

Adds supply shuttle docking controllers

2014-06-18 21:25:17 -04:00

research

Merge branch 'master' into dev

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

scripting

…

security levels

…

shuttles

Supply controller now holds a ref to it's shuttle

2014-06-22 14:18:52 -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

Merge branch 'backup' into medical

2014-06-19 15:36:28 +02: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