tkdrg b983176937 Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories ...

Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi

2014-12-14 11:59:45 -03:00

..

effects

Merge pull request #6263 from paprka/gunsthegunnening

2014-12-11 10:46:34 +03:00

items

Merge remote-tracking branch 'upstream/master' into fashionandfashionaccesories

2014-12-14 11:59:45 -03:00

structures

Merge pull request #6317 from paprka/saltyfuckingcuntm8

2014-12-14 07:57:33 +03: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

Attack sounds for all melee weapons

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