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

Conflicts:
	code/modules/admin/topic.dm

2015-08-22 02:30:14 +09:30

..

atmospherics.dm

…

datum_pool.dm

…

files.dm

…

game.dm

…

global_lists.dm

Species spawn_flags

2015-08-18 17:02:45 -04:00

icons.dm

…

lists.dm

Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums

2015-08-20 14:16:35 +02:00

logging.dm

Merge with master.

2015-08-18 11:31:10 -07:00

maths.dm

…

matrices.dm

…

mobs.dm

…

names.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

sanitize_values.dm

…

text.dm

Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery

2015-08-20 19:19:12 +09:30

time.dm

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

2015-08-17 09:44:21 +02:00

turfs.dm

…

type2type.dm

HUD cleanup, human/monkey HUD now turns correctly with client.dir

2015-08-18 18:21:25 +01:00

unsorted.dm

Merge pull request #10004 from PsiOmegaDelta/150703-AISight

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

vector.dm

…