paprka 591b2f363b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode ...

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

2014-12-25 13:12:46 -08:00

..

devices

Merge pull request #6473 from Delimusca/grenadeinhands

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

robot

fixed compile errors

2014-12-24 21:03:22 -08: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

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

blueprints.dm

Fixes a lot of "the the" in messages.

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

bodybag.dm

Adding bluespace bodybags. Adding changelog.

2014-10-21 17:27:40 +02:00

candle.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

crayons.dm

Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown.

2014-09-28 14:02:08 +04:00

documents.dm

-Removed some duplicate code

2014-05-04 16:18:48 -06:00

latexballoon.dm

Ok now explosions shall work properly

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

shooting_range.dm

Changes many span classes.

2014-10-18 16:00:38 +02:00

toys.dm

Adds a new prize mech based on the mime mech.

2014-10-21 10:26:01 -05:00

trash.dm

Cleans up the trash.dm

2014-02-13 10:35:02 -05:00