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

Conflicts:
	code/modules/research/designs/mechfabricator_designs.dm

2015-02-06 13:19:15 +08:00

..

__DEFINES

Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas

2015-01-27 17:55:26 +01:00

__HELPERS

Added _volas_ fix for sanitize_simple infinite loop regarding non standard character stripping

2015-02-02 00:25:32 +01:00

_globalvars

Lots of fixes and improvements

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

_onclick

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

2015-02-02 19:30:24 -05:00

ATMOSPHERICS

…

controllers

Fix for mobs falling off the mob_list, as suggested by Carn.

2015-01-27 22:56:31 -07:00

datums

Merge pull request #7471 from Menshin/properly_propelled_sanitization

2015-02-05 22:27:35 +03:00

defines

framework for a future "suicide hotline" job

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

game

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

2015-02-06 13:19:15 +08:00

js

…

LINDA

…

modules

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

2015-02-06 13:19:15 +08: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