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

Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml

2015-09-11 08:54:03 +02:00

..

atmospherics.dm

Refactors gas analyize.

2015-07-02 15:32:21 +02:00

datum_pool.dm

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

2015-06-05 13:24:03 +03:00

files.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

game.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

global_lists.dm

Languages now use alternative prefix keys.

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

icons.dm

Completes the feature where mercenaries can setup fake crew announcements and records.

2015-08-14 13:42:11 +02:00

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

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

2015-07-11 10:58:49 +02:00

matrices.dm

Adds spinning animation for meteors.

2015-06-05 15:55:39 +02:00

mobs.dm

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

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

names.dm

Adds variables for CentComm, NanoTrasen and the station name.

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

sanitize_values.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

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

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00

type2type.dm

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

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

unsorted.dm

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

2015-09-11 08:54:03 +02:00

vector.dm

Splits setup.dm into berjillion of smaller files vaguely named thematically.

2015-06-04 21:51:58 +03:00