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

Conflicts:
	.travis.yml
	code/game/atoms.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/silicon/silicon.dm

2015-06-30 08:24:43 +02:00

..

dead

Merge pull request #9756 from Baystation12/master

2015-06-09 12:12:40 +02:00

freelook

Fixes #9517 and #9542

2015-06-10 23:14:33 +09:30

language

Fixes tajaran name generation, tweaks

2015-06-10 00:53:24 -04:00

living

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

2015-06-30 08:24:43 +02:00

new_player

Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon.

2015-06-25 23:04:33 +03:00

animations.dm

Clean up world print

2015-05-20 00:35:26 -04:00

death.dm

…

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

Items again have their loc set just before dropped() is called.

2015-05-21 17:55:31 +02:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Moves admin attack log helpers to admin module, makes admin_attack_log more resilient against null arguments

2015-06-06 11:53:12 -04:00

mob_grab.dm

Merge pull request #9779 from Baystation12/master

2015-06-10 11:04:54 +02:00

mob_helpers.dm

…

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

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

2015-06-30 08:24:43 +02:00

say.dm

…

transform_procs.dm

Fixes #9244.

2015-05-18 19:15:28 +02:00

typing_indicator.dm

Fixes corpses and unconscious people still showing typing indicators.

2015-05-30 03:13:45 +03:00

update_icons.dm

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

2015-06-26 19:22:31 +02:00