Tigercat2000 42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm

2015-12-09 10:08:28 -08:00

..

antagonist.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

departmental.dm

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

escape_pods.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

shuttle_console.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

shuttle_emergency.dm

Span fixes, re-add fingerprint to operating computer

2015-07-28 02:42:27 +02:00

shuttle_ferry.dm

…

shuttle_specops.dm

Span fixes, re-add fingerprint to operating computer

2015-07-28 02:42:27 +02:00

shuttle_supply.dm

R&D Update and Fix & Cargo Tweaks

2015-09-07 20:03:06 -04:00

shuttle.dm

-tg- SpaceMove update

2015-09-25 15:53:59 -07:00

shuttles_multi.dm

tgshuttles unfinished

2015-12-03 10:59:06 -08:00

whiteship.dm

Circuit Board Repathing and Swarmer Fixes

2015-11-06 21:21:36 -05:00