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

Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml

2015-09-07 11:31:19 +09:30

..

__defines

Merge pull request #10972 from Zuhayr/resomi

2015-09-06 13:09:34 +03:00

_helpers

Resomi language tweaks, fixes every species' names being generated in Galcom

2015-09-06 22:10:39 +01:00

_onclick

Fixes for previous commits.

2015-08-24 18:31:52 +09:30

ATMOSPHERICS

Removes #undefine

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

controllers

Merge pull request #10890 from PsiOmegaDelta/150826-AltLangKeys

2015-09-06 17:20:51 +09:30

datums

Merge pull request #10845 from PsiOmegaDelta/150824-Cargonia

2015-09-03 20:38:00 +03:00

defines

Added the Resomi.

2015-09-04 08:57:03 +09:30

FEA

…

game

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

2015-09-07 11:31:19 +09:30

js

…

modules

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

2015-09-07 11:31:19 +09:30

ZAS

Multi-Z.

2015-08-30 14:15:20 -07:00

global.dm

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

2015-09-07 11:31:19 +09:30

hub.dm

…

names.dm

…

stylesheet.dm

…

world.dm

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

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