PJB3005 0d30178388 git rebase --continue

2017-02-12 16:28:15 +01:00

..

admin

Tweaks the ircadminwho proc so it doesn't add a comma to the end of the message (#23799)

2017-02-08 18:33:51 +13: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-08 14:30:23 +01:00

awaymissions

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

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

cargo

Fixes hologram exports (#23642)

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

chatter

…

client

9/11

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

clothing

9/11

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

crafting

Replaces cybernetic implants with cybernetic eyes

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

detectivework

…

emoji

…

events

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

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

flufftext

…

food_and_drinks

Deepfrying : MAKE SPACE STATION 13 GREAT AGAIN (#23618)

2017-02-06 00:26:29 +13:00

games

…

holiday

…

holodeck

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

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

html_interface

…

hydroponics

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

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

jobs

Removes access to virology for medical staff who dont need it.

2017-02-07 00:40:03 +11:00

library

Soapstones now have a fixed vocabulary (and rating system!) (#23717)

2017-02-08 18:22:53 +13:00

lighting

git rebase --continue

2017-02-12 16:28:15 +01:00

mining

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

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

mob

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

2017-02-08 14:30:23 +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

[READY]Aimable wizard lightning bolts (#23723)

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

power

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

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

procedural_mapping

…

projectiles

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

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

reagents

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

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

recycling

Makes qdeleted and qdestroying macros (#23666)

2017-02-06 00:59:27 +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-08 14:30:23 +01:00

space_transition

…

spells

[READY]Aimable wizard lightning bolts (#23723)

2017-02-08 18:31:52 +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

Adds the artistic toolbox and His Grace (#23699)

2017-02-08 18:22:00 +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