From 80469a32f998ab72444318bd44b61ace243ee816 Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Mon, 1 Mar 2021 22:33:21 -0600 Subject: [PATCH] WHY WON'T YOU HIDE CORRECTLY --- .../research/designs/medical_designs.dm | 6 ++++++ .../research/techweb/nodes/medical_nodes.dm | 18 +++++++++--------- code/modules/smithing/smithed_items.dm | 2 +- code/modules/surgery/robot_healing.dm | 8 ++++---- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm index 91e52775d2..471b2f931e 100644 --- a/code/modules/research/designs/medical_designs.dm +++ b/code/modules/research/designs/medical_designs.dm @@ -846,8 +846,14 @@ id = "surgery_heal_combo_upgrade_femto" /datum/design/surgery/healing/robot_upgrade + name = "Repair Robotic Limbs Upgrade" + surgery = /datum/surgery/robot_healing/upgraded + id = "surgery_heal_robo_upgrade" /datum/design/surgery/healing/robot_upgrade_2 + name = "Repair Robotic Limbs Upgrade II" + surgery = /datum/surgery/robot_healing/upgraded/femto + id = "surgery_heal_robo_upgrade_femto" /datum/design/surgery/surgery_toxinhealing name = "Body Rejuvenation" diff --git a/code/modules/research/techweb/nodes/medical_nodes.dm b/code/modules/research/techweb/nodes/medical_nodes.dm index 914a6174ab..af23804c57 100644 --- a/code/modules/research/techweb/nodes/medical_nodes.dm +++ b/code/modules/research/techweb/nodes/medical_nodes.dm @@ -116,6 +116,14 @@ design_ids = list("surgery_heal_brute_upgrade","surgery_heal_burn_upgrade") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000) +/datum/techweb_node/adv_surgery + id = "adv_surgery" + display_name = "Advanced Surgery" + description = "When simple medicine doesn't cut it." + prereq_ids = list("imp_wt_surgery") + design_ids = list("surgery_revival", "surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto","surgery_heal_robo_upgrade","surgery_heal_combo", "surgery_toxinhealing", "organbox", "surgery_adv_dissection") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + /datum/techweb_node/advance_surgerytools id = "advance_surgerytools" display_name = "Advanced Surgery Tools" @@ -124,20 +132,12 @@ design_ids = list("drapes", "retractor_adv", "surgicaldrill_adv", "scalpel_adv", "bonesetter", "surgical_tape") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) -/datum/techweb_node/adv_surgery - id = "adv_surgery" - display_name = "Advanced Surgery" - description = "When simple medicine doesn't cut it." - prereq_ids = list("imp_wt_surgery") - design_ids = list("surgery_revival", "surgery_lobotomy", "surgery_heal_brute_upgrade_femto","surgery_heal_burn_upgrade_femto", "surgery_heal_combo", "surgery_toxinhealing", "organbox", "surgery_adv_dissection") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - /datum/techweb_node/exp_surgery id = "exp_surgery" 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_exp_dissection", "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_exp_dissection","surgery_heal_robo_upgrade_femto","surgery_heal_combo_upgrade") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 5000) /datum/techweb_node/alien_surgery diff --git a/code/modules/smithing/smithed_items.dm b/code/modules/smithing/smithed_items.dm index e514fd5c9a..aff296b684 100644 --- a/code/modules/smithing/smithed_items.dm +++ b/code/modules/smithing/smithed_items.dm @@ -394,7 +394,7 @@ name = "smithed katana blade" finishingitem = /obj/item/swordhandle finalitem = /obj/item/melee/smith/twohand/katana - icon_state = "katana" + icon_state = "katana-s" /obj/item/smithing/katanablade/startfinish() diff --git a/code/modules/surgery/robot_healing.dm b/code/modules/surgery/robot_healing.dm index a37344933e..047aa4424f 100644 --- a/code/modules/surgery/robot_healing.dm +++ b/code/modules/surgery/robot_healing.dm @@ -3,7 +3,7 @@ /datum/surgery/robot_healing name = "Repair Robotic Limbs" desc = "A surgical procedure that provides repairs and maintenance to robotic limbs. Is slightly more efficient when the patient is severely damaged." - + replaced_by = /datum/surgery steps = list(/datum/surgery_step/mechanic_open, /datum/surgery_step/pry_off_plating, /datum/surgery_step/cut_wires, @@ -15,7 +15,7 @@ requires_bodypart_type = 0 //You can do this on anyone, but it won't really be useful on people without augments. ignore_clothes = TRUE var/antispam = FALSE - var/healing_step_type = /datum/surgery_step/robot_heal/basic + var/healing_step_type /datum/surgery/robot_healing/basic name = "Repair Robotic Limbs (Basic)" @@ -25,15 +25,15 @@ /datum/surgery/robot_healing/upgraded name = "Repair Robotic Limbs (Adv.)" - replaced_by = /datum/surgery/robot_healing/upgraded/femto requires_tech = TRUE + replaced_by = /datum/surgery/robot_healing/upgraded/femto healing_step_type = /datum/surgery_step/robot_heal/upgraded desc = "A surgical procedure that provides advanced repairs and maintenance to a patient's robotic limbs. Heals more when the patient is severely injured." /datum/surgery/robot_healing/upgraded/femto name = "Repair Robotic Limbs (Exp.)" - replaced_by = /datum/surgery/robot_healing/upgraded/femto requires_tech = TRUE + replaced_by = /datum/surgery/robot_healing/upgraded/femto healing_step_type = /datum/surgery_step/robot_heal/upgraded/femto desc = "A surgical procedure that provides experimental repairs and maintenance to a patient's robotic limbs. Heals considerably more when the patient is severely injured."