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

2015-02-22 16:28:06 +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

…

economy

…

events

Merge with dev.

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

ext_scripts

…

flufftext

…

food

Removing unused and now uncompilable distillery code.

2015-02-21 22:37:53 +10:30

games

…

genetics

…

holodeck

Replaces stool structures with stool items

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

hydroponics

Transitioning back to using flour as a reagent. Sorry RKF.

2015-02-21 22:04:32 +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-22 16:28:06 +10:30

nano

Fixes runtime in Topics() when called from non-NanoUI sources.

2015-02-21 10:32:20 +01:00

organs

Master<dev

2015-02-21 19:57:31 +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

Merge with dev.

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

reagents

Numerous kitchen changes in tandem with prior commit. Removed processor.

2015-02-21 22:24:01 +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

Surgery now shows up on mob, in all gory glory.

2015-02-21 16:31:44 +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