tkdrg 359c5896ed Merge remote-tracking branch 'upstream/master' into meido ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-12-22 16:19:43 -03:00

..

devices

Merge pull request #6473 from Delimusca/grenadeinhands

2014-12-22 11:10:05 -08:00

robot

Merge pull request #6189 from Menshin/exofab_revamp_end+fixes

2014-12-11 11:52:16 -06:00

stacks

Merge pull request #6130 from phil235/AttackMsgStandardizedFormat

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

weapons

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

2014-12-22 16:19:43 -03:00

apc_frame.dm

…

blueprints.dm

Fixes a lot of "the the" in messages.

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

bodybag.dm

…

candle.dm

…

crayons.dm

…

documents.dm

…

latexballoon.dm

Ok now explosions shall work properly

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

shooting_range.dm

…

toys.dm

…

trash.dm

…