diff --git a/code/modules/surgery/advanced/wingreconstruction.dm b/code/modules/surgery/advanced/wingreconstruction.dm index 9b0f5f1d774..33ccc5a6811 100644 --- a/code/modules/surgery/advanced/wingreconstruction.dm +++ b/code/modules/surgery/advanced/wingreconstruction.dm @@ -12,7 +12,10 @@ /datum/surgery/advanced/wing_reconstruction/can_start(mob/user, mob/living/carbon/target) if(!istype(target)) return FALSE - return ..() && target.dna.features["moth_wings"] == "Burnt Off" && ismoth(target) + var/obj/item/organ/external/wings/moth/wings = target.getorganslot(ORGAN_SLOT_EXTERNAL_WINGS) + if(!istype(wings, /obj/item/organ/external/wings/moth)) + return FALSE + return ..() && wings?.burnt /datum/surgery_step/wing_reconstruction name = "start wing reconstruction" @@ -38,7 +41,8 @@ span_notice("[user] completes the surgery on [target]'s wings.")) display_pain(target, "You can feel your wings again!") var/obj/item/organ/external/wings/moth/wings = target.getorganslot(ORGAN_SLOT_EXTERNAL_WINGS) - wings?.heal_wings() + if(istype(wings, /obj/item/organ/external/wings/moth)) //make sure we only heal moth wings. + wings.heal_wings() var/obj/item/organ/external/antennae/antennae = target.getorganslot(ORGAN_SLOT_EXTERNAL_ANTENNAE) //i mean we might aswell heal their antennae too antennae?.heal_antennae()