mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm

2015-03-31 01:37:55 -04:00

..

hud

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

2015-03-31 01:37:55 -04: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

Fixes runtime error: pick() from empty list

2015-01-13 13:37:07 -08:00

observer.dm

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

oldcode.dm

Mob refactoring.

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

other_mobs.dm

Mob refactoring.

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

telekinesis.dm

refactor 'dir = ' into 'set_dir()'

2014-12-01 13:44:02 +00:00