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

Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm

2015-08-15 10:52:17 +02:00

..

_defines.dm

…

cartridge_presets.dm

…

cartridge_spawn.dm

Spawn fixes

2015-06-02 02:24:32 +01:00

cartridge.dm

Fixes #10645

2015-08-14 23:20:10 -04:00

dispenser2.dm

…

dispenser_presets.dm

…

supply.dm

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

2015-05-26 08:35:32 +02:00