paprka 0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables ...

Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm

2014-11-09 14:53:19 -08:00

..

devices

Merge pull request #5727 from phil235/RecorderFix

2014-11-08 15:07:47 -08:00

robot

Finishes repathing flashes

2014-10-22 19:09:43 +01:00

stacks

fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk

2014-11-03 20:41:40 -08:00

weapons

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

2014-11-09 14:53:19 -08:00

apc_frame.dm

…

blueprints.dm

Adds construction permits

2014-10-11 17:39:27 -05:00

bodybag.dm

Adding bluespace bodybags. Adding changelog.

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

candle.dm

…

crayons.dm

…

documents.dm

…

latexballoon.dm

…

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

…