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

..

computer.dm

Removes unnecessary and cruft procs from mob/inventory.dm

2015-03-30 05:28:09 -04:00

containment_jar.dm

…

control.dm

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

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

engine.dm

Expansion of every "icon = ''" path.

2013-09-01 21:53:36 +01:00

fuel.dm

All the relevant examine changes.

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

shielding.dm

Cleanup can_fire(), projectile flag

2015-02-12 01:37:19 -05:00