Cael_Aislinn 3f62e2a938 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch ...

Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/xenoarchaeology/artifact_effect.dm
	code/modules/research/xenoarchaeology/finds.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-02-02 17:05:27 +10:00

..

__HELPERS

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

ATMOSPHERICS

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

controllers

Fixed air controller not advancing.

2013-01-24 21:30:27 +04:00

datums

Should fix injured icons not updated.

2013-01-28 21:51:05 +04:00

defines

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

FEA

- Added null checks for get_mobs_in_radio_range().

2013-01-17 06:52:49 +00:00

game

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch

2013-02-02 17:05:27 +10:00

js

…

modules

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch

2013-02-02 17:05:27 +10:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

WorkInProgress

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-23 01:02:27 +10:00

ZAS

Fixed runtimes in airflow.

2013-01-16 22:05:31 +04:00

global.dm

removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus'

2013-01-21 04:56:20 +10:00

hub.dm

…

names.dm

…

setup.dm

Now completely merged.. damn git.

2013-01-22 20:58:54 +04:00

stylesheet.dm

…

world.dm

Return of Moderator III: This is Getting Old.

2013-01-23 06:27:31 +04:00