mwerezak ababfc1d0c Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes ...

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm

2014-08-22 01:24:34 -04:00

..

blob

…

carbon

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

2014-08-22 01:24:34 -04:00

silicon

Merge resolution, master into dev.

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

simple_animal

Merge pull request #5954 from Zuhayr/dev

2014-08-13 18:33:09 +04:00

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