PsiOmegaDelta f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm

2015-07-24 10:53:57 +02:00

..

diseases

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

helper_datums

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

wires

…

ai_law_sets.dm

Law spelling corrections, removes some law sets from the law manager overview.

2015-07-14 09:01:13 +02:00

ai_laws.dm

Fixes #10254.

2015-07-22 08:11:52 +02:00

browser.dm

…

computerfiles.dm

…

datacore.dm

Removed the last few references to MODE, fixed some oversights with player_is_antag().

2015-07-14 05:19:00 +09:30

datumvars.dm

…

disease.dm

…

mind.dm

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

2015-07-14 08:21:12 +02:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

sun.dm

…

supplypacks.dm

Moves supply pack check down to atom

2015-07-22 13:05:26 +03:00