skull132 22c7748336 Merge branch 'master' into development ...

# Conflicts:
#	code/game/machinery/computer/shuttle.dm
#	code/game/machinery/doors/firedoor.dm
#	code/game/objects/items/weapons/weaponry.dm
#	code/modules/admin/admin_attack_log.dm
#	code/modules/admin/admin_verbs.dm

2017-05-27 20:11:54 +03:00

..

__defines

Implement powersink surge (#2452)

2017-05-27 12:25:47 +03:00

_helpers

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

_onclick

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

ATMOSPHERICS

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

controllers

Rewriting multiz movement to be gooder (#2464)

2017-05-27 02:14:35 +03:00

datums

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

defines

…

game

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

js

…

modules

Merge branch 'master' into development

2017-05-27 20:11:54 +03:00

unit_tests

…

ZAS

Make some ZAS lists lazy (#2339)

2017-05-24 02:51:49 +03:00

_macros.dm

…

global.dm

Merge SSnanoui & Nanomanager (#2427)

2017-05-23 16:33:00 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Fix bad hub text (#2168)

2017-05-04 02:16:01 +03:00