PsiOmegaDelta e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm

2015-08-11 08:21:06 +02:00

..

__HELPERS

Merge pull request #10400 from Baystation12/master

2015-08-01 19:44:22 +02:00

_defines

…

_onclick

Fixes #10230

2015-07-18 23:27:09 -04:00

ATMOSPHERICS

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-06 17:31:41 +02:00

controllers

Makes the new initialization message use the proper method.

2015-08-10 17:46:38 +02:00

datums

revert chargen rendering rework

2015-08-01 11:35:53 +01:00

defines

Adds 'Provisional' to the list of acting rank prefixes

2015-07-05 12:29:46 +01:00

FEA

…

game

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

js

…

modules

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-08-11 08:21:06 +02:00

TriDimension

Fixes misleading path and proc name

2015-06-26 00:40:31 -04:00

ZAS

anchored and unsimulated objects are no longer considered for airflow

2015-07-30 21:00:42 +01:00

global.dm

…

hub.dm

…

names.dm

…

setup.dm

Moved custom_synthetic.dmi into a proper define.

2015-08-09 16:48:20 +09:30

stylesheet.dm

…

world.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-07-30 10:38:44 +02:00