Cael_Aislinn 9340f70252 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/obj/items.dmi

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

2012-10-22 19:35:03 +10:00

..

blob

- Categorized invisibility stuff into #defines. If any errors appear - let me know.

2012-07-30 16:24:45 +00:00

carbon

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

2012-10-22 19:35:03 +10:00

parasite

Update code/modules/mob/living/parasite/meme.dm

2012-07-25 20:33:25 +03:00

silicon

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

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

simple_animal

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

2012-10-21 02:59:35 +10:00

damage_procs.dm

Radiation protection was unbalanced: A full rad suit would only give 15% protection

2012-07-09 21:30:35 +03:00

living_defense.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

living_defines.dm

Moved all of the defines/mob into their appropriate modules/mob/ files

2012-08-22 03:11:46 +00:00

living.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

login.dm

WIP mergefixes

2012-09-26 20:10:58 +10:00

logout.dm

Important!

2012-08-08 20:51:55 +00:00

say.dm

mergefixes

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