Neerti 94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 ...

Conflicts:
	.travis.yml
	polaris.dme

2015-07-26 16:01:27 -04:00

..

blob

get rid of mob.see_in_dark and species.darksight

2015-07-09 19:17:04 +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-20 08:28:32 +02:00

silicon

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2

2015-07-26 16:01:27 -04:00

simple_animal

Merge pull request #10252 from Baystation12/dev-freeze

2015-07-21 14:42:16 +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

get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications

2015-05-17 16:54:18 +10:00