PsiOmega 3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm

2015-03-05 09:20:20 +01:00

..

diseases

…

helper_datums

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

spells

NanoUI AI door interface.

2015-03-03 13:23:18 +01:00

wires

NanoUI AI door interface.

2015-03-03 13:23:18 +01:00

ai_laws.dm

…

browser.dm

…

computerfiles.dm

…

datacore.dm

…

datumvars.dm

…

disease.dm

…

mind.dm

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

2015-03-05 08:05:44 +01:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

KITCHEN CODE IS WORKING. YES. I CAN DIE NOW.

2015-02-16 22:11:59 +10:30

spell.dm

…

sun.dm

…

supplypacks.dm

Assorted Fixes

2015-02-24 14:40:02 -05:00