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

2015-02-18 14:17:39 +10:30

..

admin

Merge with dev.

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

assembly

…

awaymissions

Conflict fix

2015-02-03 20:57:16 +03:00

client

Adds a wardrobe structure to pick your underwear.

2015-02-16 11:17:22 +03:00

clothing

Merge with dev.

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

customitems

Merge branch 'guns' into gun-rewrite

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

detectivework

…

distillery

Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.

2015-02-04 10:55:33 +10:30

economy

…

events

Merge with dev.

2015-02-05 20:24:06 +10:30

ext_scripts

…

flufftext

…

food

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

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

games

…

genetics

…

holodeck

Missing files added

2015-02-04 20:40:39 +08:00

hydroponics

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

2015-02-14 23:44:01 +10:30

icon generation

…

library

…

liquid

…

maps

…

mining

Readds predefined ambrosia items.

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

mob

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

2015-02-18 14:17:39 +10:30

nano

The AI now has a personal power monitor interface.

2015-02-16 15:12:23 +01:00

organs

Merge with dev.

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

overmap

…

paperwork

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

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

power

The AI now has a personal power monitor interface.

2015-02-16 15:12:23 +01:00

projectiles

Fixes projectiles embedding in mobs that they pass through

2015-02-17 01:36:50 -05:00

random_map

Merge with dev.

2015-02-05 20:24:06 +10:30

reagents

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

2015-02-18 14:17:39 +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

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Fixes startup runtime

2015-02-06 08:54:28 +00:00