Aurora.3

mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 16:12:19 +00:00

Files

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

Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml

2015-12-06 11:48:20 +01:00

hud

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

2015-12-06 11:48:20 +01:00

adjacent.dm

…

ai.dm

Fixes for previous commits.

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

click.dm

Remove unneccessary /area/start definition

2015-09-12 08:46:50 +01:00