mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/modules/organs/organ_external.dm

2015-03-31 02:13:22 -04:00

..

drilling

Updates drill and scanner

2015-03-24 18:34:26 +03:00

abandonedcrates.dm

Accessories update.

2015-02-08 12:35:50 +03:00

alloys.dm

…

coins.dm

…

machine_input_output_plates.dm

…

machine_processing.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

machine_stacking.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

machine_unloading.dm

…

mine_items.dm

Added Techhead's cyberlimbs under datum system. Added limbs to dionaea. Working on robotic limbs.

2015-03-28 11:01:11 +10:30

mine_turfs.dm

…

minerals.dm

…

mint.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

money_bag.dm

Corrects return values for the Topic procs of several computers and some other machines as well.

2015-02-25 21:32:35 -05:00

ore_datum.dm

…

ore.dm

Updates storage costs

2015-03-05 10:40:25 -05:00

satchel_ore_boxdm.dm

Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate.

2015-03-30 22:05:00 -04:00