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

Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-12-20 11:55:53 +01:00

..

hud

Rewrote targeting.

2015-12-16 10:10:13 +10:30

adjacent.dm

…

ai.dm

Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower

2015-12-07 17:56:27 +01:00

click.dm

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

2015-12-20 11:55:53 +01:00

cyborg.dm

…

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

…

other_mobs.dm

…

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