Aurora.3

mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-27 18:41:59 +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

antagonist

Merge pull request #11166 from PsiOmegaDelta/150921-UplinkTweak

2015-12-02 09:56:07 +10:30

area

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

dna

Updates blob

2015-10-05 18:10:16 +03:00

gamemodes

Merge pull request #11349 from PsiOmegaDelta/151023-Wires