Cheridan 5eb6a82970 Merge branch 'master' of https://github.com/tgstation/-tg-station into permits ...

Conflicts:
	icons/obj/items.dmi

2014-10-11 17:48:46 -05:00

..

devices

Merge pull request #5097 from phil235/Msg1Fix

2014-10-07 12:09:01 -05:00

robot

Fixes restarted borgs hearing cult chat

2014-10-05 20:21:21 -03:00

stacks

Merge pull request #5069 from phil235/WindoorDeconstruction

2014-10-08 10:27:45 +01:00

weapons

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

2014-10-11 17:48:46 -05:00

apc_frame.dm

SPANCLASSES!!!!!

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

blueprints.dm

Adds construction permits

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

bodybag.dm

Absolute paths for item files.

2014-08-07 23:02:43 +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

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

shooting_range.dm

SPANCLASSES!!!!!

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

toys.dm

Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti

2014-10-09 16:31:13 +02:00

trash.dm

Cleans up the trash.dm

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