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

..

admin

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

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

assembly

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

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

awaymissions

SPANCLASSES!!!!!

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

client

Merge pull request #4511 from Limeliz/char-setup

2014-08-24 12:59:40 +01:00

clothing

SPANCLASSES!!!!!

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

detectivework

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

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

events

Merge pull request #4601 from Ikarrus/removeholidaycheer

2014-08-30 16:41:23 -05:00

flufftext

Merge pull request #4549 from Ikarrus/tinyprickironicsmiley

2014-08-30 16:51:09 -05:00

food&drinks

SPANCLASSES!!!!!

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

hydroponics

SPANCLASSES!!!!!

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

library

moremoarmoaaaaarabsolutes

2014-08-06 16:54:06 +02:00

mining

Merge pull request #4454 from Ikarrus/plasteel

2014-08-24 13:05:12 +01:00

mob

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

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

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

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

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

power

Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research

2014-08-23 02:02:46 +02:00

projectiles

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

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

reagents

Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research

2014-08-23 02:02:46 +02:00

recycling

SPANCLASSES!!!!!

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

research

Span classes for files in the following Modules folders: Power, Projectiles, Reagents, Recycling, Research

2014-08-23 02:02:46 +02:00

scripting

Resolves many, more saycode bugs. AI tracking is still broken.

2014-08-18 18:51:07 +02:00

security levels

Minor Announcement format expanded to include Alert Level changes and Emergency Declarations

2014-08-14 20:44:18 -06:00

shuttle

Merge pull request #4574 from Ikarrus/commscooldown

2014-08-27 10:16:00 -05:00

surgery

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

2014-07-07 13:42:31 -04:00

telesci

…