Zuhayr 1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

..

blob

…

carbon

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

silicon

Merge resolution, using dev-freeze map due to unreconcilable conflicts.

2014-09-13 16:54:48 +09:30

simple_animal

Fixes #5879

2014-09-01 22:45:37 +09:30

damage_procs.dm

Fixes human armor value for full body effects not being weighted by body part

2014-08-22 01:12:07 -04:00

living_defense.dm

Fixes #6119

2014-09-01 22:41:15 +09:30

living_defines.dm

…

living.dm

Merge resolution, master into dev.

2014-08-21 12:01:38 +09:30

login.dm

…

logout.dm

…

say.dm

Master to dev merge.

2014-08-11 17:23:40 +09:30