Cael_Aislinn 01d3e3bf79 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/datums/disease.dm
	code/modules/reagents/Chemistry-Reagents.dm
	icons/turf/areas.dmi
	maps/tgstation.2.0.9.1.dmm

yep, this time going to merge map updates before making map changes >.>

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

2012-10-21 01:25:04 +10:00

..

components

Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport

2012-10-21 00:25:05 +10:00

atmospherics.dm

TG: - The adminhelp sound is now a character setup option for admins of any rank.

2012-06-26 01:00:06 +01:00

datum_pipe_network.dm

Fuck atmospherics code. Actually, Fuck BYOND @.@

2012-05-13 14:32:59 -07:00

datum_pipeline.dm

I accidentally ALL THE THINGS! But yeah, ZAS is updated.

2012-05-26 02:01:26 -06:00

he_pipes.dm

-Make holodeck eswords a child of obj/item/weapon/holo instead of regular eswords, clumsy check removed as a result, and you can no longer do things like cutting through walls or doors or what have you. (Fixes Issue 665)

2012-07-23 00:48:51 +00:00

mapdebugging.dm

Fix for tab issuse, fixed all pipes reported by the algo.

2012-04-21 18:28:10 +01:00

pipes.dm

Merge github.com:Baystation12/Baystation12

2012-10-15 15:06:21 +02:00