mwerezak cc287d00db Shuttles now dock on arrival and departure ...

Squashes 3 commits:

Shuttles now dock on arrival and departure

Adds docking controller to outpost, tweaks

Finishes off shuttle_console
Could use some cleanup, though.
Commented out the debug stuff.

Conflicts:
	code/controllers/master_controller.dm
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
	code/modules/shuttles/shuttle.dm
	maps/tgstation2.dmm

2014-06-14 04:17:37 -04:00

..

admin

Reworks shuttles to be more extensible

2014-06-14 04:13:34 -04:00

assembly

HurrDurr

2014-05-30 22:29:11 -04:00

awaymissions

Smoke rework caused endless loops, reverted.

2014-04-08 01:47:56 +02:00

client

Preferences fixes

2014-06-10 03:32:14 -04:00

clothing

Donator fluff item

2014-06-11 15:52:01 +09:30

customitems

Moar armalis fixes

2014-05-14 23:00:13 -04:00

destilery

…

detectivework

…

DetectiveWork

…

economy

Paperpocolypse changes.

2014-05-29 10:32:19 -04:00

events

Revert "Fix rad alert lighting."

2014-05-26 15:53:30 -04:00

ext_scripts

We use this

2014-05-30 11:22:36 -04:00

flufftext

…

food

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

genetics

…

genetics2

Add some parts of genetics 2.0

2014-04-30 14:14:24 -04:00

hydroponics

…

icon generation

…

library

Adds the ability to construct, destroy, and take apart bookcases.

2014-04-19 19:13:33 -04:00

liquid

First commit of liquid simulation stuff

2014-05-23 14:31:29 -04:00

maps

…

media

2nd commit of MySQL conversion. So close to the finish line.

2014-06-03 03:31:06 -04:00

mining

Moved engineering, research and mining shuttles to a generalized system with its own directory structure.

2014-06-14 02:01:14 -04:00

mob

Machine people have no internal organs

2014-06-10 03:32:34 -04:00

nano

Fixes a nano runtime when the oldMob is null during a user_transfer

2014-04-23 11:48:14 -04:00

organs

Fixed an issue with IBs being almost twice as bad

2014-06-05 16:10:17 -04:00

paperwork

Removes Impedrezene from the Paralysis Pen

2014-06-08 18:30:56 -04:00

power

Fixes #5098

2014-06-01 13:29:18 -04:00

projectiles

Fixes a bunch more hurt -> harm checks

2014-06-14 01:02:29 -04:00

reagents

Fixes a bunch more hurt -> harm checks

2014-06-14 01:02:29 -04:00

recycling

Trying to cut down on attack lock spam

2014-05-24 17:17:38 -04:00

research

Moved engineering, research and mining shuttles to a generalized system with its own directory structure.

2014-06-14 02:01:14 -04:00

scripting

…

security levels

Mutiny Mode

2014-05-15 01:01:54 -04:00

shuttles

Shuttles now dock on arrival and departure

2014-06-14 04:17:37 -04:00

store

Can't forget Ian

2014-05-26 05:52:08 -04:00

supermatter

Rebalanced some rigs + SM typo fix

2014-05-10 18:15:25 +02:00

surgery

spelling fixes

2014-05-29 10:32:09 -04:00

virus2

Made hyperzine harder to make properly.

2014-06-06 02:35:10 -04:00