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

Conflicts:
	code/modules/projectiles/projectile.dm

2015-05-12 13:40:47 +02:00

..

hud

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

2015-05-05 08:11:28 +02:00

adjacent.dm

Added a quick adjacent check for alt-clicking

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

ai.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

click.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

cyborg.dm

Ports /tg/'s borg hotkeys. They work similarly to the AI's hotkeys.

2015-03-13 21:41:23 -04:00

drag_drop.dm

…

item_attack.dm

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

2015-05-12 13:40:47 +02:00

observer.dm

Drops the machinery part of the singularity.

2015-04-16 12:51:02 +02:00

oldcode.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

other_mobs.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00

telekinesis.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00