Chinsky 8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 ...

Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm

2012-10-14 20:39:26 +04:00

..

obj

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

2012-10-14 20:39:26 +04:00

procs

Commiting for the night, in case KGB steals my laptop.

2012-10-14 02:15:23 +04:00

sd_procs

Huge commit! Standardizes var definitions in most places.

2012-05-29 16:26:48 +01:00

atom.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

global.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

obj.dm

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

2012-09-26 18:49:18 +10:00

turf.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00