GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm

2015-04-13 12:49:07 +01:00

..

blob

…

carbon

Merge pull request #8827 from comma/dev-freeze

2015-04-13 08:17:53 +02:00

silicon

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

2015-04-13 12:49:07 +01:00

simple_animal

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

damage_procs.dm

…

default_language.dm

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00

living_defense.dm

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

2015-03-31 01:37:55 -04:00

living_defines.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

living_powers.dm

Fixes hiding mobs being layered underneath vents

2015-02-19 01:02:32 -05:00

living.dm

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

2015-04-13 12:49:07 +01:00

login.dm

Gamemode refactor, lots of code shuffles, PR will have details.

2015-03-21 11:08:17 +10:30

logout.dm

…

say.dm

Adds selectable default languages to all mobs which can speak

2015-04-08 15:18:59 +01:00