PJB3005 dec97db5b6 Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 22:16:10 +01:00

..

admin

Merge pull request #23940 from lzimann/namedarg

2017-02-11 13:41:45 -05:00

assembly

Merge pull request #23703 from coiax/borg-module-tweaks

2017-02-08 18:23:13 +13:00

atmospherics

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

awaymissions

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

cargo

…

chatter

…

client

9/11

2017-02-08 15:07:58 +01:00

clothing

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

crafting

…

detectivework

…

emoji

…

events

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

flufftext

…

food_and_drinks

[READY]Blacklists tools, part exchangers, and beakers from the deep fryer. Allows them to be unanchored, and deconstructed (#23889)

2017-02-11 15:27:47 +13:00

games

…

holiday

…

holodeck

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

html_interface

…

hydroponics

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

jobs

Clown internals box is now a box of hugs

2017-02-10 20:24:03 +00:00

library

Revert "Soapstones now have a fixed vocabulary (and rating system!)" (#23909)

2017-02-10 10:06:14 -06:00

lighting

axe

2017-02-12 19:48:02 +01:00

mining

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

mob

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 22:16:10 +01:00

modular_computers

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

ninja

…

orbit

…

paperwork

Poison Pen (#23778)

2017-02-12 14:17:47 +13:00

power

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

reagents

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

recycling

Faster, non-blocking world init (#23136)

2017-02-10 16:53:08 +13:00

research

[READY]Aimable wizard lightning bolts (#23723)

2017-02-08 18:31:52 +13:00

ruins

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

security_levels

…

shuttle

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-12 16:35:57 +01:00

space_transition

…

spells

[READY]slight tweak to make adminbuse/varediting better (#23894)

2017-02-12 12:50:49 +13:00

station_goals

Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-08 14:30:23 +01:00

stock_market

…

surgery

9/11

2017-02-08 15:07:58 +01:00

telesci

…

tgui

…

tooltip

…

uplink

Poison Pen (#23778)

2017-02-12 14:17:47 +13:00

vehicles

Removes "it seems pristine and undamaged." (#23708)

2017-02-06 18:32:57 +13:00

VR

Makes qdeleted and qdestroying macros (#23666)

2017-02-06 00:59:27 +13:00

zombie

…