Neerti 6906acf193 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two ...

Conflicts:
	code/game/turfs/simulated/floor.dm
	icons/mob/back.dmi
	maps/exodus-3.dmm
	polaris.dme

2015-05-10 04:21:37 -04:00

..

Processes

Merge pull request #9111 from PsiOmegaDelta/AreaContentsConcat

2015-05-06 17:31:19 -04:00

ProcessScheduler

Adds Destroys.

2015-04-24 17:11:14 +02:00

subsystem

Alarm subsystem is now processed by the scheduler. Removes now dead code.

2015-03-13 10:36:47 +01:00

_DynamicAreaLighting_TG.dm

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

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

autotransfer.dm

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

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

communications.dm

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

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

configuration.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 5/10/2015_bay_merge_attempt_two

2015-05-10 04:21:37 -04:00

emergency_shuttle_controller.dm

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

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

failsafe.dm

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

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

hooks-defs.dm

…

hooks.dm

…

lighting_controller.dm

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

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

master_controller.dm

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

2015-04-24 17:13:37 +02:00

shuttle_controller.dm

Merge remote-tracking branch 'upstream/dev' into docking-update

2015-03-31 20:50:02 -04:00

subsystems.dm

Basic main structure for centralized alarm handling.

2015-02-17 08:34:26 +01:00

verbs.dm

Makes crit oxyloss and malf AI time run in gametime instead of realtime.

2015-04-23 04:42:58 -04:00

voting.dm

sanitize() refactor: third pass (misc)

2015-03-25 01:05:21 +03:00