PsiOmega 9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev ...

Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml

2015-05-07 08:14:57 +02:00

..

dead

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

2015-04-24 17:13:37 +02:00

freelook

Adds Destroys.

2015-04-24 17:11:14 +02: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/master' into dev

2015-05-07 08:14:57 +02:00

new_player

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

2015-04-24 09:59:05 +02: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

Merge pull request #8973 from mwerezak/inventory2

2015-04-26 20:13:21 +03: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/master' into dev

2015-05-02 21:50:11 +02:00

mob_helpers.dm

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

2015-04-23 13:15:43 +02:00

mob_movement.dm

Ensures new players cannot ghost by moving, really breaks things.

2015-04-20 08:37:57 +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