HarpyEagle 7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-10-05 19:20:33 -04:00

..

hud

Destroy tweaks.

2015-09-25 10:44:23 +02:00

adjacent.dm

…

ai.dm

Fixes for previous commits.

2015-08-24 18:31:52 +09:30

click.dm

Remove unneccessary /area/start definition

2015-09-12 08:46:50 +01:00

cyborg.dm

Removes click cooldowns almost everywhere.

2015-05-09 17:27:19 +03:00

drag_drop.dm

…

item_attack.dm

Fixes missing cooldowns, missing cult blade sound.

2015-09-09 15:15:43 -04:00

observer.dm

Makes observers use forceMove.

2015-08-23 17:45:46 +02:00

oldcode.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge

2015-05-05 22:13:58 +02:00

other_mobs.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-06-07 14:05:54 +03:00

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

Adds missing TK move cooldowns, adjusts click move cooldowns

2015-08-21 23:21:54 -04:00