Mloc-Argent e24dd57a65 Merge remote-tracking branch 'upstream/master' into dev ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/life.dm

2014-05-14 22:42:03 +01:00

..

devices

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

2014-05-14 22:42:03 +01:00

robot

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

2014-05-05 22:22:01 +01:00

stacks

Fixes #4979

2014-05-14 17:02:04 +09:30

weapons

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

2014-05-14 22:42:03 +01:00

apc_frame.dm

…

blueprints.dm

Revert "Merge pull request #4478 from Aryn/master"

2014-03-24 13:55:41 +00:00

bodybag.dm

…

candle.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

contraband.dm

…

crayons.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

latexballoon.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00

shooting_range.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

toys.dm

Various tiny improvements

2014-01-18 22:15:46 +01:00

trash.dm

A first pass at more realistic w_class values

2014-04-03 17:54:06 -04:00