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

..

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

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00

living

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

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

new_player

Fix for being forever tajaran

2015-05-12 07:48:54 +03:00

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

Ports /vg/'s Nas-Sie remake.

2015-04-12 16:19:16 +02:00

mob_grab.dm

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

2015-05-12 14:39:21 +02: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' into TheSummoning

2015-04-24 17:13:37 +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