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

..

assembly.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

bomb.dm

does more shit

2014-08-05 19:17:21 +02:00

helpers.dm

ABSOLUTELY ABSOLUTE

2014-08-06 16:21:24 +02:00

holder.dm

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

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

igniter.dm

Igniter sparks

2014-06-11 22:52:53 +01:00

infrared.dm

ABSOLUTELY ABSOLUTE

2014-08-06 16:21:24 +02:00

mousetrap.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

proximity.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

shock_kit.dm

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

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

signaler.dm

ABSOLUTELY ABSOLUTE

2014-08-06 16:21:24 +02:00

timer.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

voice.dm

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

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