paprka 13539c5c8e Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	code/modules/clothing/gloves/boxing.dm
	code/modules/clothing/gloves/miscellaneous.dm

2014-12-29 20:19:57 -08:00

..

effects

Merge pull request #6591 from phil235/FingerlessSpriteFix

2014-12-27 15:46:43 -03:00

items

Merge pull request #6630 from tkdrg/rpdcolor

2014-12-29 11:14:20 -08:00

structures

Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile

2014-12-29 20:19:57 -08:00

empulse.dm

Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds)

2013-03-13 00:08:20 -03:00

explosion.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

items.dm

Always reset the layer of things removed from storage

2014-12-19 09:42:06 -08:00

objs.dm

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

structures.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into RecursiveHearVisibleMessage

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

weapons.dm

Attack sounds for all melee weapons

2014-01-28 22:46:41 +13:00