AndrewJacksonThe2nd 082b4e4821 Merge branch 'master' of https://github.com/tgstation/-tg-station into goofmos ...

Conflicts:
	code/game/turfs/open.dm
	code/modules/mob/living/living_defines.dm

2016-09-02 15:51:26 -07:00

..

__DATASTRUCTURES

…

__DEFINES

Converts Vanguard to a status effect (#20208)

2016-08-31 09:29:45 +12:00

__HELPERS

Adds Freon to the game (#20188)

2016-08-31 08:58:55 +12:00

__PATH_COMPATIBILITY

…

_globalvars

Removes SMES power failure.

2016-08-22 19:24:59 -07:00

_onclick

Converts Vanguard to a status effect (#20208)

2016-08-31 09:29:45 +12:00

controllers

Quality of life pull for my recent commits (#20210)

2016-08-31 09:23:54 +12:00

datums

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

2016-09-02 15:42:17 -07:00

game

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

2016-09-02 15:51:26 -07:00

js

…

modules

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

2016-09-02 15:51:26 -07: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