Tigercat2000 0a66ac4ba5 Merge remote-tracking branch 'upstream/master' into HolidayDatums ...

Conflicts:
	code/__DEFINES/misc.dm

2015-05-16 18:40:54 -07:00

..

air.dm

LINDA, Stage 1

2015-04-28 08:43:42 -07:00

bot.dm

Bug fixes, bot proces controller update

2015-02-24 01:40:43 +01:00

disease.dm

…

emergencyShuttle.dm

…

event.dm

Change holidays into datums

2015-05-15 20:52:39 -07:00

garbage.dm

…

inactivity.dm

Disable inactivity kick

2015-03-01 00:30:55 +01:00

machinery.dm

…

mob.dm

FIX: Mob ticker is now in \red \b.

2015-05-15 17:21:16 -07:00

nanoui.dm

…

obj.dm

…

pipenet.dm

…

power_machinery.dm

…

powernet.dm

…

shuttle.dm

Rename Shuttle.dm to shuttle.dm

2015-02-24 18:52:03 +01:00

sun.dm

…

supply.dm

…

ticker.dm

…

vote.dm

…