PsiOmega 8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/mob.dm

2015-04-03 09:33:05 +02:00

..

diseases

Merge with dev.

2015-03-30 08:36:52 +10:30

helper_datums

…

wires

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-03-29 16:23:06 +02:00

ai_law_sets.dm

Changes the silicon is_malf/is_traitor procs to utilize the new antag datums.

2015-03-25 19:27:03 +01:00

ai_laws.dm

…

browser.dm

…

computerfiles.dm

…

datacore.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

datumvars.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

datumvars.dm.orig

Merge with dev.

2015-03-30 08:36:52 +10:30

disease.dm

…

mind.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

Switches hacky list copying method in check_items and check_fruit to use Copy(). Uses Cut() to make sure that one item does not satisfy the need for multiple items of the same type.

2015-04-01 11:41:46 -04:00

sun.dm

…

supplypacks.dm

…