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

..

effects

Fixes a lot of "the the" in messages.

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

items

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

2014-12-22 16:19:43 -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

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

…