Jack Edge 27d6c284ed Merge branch 'fun-balloon' into shuttle-processing ...

Conflicts:
	_maps/shuttles/emergency_bar.dmm
	_maps/shuttles/emergency_narnar.dmm
	code/modules/spells/spell_types/wizard.dm

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

..

admin

Merge branch 'fun-balloon' into shuttle-processing

2016-06-25 16:26:22 +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

improve chatter regex to prevent infinite loop

2016-05-15 20:12:17 +12:00

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

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

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

countdown

stop the pills (#18703)

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

crafting

Re-adds Spear to tablecrafting menu, SLAPCRAFTING IS STILL ALIVE (#17985)

2016-05-29 08:29:21 -05:00

detectivework

Added priority overlay system. (#18225)

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

emoji

…

events

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

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

flufftext

stop the pills (#18703)

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

food_and_drinks

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

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

games

Even more Cards Against Spess tweaks. (#17398)

2016-05-09 15:00:40 -05:00

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

Fixes mechs breaking lights by walking onto them

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

mining

Stabilizing Serum is named properly in the mining vendor

2016-06-23 22:58:18 -04:00

mob

Merge pull request #18872 from ChangelingRain/poolorgib

2016-06-25 17:34:30 +12:00

ninja

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

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

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

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

Added priority overlay system. (#18225)

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

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

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

shuttle

Merge pull request #18723 from coiax/pond-skipping

2016-06-22 11:24:44 -05:00

space_transition

Debugging statement commented out

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

spells

Merge branch 'fun-balloon' into shuttle-processing

2016-06-25 16:26:22 +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

Merge branch 'master' into random-space

2016-06-20 13:06:08 +01: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