From cd2e894ebe01d331be7b9a0f7384f9594d584730 Mon Sep 17 00:00:00 2001 From: Linzolle Date: Wed, 18 Sep 2019 23:51:35 -0500 Subject: [PATCH] display results and wording --- .../bioware/experimental_dissection.dm | 20 ++++++++++++------- .../surgery/advanced/bioware/ligament_hook.dm | 8 ++++++-- .../bioware/ligament_reinforcement.dm | 8 ++++++-- tgstation.dme | 2 +- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/code/modules/surgery/advanced/bioware/experimental_dissection.dm b/code/modules/surgery/advanced/bioware/experimental_dissection.dm index a5f554bc43..b388537e0d 100644 --- a/code/modules/surgery/advanced/bioware/experimental_dissection.dm +++ b/code/modules/surgery/advanced/bioware/experimental_dissection.dm @@ -16,16 +16,18 @@ return FALSE //robots cannot be creative //(also this surgery shouldn't be consistently successful, and cyborgs have a 100% success rate on surgery) if(target.stat != DEAD) - return FALSE - + return FALSE + /datum/surgery_step/dissection name = "dissection" implements = list(/obj/item/scalpel = 60, /obj/item/kitchen/knife = 30, /obj/item/shard = 15) time = 125 /datum/surgery_step/dissection/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts dissecting [target].", "You start dissecting [target].") - + display_results(user, target, "You start dissecting [target].", + "[user] starts dissecting [target].", + "[user] starts dissecting [target].") + /datum/surgery_step/dissection/proc/check_value(mob/living/carbon/target) if(isalienroyal(target)) return 10000 @@ -45,15 +47,19 @@ return 2000 /datum/surgery_step/dissection/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] dissects [target]!", "You dissect [target], and add your discoveries to the research database!") + display_results(user, target, "You dissect [target], and add your discoveries to the research database!", + "[user] dissects [target], adding [user.p_their()] discoveries to the research database!", + "[user] dissects [target]!") SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = check_value(target))) var/obj/item/bodypart/L = target.get_bodypart(BODY_ZONE_CHEST) target.apply_damage(80, BRUTE, L) new /datum/bioware/dissected(target) return TRUE - + /datum/surgery_step/dissection/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] dissects [target]!", "You dissect [target], but do not find anything particularly interesting.") + display_results(user, target, "You dissect [target], but do not find anything particularly interesting." + "[user] dissects [target], however it seems [user.p_they()] didn't find anything useful.", + "[user] dissects [target], but looks a little dissapointed.") SSresearch.science_tech.add_point_list(list(TECHWEB_POINT_TYPE_GENERIC = (check_value(target) * 0.2))) var/obj/item/bodypart/L = target.get_bodypart(BODY_ZONE_CHEST) target.apply_damage(80, BRUTE, L) diff --git a/code/modules/surgery/advanced/bioware/ligament_hook.dm b/code/modules/surgery/advanced/bioware/ligament_hook.dm index ee59f0213c..2c154436e6 100644 --- a/code/modules/surgery/advanced/bioware/ligament_hook.dm +++ b/code/modules/surgery/advanced/bioware/ligament_hook.dm @@ -18,10 +18,14 @@ time = 125 /datum/surgery_step/reshape_ligaments/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts reshaping [target]'s ligaments into a hook-like shape.", "You start reshaping [target]'s ligaments into a hook-like shape.") + display_results(user, target, "You start reshaping [target]'s ligaments into a hook-like shape.", + "[user] starts reshaping [target]'s ligaments into a hook-like shape.", + "[user] starts manipulating [target]'s ligaments.") /datum/surgery_step/reshape_ligaments/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] reshapes [target]'s ligaments into a connective hook!", "You reshape [target]'s ligaments into a connective hook!") + display_results(user, target, "You finish reshaping [target]'s ligaments into a connective hook!", + "[user] finishes reshaping [target]'s ligaments into a connective hook!", + "[user] finishes manipulating [target]'s ligaments!") new /datum/bioware/hooked_ligaments(target) return TRUE diff --git a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm index 8ef3a56eba..ac034fcea7 100644 --- a/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm +++ b/code/modules/surgery/advanced/bioware/ligament_reinforcement.dm @@ -18,10 +18,14 @@ time = 125 /datum/surgery_step/reinforce_ligaments/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] starts reinforce [target]'s ligaments.", "You start reinforcing [target]'s ligaments.") + display_results(user, target, "You start reinforcing [target]'s ligaments.", + "[user] starts reinforcing [target]'s ligaments.", + "[user] starts manipulating [target]'s ligaments.") /datum/surgery_step/reinforce_ligaments/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) - user.visible_message("[user] reinforces [target]'s ligaments!", "You reinforce [target]'s ligaments!") + display_results(user, target, "You finish reinforcing [target]'s ligaments!", + "[user] finishes reinforcing [target]'s ligaments!", + "[user] finishes manipulating [target]'s ligaments!") new /datum/bioware/reinforced_ligaments(target) return TRUE diff --git a/tgstation.dme b/tgstation.dme index 2c76ad6dc1..f1430cebf2 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2774,9 +2774,9 @@ #include "code\modules\surgery\advanced\viral_bonding.dm" #include "code\modules\surgery\advanced\bioware\bioware.dm" #include "code\modules\surgery\advanced\bioware\bioware_surgery.dm" +#include "code\modules\surgery\advanced\bioware\experimental_dissection.dm" #include "code\modules\surgery\advanced\bioware\ligament_hook.dm" #include "code\modules\surgery\advanced\bioware\ligament_reinforcement.dm" -#include "code\modules\surgery\advanced\bioware\experimental_dissection.dm" #include "code\modules\surgery\advanced\bioware\nerve_grounding.dm" #include "code\modules\surgery\advanced\bioware\nerve_splicing.dm" #include "code\modules\surgery\advanced\bioware\vein_threading.dm"