Pete Goodfellow 972a5cdc50 Merge branch 'master' of github.com:tgstation/-tg-station into taperecorder ...

Conflicts:
	icons/obj/device.dmi
	tgstation.dme

2013-06-19 17:05:47 +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

Traitor scale added to game_options.txt

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

datums

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

2013-06-19 17:05:47 +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 github.com:tgstation/-tg-station into taperecorder

2013-06-19 17:05:47 +01:00

js

…

modules

Merge pull request #789 from Carn/member_content

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

unused

*Small tidy-up of various helper procs*

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

WorkInProgress

…

__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

…

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