Pieter-Jan Briers 9b20c1e6c2 Merge remote-tracking branch 'upstream/master' into rebase-to-vg

2017-02-18 23:40:34 +01:00

..

admin

Merge pull request #24128 from Cyberboss/JobTicker

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

assembly

Rebalances flashes (#24111)

2017-02-17 14:28:20 +13:00

atmospherics

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

2017-02-18 16:52:07 +01:00

awaymissions

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

2017-02-18 16:52:07 +01:00

cargo

Fixes hologram exports (#23642)

2017-02-03 19:47:16 -06:00

chatter

…

client

Merge pull request #24052 from MrStonedOne/patch-310

2017-02-17 21:20:39 +13:00

clothing

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

2017-02-18 16:52:07 +01:00

crafting

Replaces cybernetic implants with cybernetic eyes

2017-02-03 18:47:49 -06:00

detectivework

makes all admin fingerprints store ckey

2017-02-12 20:29:01 -08:00

emoji

…

error_handler

Ports Paradise error handler, with in game runtime viewer! (#24036)

2017-02-14 11:39:31 +11:00

events

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

2017-02-18 16:52:07 +01:00

flufftext

…

food_and_drinks

Adds bran requests (#24150)

2017-02-18 01:10:21 +13:00

games

…

holiday

…

holodeck

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

2017-02-18 16:52:07 +01:00

html_interface

…

hydroponics

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

2017-02-18 16:52:07 +01:00

jobs

Clown internals box is now a box of hugs

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

library

Engraved messages UI and fixes (#23700)

2017-02-17 09:54:30 +13:00

lighting

Fixes

2017-02-18 23:39:11 +01:00

mining

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

2017-02-18 23:40:34 +01:00

mob

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

2017-02-18 23:40:34 +01:00

modular_computers

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

2017-02-18 16:52:07 +01:00

ninja

…

orbit

…

paperwork

Fixes some more goddamn typos and bad writing. (#24095)

2017-02-17 14:10:58 +13:00

power

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

2017-02-18 16:52:07 +01:00

procedural_mapping

…

projectiles

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

2017-02-18 23:40:34 +01:00

reagents

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

2017-02-18 16:52:07 +01:00

recycling

Faster, non-blocking world init (#23136)

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

research

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

2017-02-18 23:40:34 +01: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-18 16:52:07 +01:00

space_transition

…

spells

Advanced Mimery Kit (#23978)

2017-02-19 00:49:40 +13:00

station_goals

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

2017-02-18 16:52:07 +01:00

stock_market

Makes the stock ticker recognize that it is CURENT YEAR (#23533)

2017-02-03 00:24:48 +13:00

surgery

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

2017-02-18 16:52:07 +01:00

telesci

no s

2017-02-17 08:33:21 +01:00

tgui

…

tooltip

His Grace is a better item and less globally-announced (#23951)

2017-02-16 15:18:45 +01:00

uplink

Advanced Mimery Kit (#23978)

2017-02-19 00:49:40 +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

Improved Zombie Revive (#23601)

2017-02-03 19:43:37 -06:00