Jack Edge 3f5d8c4b00 Merge branch 'master' into slimeperson-qol ...

Conflicts:
	code/__DEFINES/misc.dm
	tgui/assets/tgui.js

2016-06-27 11:53:47 +01:00

..

admin

Merge branch 'master' into shuttle-processing

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

assembly

no module unequip

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

atmospherics

Merge pull request #18637 from lzimann/patch-9

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

awaymissions

Fixes three problems of my own identification/invention (#18824)

2016-06-22 17:03:09 -05:00

cargo

Merge pull request #18741 from KorPhaeron/tacticalespionageaction

2016-06-22 12:08:05 +12:00

chatter

…

client

findJoinDate only procs if a client is not a Guest and the DB is connected. As Jordie requested.

2016-06-22 06:33:32 -05:00

clothing

Atmos and engineering wintercoats can now hold RPD (#18922)

2016-06-26 22:43:39 -04: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

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

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

games

…

holiday

…

holodeck

…

html_interface

…

hydroponics

stop the pills (#18703)

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

jobs

…

library

…

lighting

Fixes mechs breaking lights by walking onto them

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

mining

A lot of shuttle changes

2016-06-25 17:28:46 +01:00

mob

Merge branch 'master' into slimeperson-qol

2016-06-27 11:53:47 +01:00

ninja

…

paperwork

…

power

Merge branch 'master' into random-space

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

procedural_mapping

…

projectiles

Make Staff of Honkmother slightly less OP (#18802)

2016-06-22 03:23:05 -05:00

reagents

Merge pull request #18785 from Incoming5643/patch-12

2016-06-22 12:32:23 +12:00

recycling

…

research

fixes magnet (#18867)

2016-06-23 11:52:52 -04:00

ruins

Merge pull request #18484 from coiax/random-space

2016-06-23 09:12:48 +12:00

security_levels

…

shuttle

Merge branch 'master' into shuttle-processing

2016-06-26 01:00:25 +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

Fixes three problems of my own identification/invention (#18824)

2016-06-22 17:03:09 -05:00

telesci

Removes crappy hard defines from telescience

2016-06-24 20:24:04 -04:00

tgui

Changling evolution menu becomes cellular emporium

2016-06-17 16:37:09 +01:00

tooltip

…

uplink

Merge pull request #18820 from Xhuis/the_pinnacle_of_deception_technology

2016-06-24 20:14:59 +12:00

vehicles

conflicts + undo loc changes

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

zombie

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

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