Giacomand 2e5d4c4fcc Merge branch 'master' of https://github.com/tgstation/-tg-station into virus_tweak ...

Resolved Conflicts:
	html/changelog.html

2013-11-27 15:58:42 +00:00

..

__DEFINES

Merge branch 'master' of https://github.com/tgstation/-tg-station into 13/10/2013-Limb/organ-stuff

2013-11-17 18:09:14 +00:00

__HELPERS

Merge pull request #1875 from Giacom/issue_1874

2013-11-24 22:46:28 -08:00

_globalvars

- Status query now also replies with the map name.

2013-11-10 01:32:01 +01:00

_onclick

Merge pull request #1878 from Zelacks/remove_original_atom

2013-11-26 12:12:27 -08:00

ATMOSPHERICS

Merge pull request #1817 from kyrahabattoir/ItemNameFixingRound1

2013-11-20 03:46:28 -08:00

controllers

/code/controllers/* lowercasing pass.

2013-11-18 02:16:23 +01:00

datums

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

2013-11-27 15:58:42 +00:00

defines

…

FEA

…

game

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

2013-11-27 15:58:42 +00:00

js

…

LINDA

…

modules

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

2013-11-27 15:58:42 +00:00

unused

Modification of .gitignore to include admins.txt. Hopefully.`

2013-10-30 17:56:00 -07:00

WorkInProgress

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

_compile_options.dm

…

hub.dm

…

world.dm

- Status query now also replies with the map name.

2013-11-10 01:32:01 +01:00