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

Conflicts:
	_maps/map_files/tgstation.2.1.2.dmm (The map was deleted)
	code/game/objects/items/weapons/kitchen.dm (Someone fixed up tray attack code a little, whereas I moved trays to a subclass of bags and made the attack code very simple by comparison.  Went with my solution.)

2014-05-18 20:50:38 -04:00

..

devices

Hopefully last change

2014-05-18 22:46:32 +04:00

robot

Sechud uses right icon

2014-05-12 16:35:30 -04:00

stacks

Merge pull request #3687 from Jordie0608/removerelativepathsfromtheeverythingplz

2014-05-14 09:24:29 +01:00

weapons

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

2014-05-18 20:50:38 -04:00

apc_frame.dm

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

2014-03-02 21:39:27 -08:00

blueprints.dm

Merge pull request #3283 from Aranclanos/Blueprints

2014-04-07 18:36:36 -07:00

bodybag.dm

…

candle.dm

…

crayons.dm

…

documents.dm

-Removed some duplicate code

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

latexballoon.dm

…

shooting_range.dm

…

toys.dm

Unidentinization^2

2014-05-13 02:25:14 +10:00

trash.dm

…