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

Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm

2015-10-16 11:04:43 +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/master' into dev-freeze

2015-10-16 11:04:43 +02:00

poll.dm

…

preferences_setup.dm

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

skill.dm

Fix issues with skill class procs

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

sprite_accessories.dm

Removes Beehive and Pompadours from Unathi hairstyles.

2015-06-07 12:31:55 -04:00