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

Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm

2015-04-08 10:55:26 +02: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

Removes FPRINT and TABLEPASS flags

2015-01-23 22:27:32 +03:00

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

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

2015-04-08 10:55:26 +02:00

mine_turfs.dm

Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf.

2015-01-23 13:40:05 +10:30

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