Lzimann eaabbede28 Merge branch 'master' of https://github.com/tgstation/-tg-station into RemieRichards-prostheticsssss ...

# Conflicts:
#	code/_onclick/hud/human.dm
#	code/modules/surgery/bodyparts/dismemberment.dm

2016-09-21 19:47:47 -03:00

..

__DATASTRUCTURES

…

__DEFINES

Merge pull request #20572 from AnturK/godisdead

2016-09-20 13:46:52 -05:00

__HELPERS

Merge pull request #20534 from MrPerson/even_better_color_matrix_helpers

2016-09-17 09:00:46 -05:00

__PATH_COMPATIBILITY

…

_globalvars

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

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

_onclick

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

2016-09-21 19:47:47 -03:00

controllers

Fixes minimap crashes. (#20620)

2016-09-21 12:42:12 +02:00

datums

Removes Hand of God gamemode.

2016-09-18 13:32:26 +02:00

game

Merge pull request #20600 from Ergovisavi/hurr_durr

2016-09-21 12:41:41 +02:00

js

…

modules

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

2016-09-21 19:47:47 -03:00

orphaned_procs

…

_compile_options.dm

…

hub.dm

…

world.dm

…