Mervill c2e2440953 Merge branch 'master' into w_class ...

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

2016-12-02 21:44:24 -08:00

..

__DATASTRUCTURES

…

__DEFINES

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

__HELPERS

Fixes some bugs/runtimes. Makes vv var formating use less strings.

2016-11-30 12:50:16 -08:00

__PATH_COMPATIBILITY

…

_globalvars

VV refactor

2016-11-30 12:49:21 -08:00

_onclick

w_class now uses defines

2016-12-01 21:33:14 -08:00

controllers

Merge pull request #21860 from MrStonedOne/patch-264

2016-12-02 12:53:36 +01:00

datums

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

game

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

js

…

modules

Merge branch 'master' into w_class

2016-12-02 21:44:24 -08:00

orphaned_procs

More istypes replaced with helpers (#20767)

2016-10-03 13:40:13 +13:00

_compile_options.dm

…

world.dm

100% less shitty

2016-11-27 19:00:02 -05:00