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

Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm

2015-10-07 08:14:30 +02:00

..

atmospherics.dm

…

datum_pool.dm

…

files.dm

…

game.dm

…

global_lists.dm

Languages now use alternative prefix keys.

2015-08-26 13:17:57 +02:00

icons.dm

…

lists.dm

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

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

logging.dm

…

maths.dm

…

matrices.dm

…

mobs.dm

Attempts to improve mob in view acquirement.

2015-09-13 14:32:49 +02:00

names.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

sanitize_values.dm

…

text.dm

Players can now select their own language shortcut keys.

2015-08-26 15:15:54 +02:00

time.dm

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

2015-08-29 16:53:42 +09:30

turfs.dm

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

2015-10-07 08:07:23 +02:00

type2type.dm

…

unsorted.dm

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

2015-09-26 08:48:37 +02:00

vector.dm

…