Cael_Aislinn 9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch ...

Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

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

2013-02-25 14:27:44 +10:00

..

sheets

new icons, added some large artifacts, renamed/restructured a bunch of files

2013-02-10 01:30:40 +10:00

tiles

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

medical.dm

Only bandaging bleeding wounds would cause itching. Bruise packs give out different message during treatment depending on type and severity of wound.

2013-02-17 18:31:14 +04:00

rods.dm

…

stack.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00