Miauw 78a9b0be69 Merge branch 'master' of https://github.com/tgstation/-tg-station into say() ...

Conflicts:
	code/__HELPERS/game.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/requests_console.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/modules/admin/admin_verbs.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/voice.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/say.dm

2014-08-31 13:40:16 +02:00

..

devices

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

2014-08-31 13:40:16 +02:00

robot

SPANCLASSES!!!!!

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

stacks

SPANCLASSES!!!!!

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

weapons

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

2014-08-31 13:40:16 +02:00

apc_frame.dm

SPANCLASSES!!!!!

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

blueprints.dm

Merge pull request #3283 from Aranclanos/Blueprints

2014-04-07 18:36:36 -07: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

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02: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

SPANCLASSES!!!!!

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

trash.dm

Cleans up the trash.dm

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