Zuhayr 772715f2da Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

..

blob

…

carbon

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

silicon

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +09:30

simple_animal

Merged dev-freeze into master. Two map conflicts, used dev-freeze map.

2014-08-27 20:46:04 +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

Removes duplicate code from human/bullet_act

2014-08-01 23:57:18 -04:00

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