mwerezak 5be4a2f0e4 Merge remote-tracking branch 'upstream/dev' into mercenary

2015-02-21 13:22:51 -05:00

..

admin

Icarus cannon admin logs.

2015-02-20 19:54:15 +01:00

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

Adds a mostly module-less merc rig type

2015-02-20 19:21:32 -05:00

customitems

Merge branch 'guns' into gun-rewrite

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

detectivework

…

distillery

…

economy

…

events

…

ext_scripts

…

flufftext

…

food

Replaces uplink Donk-pockets with Sin-Pockets.

2015-02-11 09:55:50 +01:00

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

Merge master into dev.

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

mob

Merge pull request #8194 from comma/gore

2015-02-22 01:00:47 +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

Containers now properly checks types instead of string paths.

2015-02-14 14:16:40 +01:00

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

Gear again

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

recycling

Merge master into dev.

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

research

Merge pull request #8099 from mwerezak/gun-rewrite

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

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

…

virus2

…