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

Conflicts:
	code/modules/mob/mob.dm

2015-04-03 09:33:05 +02:00

..

blob

…

carbon

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

2015-04-03 09:33:05 +02:00

silicon

Merged with dev.

2015-03-31 11:17:13 +10:30

simple_animal

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

2015-04-03 09:33:05 +02:00

damage_procs.dm

…

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

Fixes #8693

2015-04-01 05:35:59 -07: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

Moves sanitize(message) up a level for now.

2015-03-29 13:51:19 +02:00