PsiOmegaDelta 12fb0bdb10 Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower ...

Conflicts:
	code/modules/nano/nanoui.dm

2015-12-06 12:10:33 +01:00

..

hud

Merge remote-tracking branch 'upstream/dev-freeze' into dev.

2015-12-06 11:48:20 +01:00

adjacent.dm

Added a quick adjacent check for alt-clicking

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

ai.dm

Allows the AI to utilize its multitool where applicable.

2015-11-18 11:01:08 +01:00

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

Massive click code rework by SuperSayu, ported from TG.

2013-10-08 20:27:39 +01:00

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