skull132 b6e8ae4d53 Merge branch 'master' into development ...

# Conflicts:
#	code/modules/reagents/reagent_containers/inhaler.dm

2018-08-05 20:29:03 +03:00

..

__defines

Merge branch 'master' into development

2018-08-05 20:29:03 +03:00

_helpers

Implements TGS3 API (#4800)

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

_onclick

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

ATMOSPHERICS

Fix girders and cult rune layers (#5079)

2018-08-03 21:58:07 +03:00

controllers

Ports TGs System of Cargo Rewards and Bounties (#4998)

2018-08-04 21:34:18 +02:00

datums

Adds HUD aviators (#4961)

2018-08-05 20:23:40 +03:00

defines

.loc = to forceMove() (#4937)

2018-08-04 01:48:58 +03:00

game

Merge branch 'master' into development

2018-08-05 20:29:03 +03:00

js

…

modules

Merge branch 'master' into development

2018-08-05 20:29:03 +03:00

unit_tests

Vue.js UI implementation (#4868)

2018-08-04 20:19:29 +03:00

ZAS

Extinguisher + Container Reworks (#4793)

2018-08-05 20:14:00 +03:00

global.dm

[Ready] Asteroid Dungeons (#4884)

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

hub.dm

…

names.dm

…

stylesheet.dm

Minor bugfixes july update (#5029)

2018-07-23 23:05:41 +03:00

world.dm

Implements TGS3 API (#4800)

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