skull132 7dc02be204 Merge branch 'master' into development ...

# Conflicts:
#	code/controllers/subsystems/initialization/misc_early.dm
#	config/example/config.txt
#	maps/aurora/aurora-1_centcomm.dmm
#	maps/aurora/aurora-4_mainlevel.dmm

2017-11-11 20:57:28 +02:00

..

antagonism

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

general

Add support for non-genetic markings (#3643)

2017-11-08 21:26:44 -06:00

global

parallax_togs and AO fix (#3693)

2017-10-17 22:02:27 +03:00

loadout

Skrell and estus fixes (#3824)

2017-11-10 23:27:07 -06:00

occupation

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

other

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

skills

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

preference_setup.dm

Preferences HTML cleanup (#3301)

2017-08-17 12:22:20 +03:00

preferences_sql.dm

Preferences fixes, ahoy! (#3045)

2017-07-21 20:50:59 +03:00