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

Conflicts:
	code/modules/mob/new_player/preferences_setup.dm
	code/setup.dm

2015-08-01 19:45:42 +02:00

..

blob

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

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

bot

Merge with dev-freeze.

2015-07-02 19:04:01 +09:30

carbon

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

2015-07-31 10:00:16 +02:00

silicon

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

2015-08-01 19:45:42 +02:00

simple_animal

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

2015-07-27 10:20:20 +02:00

damage_procs.dm

…

default_language.dm

…

life.dm

mob/living/Life() now handles even more regular hud updates. Relocates action handling.

2015-06-17 16:09:13 +02:00

living_defense.dm

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

2015-07-11 10:58:49 +02:00

living_defines.dm

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

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

living_powers.dm

…

living.dm

Merge pull request #10234 from Baystation12/dev-freeze

2015-07-18 23:56:10 +03:00

login.dm

…

logout.dm

…

say.dm

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

2015-08-01 19:45:42 +02:00