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

# Conflicts:
#	code/modules/modular_computers/computers/modular_computer/damage.dm

2017-05-20 19:18:35 +03:00

..

__defines

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

_helpers

Kill airlocks' process(), SSpower, and misc. performance tweaks (#2175)

2017-05-11 22:19:51 +03:00

_onclick

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

ATMOSPHERICS

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

controllers

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

datums

(Hopefully) Fix Mind GC Issues (#2301)

2017-05-20 14:24:47 +03:00

defines

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

game

Merge branch 'master' into development

2017-05-20 19:18:35 +03:00

js

…

modules

Merge branch 'master' into development

2017-05-20 19:18:35 +03:00

unit_tests

Newmap - SMC, Openturf, Arrivals Controller, and Mine Turf Improvements (#1958)

2017-05-02 14:40:40 -04:00

ZAS

ZAS Performance Improvements (#2308)

2017-05-20 19:00:15 +03:00

_macros.dm

Suit Sensors Changes (#2121)

2017-04-23 18:25:39 -04:00

global.dm

Kill airlocks' process(), SSpower, and misc. performance tweaks (#2175)

2017-05-11 22:19:51 +03:00

hub.dm

Makes Hub Password / Login depend on a DEFINE

2016-01-25 21:36:47 -05:00

names.dm

…

stylesheet.dm

Change DOsay color again (#2138)

2017-05-01 19:30:45 +03:00

world.dm

Fix bad hub text (#2168)

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