GunHog cd00e07f4f Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor ...

Conflicts:
	code/modules/research/experimentor.dm

2015-02-20 15:23:07 -06:00

..

__DEFINES

Fixes conflicts, fixes casually worn uniforms looking weird

2015-02-15 13:07:06 -05:00

__HELPERS

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

2015-02-07 20:22:49 +01:00

_globalvars

Lots of fixes and improvements

2015-02-04 17:35:42 +04:00

_onclick

Merge pull request #7517 from RemieRichards/MovableUIElements

2015-02-10 17:50:33 +01:00

ATMOSPHERICS

* Fixes the air stored inside atmos machinery not updating on construction

2015-02-04 21:56:07 +01:00

controllers

Fixes that fucking typo.

2015-02-05 21:48:15 +01:00

datums

Merge pull request #7817 from paprka/whatthefucktg

2015-02-19 13:07:08 -08:00

defines

framework for a future "suicide hotline" job

2015-02-01 19:44:54 -05:00

game

Merge pull request #7765 from Thunder12345/glovening

2015-02-20 14:24:54 -06:00

js

…

LINDA

…

modules

Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor

2015-02-20 15:23:07 -06:00

_compile_options.dm

…

hub.dm

…

world.dm

Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo

2015-02-05 18:45:53 +01:00