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

..

aifixer.dm

…

arcade.dm

…

atmos_alert.dm

…

camera.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

card.dm

…

cloning.dm

…

communications.dm

tgshuttles unfinished

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

crew.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

customs.dm

…

HolodeckControl.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

law.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

medical.dm

The Great Del() Cull of 2015

2015-07-09 02:48:34 -04:00

message.dm

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05:00

Operating.dm

…

power.dm

…

prisoner.dm

Overhaul global defines and vars

2015-05-12 20:48:38 -07:00

prisonshuttle.dm

Progress bars + Wall Rationalization

2015-08-31 13:38:51 -07:00

robot.dm

…

scanconsole.dm

Used apply_effect for all radiation effects

2015-09-24 16:08:59 -07:00

security.dm

changes disabilty to crimes

2015-08-21 20:08:32 -04:00

shuttle.dm

…

specops_shuttle.dm

…

station_alert.dm

…

syndicate_shuttle.dm

…

syndicate_specops_shuttle.dm

…

welcome.dm

…