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

Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2014-12-19 10:41:27 -08:00

..

effects

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

items

Adds 3 more scarves

2014-12-19 00:24:01 -03:00

structures

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

2014-12-19 10:41:27 -08:00

empulse.dm

…

explosion.dm

Ok now explosions shall work properly

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

items.dm

Merge pull request #6228 from paprka/coatscoats

2014-12-08 11:35:56 +01: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

…