paprka 21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya ...

Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi

2014-12-25 13:51:43 -08:00

..

effects

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

2014-12-25 13:51:43 -08:00

items

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

2014-12-25 13:12:46 -08:00

structures

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

2014-12-25 13:51:43 -08:00

empulse.dm

…

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 pull request #6130 from phil235/AttackMsgStandardizedFormat

2014-12-04 12:45:31 -06:00

weapons.dm

…