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

2014-06-23 20:57:47 +01:00

..

admin

Merge pull request #5330 from mwerezak/emergency-shuttle

2014-06-23 21:19:36 +09:30

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

Adds suit cooling device

2014-06-21 16:53:18 -04: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

Having an infection raises your body temperature

2014-06-21 16:55:07 -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-23 20:57:47 +01:00

nano

…

organs

Merge pull request #5308 from mwerezak/wound-infections

2014-06-22 22:04:25 +04:00

paperwork

Merge with dev.

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

power

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

2014-06-23 20:57:47 +01: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-23 20:57:47 +01:00

recycling

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

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

research

Merge pull request #5308 from mwerezak/wound-infections

2014-06-22 22:04:25 +04:00

scripting

…

security levels

…

shuttles

Minor shuttle fixes and cleanup

2014-06-23 01:55:43 -04:00

supermatter

Nextgen lights #1: supermatter

2014-06-18 19:52:19 +04:00

surgery

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

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

vehicles

Cargo train update

2014-06-23 19:53:58 +12:00

virus2

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

2014-06-22 21:58:30 +09:30