Joan Lung 179b0b532d Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur ...

Conflicts:
	code/game/objects/structures/grille.dm
	icons/effects/beam.dmi

2016-09-12 17:14:39 -04:00

..

__DATASTRUCTURES

…

__DEFINES

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

__HELPERS

Fixes bad html handling for cult and clockcult messages (#20436)

2016-09-13 09:09:54 +12:00

__PATH_COMPATIBILITY

…

_globalvars

Adds explosion helper proc w/ diminishing returns (#20319)

2016-09-11 20:46:26 +12:00

_onclick

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

controllers

clients now qdelete.

2016-09-08 08:05:51 -07:00

datums

Makes it so you cant teleport into transition edges. (#20427)

2016-09-13 09:09:00 +12:00

game

Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

2016-09-12 17:14:39 -04:00

js

…

modules

Merge branch 'master' of https://github.com/tgstation/tgstation into idigtilmyshoveltellsasecretsweartotheearththatiwillkeepitbrushoffthedirtandletmychangeofheartoccur

2016-09-12 17:14:39 -04:00

orphaned_procs

…

_compile_options.dm

Ups the player and station name length limits (#20073)

2016-08-26 16:43:56 +12:00

hub.dm

…

world.dm

Goof has nothingo on me (#20110)

2016-08-27 10:27:47 -05:00