PsiOmega 6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm

2015-06-26 19:22:31 +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/master' into dev-freeze

2015-06-26 19:22:31 +02:00

shuttle_console.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

shuttle_emergency.dm

Better shuttle override logging, span classes, \The, GetID() instead of typechecks

2015-05-29 18:31:21 +01:00

shuttle_ferry.dm

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

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

shuttle_specops.dm

Fixes #9511

2015-06-21 03:00:37 -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

Adds refresh button, fixes arrivals docking frequency.

2015-04-02 00:26:45 -04:00