Leshana 5ae26332fa Merge branch 'master' into aro-tether-wip ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm

2017-05-16 00:26:32 -04:00

..

preference_setup

Merge branch 'master' into aro-tether-wip

2017-05-16 00:26:32 -04:00

client defines.dm

…

client procs.dm

Fix 'if' statement on Panic Bunker

2017-04-11 00:13:54 -04:00

movement.dm

…

preferences_factions.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

preferences_savefile.dm

Ports Bay's character resets

2017-01-16 19:02:41 -06:00

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

Add a verb to the Preferences panel to toggle jukebox music.

2017-03-27 20:31:15 -04:00

preferences_vr.dm

…

preferences.dm

Adds Body Markings

2017-03-30 18:05:20 -04:00

spam_prevention.dm

Makes the automute less strict on timing

2017-01-14 23:06:24 -06:00

ui_style.dm

…