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

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/response_team.dm
	code/modules/hydroponics/spreading/spreading.dm
	code/modules/mob/dead/observer/observer.dm

2015-05-11 09:28:59 +02:00

..

login.dm

Re-move resource update

2014-10-20 17:26:55 +01:00

logout.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

new_player.dm

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

2015-05-11 09:28:59 +02:00

poll.dm

- Added the ability to have multiple choice player polls.

2012-12-16 03:29:06 +00:00

preferences_setup.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

skill.dm

Fix issues with skill class procs

2015-03-20 22:47:51 +00:00

sprite_accessories.dm

Few Fixes.

2015-02-28 14:29:30 +01:00