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

# Conflicts:
#	code/modules/mob/living/silicon/pai/pai.dm

2017-06-13 13:44:41 +03:00

..

__defines

Fix MultiZAS (#2614)

2017-06-10 22:38:41 +03:00

_helpers

Ports body markings from polaris (#2607)

2017-06-06 00:43:45 +03:00

_onclick

Kitchen tweaks (#2570)

2017-06-05 11:20:55 +03:00

ATMOSPHERICS

machinery_process() & auto_use_power efficiency tweaks (#2657)

2017-06-12 19:09:36 +03:00

controllers

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

datums

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00

defines

Adds more sounds (#2590)

2017-06-04 13:32:49 +03:00

game

Merge branch 'master' into development

2017-06-13 13:44:41 +03:00

js

…

modules

Merge branch 'master' into development

2017-06-13 13:44:41 +03:00

unit_tests

…

ZAS

Fix MultiZAS (#2614)

2017-06-10 22:38:41 +03:00

_macros.dm

…

global.dm

Makes the arrivals shuttle more robust (#2565)

2017-06-04 19:58:31 +03:00

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

Admin & Staff adjustments (#2529)

2017-06-13 01:37:44 +03:00