Jack Edge 5da579b7c4 Merge branch 'master' into random-space ...

Conflicts:
	_maps/asteroidstation.dm

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

..

admin

Merge branch 'master' into random-space

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

assembly

stop the pills (#18703)

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

atmospherics

Merge pull request #18637 from lzimann/patch-9

2016-06-18 11:36:20 +12:00

awaymissions

Merge branch 'master' into random-space

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

cargo

Adds potted plants to cargo packs (#18662)

2016-06-19 14:05:18 -05:00

chatter

…

client

Merge pull request #17069 from MrStonedOne/XKeyscore

2016-06-19 01:17:59 +12:00

clothing

stop the pills (#18703)

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

countdown

stop the pills (#18703)

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

crafting

…

detectivework

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

emoji

…

events

stop the pills (#18703)

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

flufftext

stop the pills (#18703)

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

food_and_drinks

stop the pills (#18703)

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

games

…

holiday

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

holodeck

Snow holodeck is now cold, but air pressure

2016-06-16 19:25:51 +01:00

html_interface

…

hydroponics

stop the pills (#18703)

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

jobs

Adds explorer gas mask for lavaland miners

2016-06-11 10:38:53 +03:00

library

Devil fixes (#18520)

2016-06-14 15:43:33 +12:00

lighting

StonedMC, the bastard love child of GoonPS and CarnMC (#17987)

2016-06-16 18:01:16 +12:00

mining

stop the pills (#18703)

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

mob

stop the pills (#18703)

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

ninja

…

paperwork

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

power

Merge branch 'master' into random-space

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

procedural_mapping

…

projectiles

stop the pills (#18703)

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

reagents

stop the pills (#18703)

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

recycling

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

research

stop the pills (#18703)

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

ruins

Merge branch 'master' into random-space

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

security_levels

…

shuttle

stop the pills (#18703)

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

space_transition

…

spells

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

stock_market

stop the pills (#18703)

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

surgery

stop the pills (#18703)

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

telesci

Merge branch 'master' into random-space

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

tgui

…

tooltip

…

uplink

Rebalances radioactive microlaser (#18537)

2016-06-17 09:11:52 +12:00

vehicles

Added priority overlay system. (#18225)

2016-06-17 10:11:53 +12:00

zombie

Adds DROPDEL flag; items will qdel() on dropped()

2016-06-17 12:14:28 +01:00