mwerezak 087a978d56 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-06-28 22:35:14 -04:00

..

Processes

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

2015-06-05 10:39:41 +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

Fixed a list being qdel'd when radio is deleted.

2015-06-25 23:04:04 +03:00

configuration.dm

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

2015-06-28 22:35:14 -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

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

Refactored random map generator system and added several terrain generators.

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

shuttle_controller.dm

Refactored random map generator system and added several terrain generators.

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

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 with dev-freeze.

2015-06-21 20:45:47 +09:30