Giacomand 06e7f401cd Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos ...

Conflicts:
	code/modules/admin/topic.dm

2013-06-20 21:37:30 +01:00

..

__HELPERS

Merge pull request #789 from Carn/member_content

2013-06-19 06:45:40 -07:00

ATMOSPHERICS

Reverted Giacom's changes

2013-06-15 17:07:12 +02:00

controllers

* Fixed spelling typos. Tratior -> Traitor

2013-06-20 21:29:14 +01:00

datums

Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

2013-06-20 21:37:30 +01:00

defines

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

2013-06-15 18:58:11 +01:00

FEA

Optimizations in insignificant procs (less than 2% of total self time each (according to the june 7 profile), and the changes probably don't have a huge impact on them.

2013-06-12 15:30:52 -04:00

game

Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

2013-06-20 21:37:30 +01:00

js

…

modules

Merge branch 'master' of https://github.com/Giacomand/-tg-station into tator_typos

2013-06-20 21:37:30 +01:00

unused

*Small tidy-up of various helper procs*

2013-05-27 12:21:43 +01:00

WorkInProgress

Committing Faerdan's UI overhaul. Includes a UI browser class to easily manage and standardize user interfaces. This first release does not convert all the user interfaces in the game but only most of them. You can find samples of these user interfaces here: http://imgur.com/a/5dr6E

2013-02-27 20:02:42 +00:00

__DEFINES.dm

Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize

2013-05-24 15:40:07 +02:00

_compile_options.dm

Removes equip_e - Fixes #423

2013-04-24 04:07:39 +01:00

global.dm

Traitor scale added to game_options.txt

2013-06-09 12:32:58 -06:00

hub.dm

Updated hub.dm to be slightly more descriptive.

2013-02-17 21:12:16 +00:00

names.dm

…

stylesheet.dm

Removes equip_e - Fixes #423

2013-04-24 04:07:39 +01:00

world.dm

Resolves #283

2013-04-24 09:37:30 +01:00