Zuhayr 2ecd76b07f Master merge.

2015-02-21 19:51:28 +10:30

..

admin

Dev merge.

2015-02-21 19:49:47 +10:30

assembly

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

awaymissions

…

client

Merge pull request #8179 from comma/undies

2015-02-20 17:01:25 +10:30

clothing

Dev merge.

2015-02-21 19:49:47 +10:30

customitems

Merge branch 'guns' into gun-rewrite

2015-02-11 18:08:43 -05:00

detectivework

…

distillery

…

economy

…

events

…

ext_scripts

…

flufftext

…

food

KITCHEN CODE IS WORKING. YES. I CAN DIE NOW.

2015-02-16 22:11:59 +10:30

games

…

genetics

…

holodeck

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

hydroponics

Gear again

2015-02-18 15:35:37 -05:00

icon generation

…

library

…

liquid

…

maps

…

mining

Readds predefined ambrosia items.

2015-02-13 05:53:45 +10:30

mob

Master merge.

2015-02-21 19:51:28 +10:30

nano

NanoUI atmosphere control and remote air alarm support.

2015-02-20 17:39:55 +01:00

organs

Master merge.

2015-02-21 19:51:28 +10:30

overmap

…

paperwork

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

2015-02-15 22:03:17 +10:30

power

Merge pull request #8175 from Kelenius/ofBorgsAndSynths

2015-02-21 11:43:39 +03:00

projectiles

Merge pull request #8157 from mwerezak/gun-rewrite

2015-02-21 07:52:58 +03:00

random_map

…

reagents

Dev merge.

2015-02-21 19:49:47 +10:30

recycling

Merge master into dev.

2015-02-12 23:01:08 +10:30

research

Merge with dev.

2015-02-16 20:34:07 +10:30

scripting

…

security levels

…

shieldgen

…

shuttles

…

supermatter

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

surgery

…

vehicles

…

virus2

…