PsiOmega 69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm

2015-09-05 09:24:30 +02:00

..

Processes

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-24 10:23:12 +02: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

autotransfer.dm

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

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

communications.dm

Makes the private AI channel truly private.

2015-08-16 15:43:28 +02:00

configuration.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-05 09:24:30 +02: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

new object-based lighting system

2015-05-10 20:54:25 +01:00

hooks-defs.dm

Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev

2014-09-29 06:19:26 +09:30

hooks.dm

…

master_controller.dm

Adds missing closing quote.

2015-08-10 18:10:53 +02:00

shuttle_controller.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-19 07:04:40 +01:00

subsystems.dm

Basic main structure for centralized alarm handling.

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

verbs.dm

Refactored random map generator system and added several terrain generators.

2015-06-03 04:36:19 +09:30

voting.dm

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

2015-07-27 10:20:20 +02:00