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

..

clipboard.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

filingcabinet.dm

Secret Document Objectives

2014-05-04 15:00:47 -06:00

folders.dm

Fixed indentations.

2014-05-14 09:02:53 -06:00

handlabeler.dm

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

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

paper.dm

part II

2014-07-13 13:43:07 -06:00

paperbin.dm

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

2014-02-18 18:22:40 +01:00

pen.dm

Span classes for files in the following module folders: assembly, client, detectivework, events, hydroponics, mining, paperwork

2014-08-23 10:13:21 +02:00

photocopier.dm

AI photography ext 2 DO NOT MERGE YET

2014-07-06 12:06:44 -05:00

photography.dm

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

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

stamps.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00