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

..

hud

Underwear Datums (#1794)

2016-05-29 17:29:36 +01:00

adjacent.dm

Added a quick adjacent check for alt-clicking

2014-05-14 19:59:40 +12:00

ai.dm

Fixes two very common runtimes

2016-05-02 00:46:31 -04:00

click.dm

Removes move delay after clicking

2016-04-25 11:36:48 +03:00

cyborg.dm

Traitor Borg lockdown, blowing-up fixed; can now self-hack.

2016-03-12 17:03:28 -05:00

drag_drop.dm

…

item_attack.dm

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

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

observer.dm

Adjusts check to fix double click moving as observer

2016-04-19 18:08:08 +01:00

other_mobs.dm

Made slimes more interesting.

2016-05-06 04:07:52 +09:30

rig.dm

Replacing hardcoded key/name checks in rig admin alert with key_name_admin().

2015-08-24 16:44:17 +09:30

telekinesis.dm

Removes move delay after clicking

2016-04-25 11:36:48 +03:00