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

Conflicts:
	code/setup.dm

2015-08-17 09:37:49 +02:00

..

blob

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

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

bot

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

2015-08-17 09:37:49 +02:00

carbon

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

2015-08-17 09:37:49 +02:00

silicon

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

2015-08-17 09:37:49 +02:00

simple_animal

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

2015-08-13 09:01:10 +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 corrections.

2015-08-13 10:17:03 +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

Aghosted mobs no longer act as SSD

2015-08-14 22:41:51 -04:00

logout.dm

Aghosted mobs no longer act as SSD

2015-08-14 22:41:51 -04:00

say.dm

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

2015-08-17 09:37:49 +02:00