phil235 524a55a757 Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment ...

Conflicts:
	code/datums/martial.dm
	code/game/gamemodes/changeling/powers/fleshmend.dm
	code/modules/mob/living/carbon/carbon.dm

2016-05-05 21:57:10 +02:00

..

combat

* Add an attack animation for mech melee attack.

2016-04-28 18:56:14 +02:00

equipment

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

2016-05-05 21:57:10 +02:00

medical

HUD fixes

2015-10-23 18:47:58 -05:00

working

makes the path /animalhide

2016-04-24 22:07:51 -07:00

mech_bay.dm

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

2016-04-24 21:22:37 +02:00

mech_fabricator.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

mecha_actions.dm

Makes some mech equipment inactive

2016-04-30 09:50:16 +03:00

mecha_construction_paths.dm

Various mining additions, fixes and rebalances.

2015-11-18 19:14:28 -05:00

mecha_control_console.dm

Fixes runtimes with add_blood() and add_blood_list()

2015-09-26 13:21:20 +02:00

mecha_defense.dm

Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot.

2016-05-02 17:18:34 +01:00

mecha_parts.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

mecha_topic.dm

Makes some mech equipment inactive

2016-04-30 09:50:16 +03:00

mecha_wreckage.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

mecha.dm

Fixes Haunted Mecha, Fixes Mecha damage runtimes, Fixes Mecha bumpsmash working without a pilot.

2016-05-02 17:18:34 +01:00