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

Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

2015-05-16 22:38:01 +02:00

..

dead

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

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

freelook

new object-based lighting system

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

language

…

living

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

2015-05-16 22:38:01 +02:00

new_player

Dev merge.

2015-05-12 23:33:29 +09:30

death.dm

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

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

emote.dm

…

hear_say.dm

…

holder.dm

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

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

inventory.dm

Grabs no longer endless loop runtime.

2015-05-10 12:11:52 +02:00

login.dm

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

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

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

…

mob_grab.dm

Fixes grabs runtiming on qdel()

2015-05-15 00:07:45 +01:00

mob_helpers.dm

Compilation fixes.

2015-05-08 08:33:41 +02:00

mob_movement.dm

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

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

mob_transformation_simple.dm

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

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

mob.dm

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

2015-05-16 22:38:01 +02:00

say.dm

…

transform_procs.dm

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

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

typing_indicator.dm

…

update_icons.dm

Updates clothing/under to use item_state_slots.

2015-04-23 08:03:40 -04:00