paprka 5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser ...

Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi

2014-12-26 09:09:24 -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 pull request #6554 from paprka/jetpackssuck

2014-12-25 21:25:56 -08:00

structures

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

2014-12-26 09:09:24 -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

…