MrPerson 645ca7f8a1 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor ...

Conflicts:
	code/_onclick/click.dm
	code/game/atoms.dm
	code/game/objects/items/toys.dm
	code/modules/paperwork/folders.dm
	code/modules/power/cable.dm

2014-06-09 01:50:44 -07:00

..

devices

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

2014-06-09 01:50:44 -07:00

robot

Fixes borg naming rejecting numbers in name

2014-05-31 11:43:12 +02:00

stacks

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

2014-06-09 01:50:44 -07:00

weapons

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

2014-06-09 01:50:44 -07: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

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

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

candle.dm

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

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

crayons.dm

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

2014-02-23 14:55:12 -08: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

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

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

toys.dm

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

2014-06-09 01:50:44 -07:00

trash.dm

Cleans up the trash.dm

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