Jack Edge 9f9fd6efcd Merge branch 'master' into dynamic-transit

2016-07-02 11:57:32 +01:00

..

admin

Verb for clearing transit

2016-07-02 01:23:49 +01:00

assembly

no module unequip

2016-06-23 20:00:58 -04:00

atmospherics

…

awaymissions

Merge pull request #18993 from coiax/corpsehint

2016-06-30 16:38:00 +12:00

cargo

Merge pull request #18942 from coiax/free-the-export

2016-06-28 22:00:35 +12:00

chatter

…

client

Removes shadowling (#18951)

2016-06-27 20:53:35 -04:00

clothing

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

countdown

Merge pull request #18883 from coiax/domination-time

2016-06-25 14:43:40 -04:00

crafting

…

detectivework

…

emoji

…

events

Merge pull request #18729 from coiax/remove-spawn-3

2016-06-21 20:11:08 +12:00

flufftext

Code cleanup; silicons, melee, hallucinations

2016-06-24 14:03:44 +01:00

food_and_drinks

Paper cup bandaid fix

2016-06-26 19:17:43 -04:00

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

jobs

Gives miners a survival medipen instead of brute patches. (#19007)

2016-06-30 19:45:44 +12:00

library

…

lighting

Fixes mechs breaking lights by walking onto them

2016-06-23 02:51:55 -07:00

mining

Adds the tele-gulag [ready for review/merge] (#18644)

2016-07-01 13:28:58 +12:00

mob

Merge pull request #19048 from ChangelingRain/commrework

2016-07-01 19:21:22 +03:00

ninja

…

paperwork

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

power

Merge branch 'master' into random-space

2016-06-20 13:06:08 +01:00

procedural_mapping

…

projectiles

Mining tweaks, fixes and balance changes (#18697)

2016-06-28 21:58:57 +12:00

reagents

Gives miners a survival medipen instead of brute patches. (#19007)

2016-06-30 19:45:44 +12:00

recycling

…

research

Fixes/tweaks a lot of typos/descriptions. (#18956)

2016-06-28 22:02:28 +12:00

ruins

Mining tweaks, fixes and balance changes (#18697)

2016-06-28 21:58:57 +12:00

security_levels

…

shuttle

Merge branch 'master' into dynamic-transit

2016-07-02 11:57:32 +01:00

space_transition

Debugging statement commented out

2016-06-20 13:57:39 +01:00

spells

Merge branch 'master' into shuttle-processing

2016-06-26 01:00:25 +01:00

stock_market

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

surgery

Removes shadowling (#18951)

2016-06-27 20:53:35 -04:00

telesci

Ratvar speech is now misheard correctly

2016-06-27 19:08:11 +01:00

tgui

…

tooltip

…

uplink

Adds the Power Fist (#19013)

2016-07-02 14:40:22 +12:00

vehicles

conflicts + undo loc changes

2016-06-20 22:22:50 -07:00

zombie

…