Chinsky be95e54e43 Merge branch 'master' into dev ...

Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-06-17 16:16:44 +04:00

..

closets

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

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

effects

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

2014-05-31 00:17:56 +01:00

items

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

random

Fixes #4721

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

structures

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

empulse.dm

…

explosion_recursive.dm

Explosion Optimizations

2014-01-08 19:21:47 +00:00

explosion.dm

3d Sound from /tg/

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

items.dm

Merge pull request #4968 from MrLeebo/mutiny

2014-05-28 00:13:42 -05:00

objs.dm

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

structures.dm

…

weapons.dm

…