Zuhayr 9c45f000ec Merge with dev.

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

..

admin

Merge with dev.

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

assembly

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

awaymissions

Conflict fix

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

client

Merge pull request #8135 from Baystation12/master

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

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

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30

distillery

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

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

economy

Merge resolution.

2015-01-12 07:17:02 +10:30

events

Merge with dev.

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

ext_scripts

…

flufftext

…

food

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

2015-02-14 09:32:17 +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

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

liquid

…

maps

…

mining

Readds predefined ambrosia items.

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

mob

Merge with dev.

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

nano

pAI rework

2015-02-09 01:58:54 +00:00

organs

Merge with dev.

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

overmap

Compile fix

2015-02-03 08:39:39 +03:00

paperwork

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

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

power

Merge pull request #8099 from mwerezak/gun-rewrite

2015-02-16 11:54:52 +03:00

projectiles

Tweaks bullet penetration

2015-02-16 03:04:48 -05:00

random_map

Merge with dev.

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

reagents

Merge with dev.

2015-02-16 20:34:07 +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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

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