phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

2015-03-23 16:51:03 +01:00

..

laborcamp

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

equipment_locker.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

2015-03-23 16:51:03 +01:00

machine_input_output_plates.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

machine_processing.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

machine_stacking.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

machine_unloading.dm

Removed the need of the input and output object for the machinery of mining.

2013-11-26 09:12:21 -03:00

mine_areas.dm

Area Ambiance Refactor

2014-05-06 21:40:28 -05:00

mine_items.dm

Improves drill's handling of power

2015-03-05 17:12:12 +11:00

mine_turfs.dm

Improves drill's handling of power

2015-03-05 17:12:12 +11:00

mint.dm

Repaths clown ore to bananium

2014-09-19 21:26:50 +10:00

money_bag.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00

ores_coins.dm

Fixes steel cap bug. Steel cap now growns steel logs similar to wooden logs, you use the hatchet to get rods.

2015-03-10 20:30:46 +01:00

satchel_ore_boxdm.dm

attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.

2015-02-19 13:02:43 +00:00