From 32c736abbdee77bc37ebc2ca2deffac30ad82fd3 Mon Sep 17 00:00:00 2001 From: Theos Date: Sat, 4 Apr 2020 03:12:15 -0400 Subject: [PATCH 1/4] DNA recovery can be used to fix husks --- code/modules/surgery/advanced/dna_recovery.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/dna_recovery.dm b/code/modules/surgery/advanced/dna_recovery.dm index 536f540f9db9..443e05735cbd 100644 --- a/code/modules/surgery/advanced/dna_recovery.dm +++ b/code/modules/surgery/advanced/dna_recovery.dm @@ -15,7 +15,7 @@ if(!..()) return FALSE - if(!HAS_TRAIT_FROM(target, TRAIT_BADDNA, CHANGELING_DRAIN)) + if(!HAS_TRAIT_FROM(target, TRAIT_BADDNA, CHANGELING_DRAIN) || !HAS_TRAIT(target, TRAIT_HUSK)) return FALSE return TRUE @@ -36,4 +36,5 @@ "[user] successfully repairs some of [target]'s DNA", "[user] completes the surgery on [target]'s brain.") REMOVE_TRAIT(target, TRAIT_BADDNA, CHANGELING_DRAIN) + cure_husk() return TRUE From 005d9d61ecf657a1405685d6a4cfbd4a59ee6012 Mon Sep 17 00:00:00 2001 From: Theos Date: Sat, 4 Apr 2020 03:13:26 -0400 Subject: [PATCH 2/4] DNA recovery moved from advanced to experimental --- code/modules/research/techweb/all_nodes.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index a31f365562f0..68b729ad8dc9 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -92,7 +92,7 @@ display_name = "Advanced Surgery" description = "When simple medicine doesn't cut it." prereq_ids = list("imp_wt_surgery") - design_ids = list("surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto","surgery_heal_combo", "surgery_revival", "surgery_dna_recovery") + design_ids = list("surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto","surgery_heal_combo", "surgery_revival") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1500) export_price = 4000 @@ -101,7 +101,7 @@ display_name = "Experimental Surgery" description = "When evolution isn't fast enough." prereq_ids = list("adv_surgery") - design_ids = list("surgery_pacify","surgery_vein_thread","surgery_muscled_veins","surgery_nerve_splice","surgery_nerve_ground","surgery_ligament_hook","surgery_ligament_reinforcement","surgery_viral_bond", "surgery_heal_combo_upgrade") + design_ids = list("surgery_pacify","surgery_vein_thread","surgery_muscled_veins","surgery_nerve_splice","surgery_nerve_ground","surgery_ligament_hook","surgery_ligament_reinforcement","surgery_viral_bond", "surgery_heal_combo_upgrade", "surgery_dna_recovery") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) export_price = 5000 From 0ae7be3f5bb8ad812338d65a6cf31c0725216422 Mon Sep 17 00:00:00 2001 From: Theos Date: Sat, 4 Apr 2020 03:15:37 -0400 Subject: [PATCH 3/4] Update dna_recovery.dm --- code/modules/surgery/advanced/dna_recovery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/dna_recovery.dm b/code/modules/surgery/advanced/dna_recovery.dm index 443e05735cbd..d48bc1445e8b 100644 --- a/code/modules/surgery/advanced/dna_recovery.dm +++ b/code/modules/surgery/advanced/dna_recovery.dm @@ -36,5 +36,5 @@ "[user] successfully repairs some of [target]'s DNA", "[user] completes the surgery on [target]'s brain.") REMOVE_TRAIT(target, TRAIT_BADDNA, CHANGELING_DRAIN) - cure_husk() + target.cure_husk() return TRUE From 98067e76733acfef8a4ee04fd11e2b1fbfb2b284 Mon Sep 17 00:00:00 2001 From: Theos Date: Sat, 4 Apr 2020 13:09:13 -0400 Subject: [PATCH 4/4] Update dna_recovery.dm --- code/modules/surgery/advanced/dna_recovery.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/surgery/advanced/dna_recovery.dm b/code/modules/surgery/advanced/dna_recovery.dm index d48bc1445e8b..8cb89e3fabb4 100644 --- a/code/modules/surgery/advanced/dna_recovery.dm +++ b/code/modules/surgery/advanced/dna_recovery.dm @@ -15,7 +15,7 @@ if(!..()) return FALSE - if(!HAS_TRAIT_FROM(target, TRAIT_BADDNA, CHANGELING_DRAIN) || !HAS_TRAIT(target, TRAIT_HUSK)) + if(!HAS_TRAIT_FROM(target, TRAIT_BADDNA, CHANGELING_DRAIN) && !HAS_TRAIT(target, TRAIT_HUSK)) return FALSE return TRUE