PsiOmegaDelta 5fbe0819b7 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs ...

Conflicts:
	code/game/machinery/Sleeper.dm

2015-08-17 13:05:58 +02:00

..

antagonist.dm

First pass on making heist a pirate mode (human based)

2015-03-21 11:13:05 +10:30

departmental.dm

Cleans up access handling.

2015-03-02 18:55:03 +01:00

escape_pods.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-06-26 20:28:47 +02:00

shuttle_console.dm

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

shuttle_emergency.dm

Updates emag attackby usages to emag_act where it's not too much of a headache.

2015-06-16 09:34:13 +02:00

shuttle_ferry.dm

Corrects names of computers, code formatting, updated computer descriptions.

2014-12-14 05:00:38 +01:00

shuttle_specops.dm

Adds lights to ERT shuttle, ERT ready light

2015-07-12 18:41:24 -04:00

shuttle_supply.dm

Corrects names of computers, code formatting, updated computer descriptions.

2014-12-14 05:00:38 +01:00

shuttle.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

shuttles_multi.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00