Leshana e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink ...

# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme

2016-05-29 16:22:07 -04:00

..

preference_setup

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

client defines.dm

Manually ports /tg/'s darkclick code.

2016-04-08 23:07:10 -04:00

client procs.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2016-05-26 09:59:18 -04:00

movement.dm

add verbs to allow players to spin their view

2015-12-05 10:52:29 +00:00

preferences_factions.dm

Generic Station & System Name

2016-05-16 16:21:17 -04:00

preferences_savefile.dm

Revert "Revert "Bay update.""

2016-02-07 16:33:30 +10:30

preferences_spawnpoints.dm

1.3.0 of Grenades and Elevators

2015-12-11 23:05:15 -08:00

preferences_toggle_procs.dm

Fixes preferences typo

2016-05-03 14:40:57 -05:00

preferences_vr.dm

Desc

2016-05-08 17:06:00 -04:00

preferences.dm

Merge remote-tracking branch 'polaris/master' into sink

2016-05-29 16:22:07 -04:00

ui_style.dm

Allows robots to change UI style.

2016-04-29 22:40:27 -04:00