PsiOmegaDelta 9057655da6 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/clothing/spacesuits/void/void.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-08-24 10:31:30 +02:00

..

__defines

Accidentally commited before saving the file.

2015-08-21 16:19:09 +03:00

_helpers

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

_onclick

Makes observers use forceMove.

2015-08-23 17:45:46 +02:00

ATMOSPHERICS

Removes #undefine

2015-08-18 17:20:39 -04:00

controllers

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

2015-08-24 10:31:30 +02:00

datums

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

defines

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

FEA

…

game

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

2015-08-24 10:31:30 +02:00

js

…

modules

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

2015-08-24 10:31:30 +02:00

TriDimension

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00

ZAS

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

global.dm

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

hub.dm

…

names.dm

…

setup.dm

Removes unused obj flags and fixes overlapping flags

2015-08-18 17:08:41 -04:00

stylesheet.dm

…

world.dm

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

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