skull132 16eae6c246 Merge branch 'master' into development ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-7_roof.dmm

2018-10-07 01:33:20 +03:00

..

master

Implements TGS3 API (#4800)

2018-07-22 21:11:40 +03:00

subsystems

Merge branch 'master' into development

2018-10-07 01:33:20 +03:00

configuration.dm

[Ready] Asteroid Dungeons (#4884)

2018-07-20 22:10:35 +02:00

controller.dm

…

hooks-defs.dm

ID-Console Suspension instead of Termination (#3981)

2017-12-17 11:21:39 +02:00

hooks.dm

…

verbs.dm

Revert #3241 (#3670)

2017-10-17 20:39:50 -05:00