PsiOmegaDelta 1558bd5b75 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/toys.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living_defense.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers.dm
	html/changelogs/.all_changelog.yml

2015-06-19 10:19:08 +02: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

Added exosuit customisation kits to cargo.

2015-05-13 11:20:54 +09:30

configuration.dm

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

2015-06-19 10:19:08 +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

Mutiny Mode

2014-05-11 15:03:50 -05:00

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

Actually renames 'going' var.

2015-06-05 11:07:24 +03:00