Kelenius 60196df634 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/modules/projectiles/gun.dm

2015-08-13 08:40:31 +03:00

..

hud

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

adjacent.dm

Added a quick adjacent check for alt-clicking

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

ai.dm

Removes click cooldowns almost everywhere.

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

click.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-13 08:40:31 +03:00

cyborg.dm

Removes click cooldowns almost everywhere.

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

drag_drop.dm

…

item_attack.dm

Gives changeNextMove() a better name, default define

2015-06-30 22:29:45 -04:00

observer.dm

Gives changeNextMove() a better name, default define

2015-06-30 22:29:45 -04: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

Gives changeNextMove() a better name, default define

2015-06-30 22:29:45 -04:00

telekinesis.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into clickcooldown

2015-06-28 22:35:14 -04:00