Hubblenaut 1b3ddb8633 Merge remote-tracking branch 'upstream/dev' into dev ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/modules/mob/mob_grab.dm

2015-05-12 14:39:21 +02:00

..

effects

Dev merge.

2015-05-11 18:45:14 +09:30

items

Merge pull request #9166 from MrSnapwalk/AI-and-pAI-sprites

2015-05-12 21:01:30 +09:30

random

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

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

structures

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

2015-05-12 14:39:21 +02:00

buckling.dm

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

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

empulse.dm

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

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

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

items.dm

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

2015-05-12 13:40:47 +02:00

objs.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

structures.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

weapons.dm

…