mochi 5e40da0a13 Merge branch 'master' into tgui-login-plugin

2020-09-19 17:03:00 +02:00

..

__DEFINES

Martial arts rework/refactor. And you can't prepare combos now. Arts tied to the mind (#13341)

2020-09-18 11:07:19 -04:00

__HELPERS

[TGUI] Camera Consoles (Actual Magic) (#13750)

2020-09-19 09:55:33 -04:00

_globalvars

Merge pull request #14318 from Kyep/autoreconnect_merge_delay

2020-09-16 22:32:27 +01:00

_onclick

[TGUI] Camera Consoles (Actual Magic) (#13750)

2020-09-19 09:55:33 -04:00

ATMOSPHERICS

Adds Atmos magboots, and tweaks magboot sprites. (#14192)

2020-09-18 19:43:42 -04:00

controllers

Merge pull request #14291 from Kyep/tgui_id_computer

2020-09-16 20:10:42 +01:00

datums

[TGUI] Camera Consoles (Actual Magic) (#13750)

2020-09-19 09:55:33 -04:00

defines

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

game

Merge branch 'master' into tgui-login-plugin

2020-09-19 17:03:00 +02:00

LINDA

Removes all relative heresy (#13969)

2020-09-16 12:52:20 -04:00

modules

Merge branch 'master' into tgui-login-plugin

2020-09-19 17:03:00 +02:00

_compile_options.dm

…

hub.dm

…

world.dm

…