Chinsky 6d830af37c Merge branch 'master' into surgery ...

Conflicts:
	code/WorkInProgress/surgery.dm
	code/modules/mob/living/carbon/carbon_defines.dm

2013-01-15 13:42:13 +04:00

..

diseases

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

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

helper_datums

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

organs

Added doublecheck for disfigurement

2013-01-13 11:52:41 +04:00

spells

Updating the conjure spell to just use paths instead of strings.

2013-01-11 00:08:17 +00:00

ai_laws.dm

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

computerfiles.dm

…

datacore.dm

Fixed the lack of job alt-titles in Crew Manifest

2012-11-21 22:02:18 -08:00

datumvars.dm

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

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

disease.dm

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

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

mind.dm

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

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

mixed.dm

Huge commit! Standardizes var definitions in most places.

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

modules.dm

…

organs.dm

…

recipe.dm

-You can now store donuts in the donut box. The next donut you pull out will be the last one you put in.

2012-07-20 00:12:50 +00:00

spell.dm

Couple of bugfixes:

2012-11-14 01:17:40 +00:00

sun.dm

-Changed the powernet nodes list to be a dictionary list (associative list, hashtable, etc..)

2012-12-29 07:24:42 +00:00

supplypacks.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00