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

Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-09-11 08:38:28 +02:00

..

cart.dm

initialize() should now always be called, be it on game starting up or object being created after game start.

2015-04-30 19:28:35 +02:00

chatroom.dm

…

PDA.dm

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

2015-09-11 08:38:28 +02:00

radio.dm

Makes the private AI channel truly private.

2015-08-16 15:43:28 +02:00