Ccomp5950 976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm

2014-04-25 21:14:58 -05:00

..

closets

Grammar patch 1

2014-04-08 14:48:31 +03:00

effects

Merge pull request #4674 from Jarcolr/diction

2014-04-01 13:39:11 -05:00

items

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05:00

random

Fixes #4721

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

storage

Items inside objects will now hear what the object is hearing, as will items inside those items. This allows tape recorders to work in containers and closets.

2014-04-06 14:20:57 +08:00

structures

Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze

2014-04-25 21:14:58 -05: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

Clean up check for item being equipped

2014-04-13 13:36:48 -04: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

…