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

..

closets

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron

2014-04-16 21:44:26 -07:00

effects

fix another merge issue

2014-05-11 13:56:17 +00:00

items

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

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

random

Fixes #4721

2014-04-12 13:06:10 +03:00

structures

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

2014-05-11 13:19:09 +00:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

3d Sound from /tg/

2014-03-27 14:49:49 -04:00

items.dm

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

2014-05-03 16:56:19 +01:00

objs.dm

Check restricted to closets and storage items due to lag concerns.

2014-04-07 20:45:05 +08:00

structures.dm

…

weapons.dm

…