Zuhayr b702c81060 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap ...

Conflicts:
	code/game/turfs/simulated/floor_types.dm

2015-08-22 03:57:12 +09:30

..

__defines

Accidentally commited before saving the file.

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

_helpers

Merge pull request #10004 from PsiOmegaDelta/150703-AISight

2015-08-22 02:21:36 +09:30

_onclick

Merge branch 'dev' into ofClicksAndCooldowns

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

ATMOSPHERICS

Removes #undefine

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

controllers

Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums

2015-08-22 02:18:39 +09:30

datums

Cleans out (mostly) unused access definitions and makes access lists sorted.

2015-08-21 14:45:45 +02:00

defines

Merge pull request #10101 from mwerezak/shards

2015-08-20 19:47:58 +03:00

FEA

…

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

2015-08-22 03:57:12 +09:30

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

2015-08-22 03:57:12 +09:30

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 #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +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 branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate

2015-08-22 03:17:16 +09:30