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

..

augments_external.dm

Surgery, Implants and Organs rework: Phase 1

2015-07-31 22:18:31 +03:00

augments_eyes.dm

Made changes to adjust with neersighted's fullscreen overlays pr.

2016-02-06 20:35:15 +01:00

augments_internal.dm

Fixes organ_action, they can now be named something other than "toggle [target.name]"

2016-02-24 02:49:47 +01:00

autoimplanter.dm

added sprite and another fluff sound

2016-01-25 16:58:47 -08:00

helpers.dm

Organs update 3

2015-09-25 22:26:15 +03:00

organ_external.dm

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

2016-02-04 14:34:45 +01:00

organ_internal.dm

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.

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