Remie Richards abf466e9bc Merge conflict fixes, Uses newly refactor actions, All cursed hearts can now be inserted by hand, not just wizard ones. Fixes organ actions trying to be granted to the object, not the user. ...

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

Conflicts:
	code/modules/surgery/organs/organ_internal.dm

2016-02-24 02:33:22 +00:00

..

spell_types

Added a wizard version of the heart, it heals the user every pump and only requires pumping every 6 seconds (vs 3)

2016-02-22 02:25:04 +00:00

spell.dm

Refactored the item's action system. Items can now hold multiple actions.

2016-02-23 19:37:42 +01:00