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

Conflicts:
	code/modules/mob/living/carbon/human/life.dm

2015-07-28 07:59:49 +02:00

..

dead

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

freelook

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

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-07-28 07:59:49 +02:00

new_player

Merge pull request #10059 from Baystation12/master

2015-07-09 08:34:43 +02:00

animations.dm

…

death.dm

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

emote.dm

…

hear_say.dm

…

holder.dm

…

inventory.dm

Fixes issues with raider equipping

2015-07-04 16:32:35 -04:00

login.dm

…

logout.dm

…

mob_cleanup.dm

…

mob_defines.dm

Revert "get rid of mob.see_in_dark and species.darksight"

2015-07-22 15:14:40 +01:00

mob_grab.dm

Merge pull request #9779 from Baystation12/master

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

mob_helpers.dm

removes isAI() from broken merge

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

mob_movement.dm

…

mob_transformation_simple.dm

…

mob.dm

Fixes #10230

2015-07-18 23:27:09 -04:00

say.dm

…

transform_procs.dm

…

typing_indicator.dm

…

update_icons.dm

Fixes #9326

2015-07-26 14:57:49 -04:00