skull132 a5848c2802 Merge branch 'development' into map-development ...

# Conflicts:
#	baystation12.dme
#	code/game/objects/random/random.dm
#	code/game/turfs/turf_changing.dm
#	code/modules/mining/ore.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm

2017-05-01 01:07:56 +03:00

..

preference_setup

Merge branch 'master' into development

2017-04-17 14:51:56 +03:00

client defines.dm

Fix malicious/bad JS exploits

2017-04-01 16:57:56 +03:00

client procs.dm

Remove some unused PDA icons (#2096)

2017-04-16 20:15:25 +03:00

movement.dm

Lighting Overhaul & General process improvements (#1612)

2017-01-29 01:13:54 +02:00

preferences_ambience.dm

Saving + Updating + ALL THE THINGS

2016-12-11 21:44:35 +02:00

preferences_factions.dm

Travis: Indentation / list fixes (#1254)

2016-12-19 16:40:52 +02:00

preferences_notification.dm

Server Greeting Refactor (#1034)

2016-11-06 13:59:22 +02:00

preferences_savefile.dm

SQL Saves - Season 2 Episode 2 - The Fixening (#1286)

2016-12-25 00:56:36 +02:00

preferences_spawnpoints.dm

Bugfix Bonanza + Z-code and stuff. (#1819)

2017-02-22 14:42:49 -05:00

preferences_toggles.dm

Progress bar pref (#1938)

2017-03-19 11:39:23 +02:00

preferences.dm

Progress bar pref (#1938)

2017-03-19 11:39:23 +02:00

ui_style.dm

…