From f39477a1da5703f7f43fa27b4a5f4f6718b6a2e9 Mon Sep 17 00:00:00 2001 From: VisVirific Date: Thu, 24 Mar 2022 06:54:32 -0300 Subject: [PATCH] Two minor fixes (#13412) --- code/modules/organs/organ_external.dm | 2 +- code/modules/surgery/robotics.dm | 2 +- html/changelogs/robotic_limbs_bleed_screwhatch.yml | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/robotic_limbs_bleed_screwhatch.yml diff --git a/code/modules/organs/organ_external.dm b/code/modules/organs/organ_external.dm index 42a3caa278b..9cfeaeec7a9 100644 --- a/code/modules/organs/organ_external.dm +++ b/code/modules/organs/organ_external.dm @@ -846,7 +846,7 @@ Note that amputating the affected organ does in fact remove the infection from t number_wounds += W.amount //things tend to bleed if they are CUT OPEN - if (open && !clamped && (H && !(H.species.flags & NO_BLOOD))) + if (open && !clamped && (H && !(H.species.flags & NO_BLOOD) && !(status & ORGAN_ROBOT))) status |= ORGAN_BLEEDING if (istype(tendon)) diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm index adddd9ed0a4..a79f82ed9ee 100644 --- a/code/modules/surgery/robotics.dm +++ b/code/modules/surgery/robotics.dm @@ -99,7 +99,7 @@ var/obj/item/organ/external/affected = target.get_organ(target_zone) user.visible_message("[user] has closed the maintenance hatch on [target]'s [affected.name] with \the [tool].", \ SPAN_NOTICE("You have closed the maintenance hatch on [target]'s [affected.name] with \the [tool]."),) - affected.open = ORGAN_OPEN_INCISION + affected.open = ORGAN_CLOSED /decl/surgery_step/robotics/screw_hatch/fail_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool) var/obj/item/organ/external/affected = target.get_organ(target_zone) diff --git a/html/changelogs/robotic_limbs_bleed_screwhatch.yml b/html/changelogs/robotic_limbs_bleed_screwhatch.yml new file mode 100644 index 00000000000..c8ce1c244c8 --- /dev/null +++ b/html/changelogs/robotic_limbs_bleed_screwhatch.yml @@ -0,0 +1,7 @@ +author: Vrow + +delete-after: True + +changes: + - bugfix: "Fixed Robotic Limbs not properly screwing the hatch closed" + - bugfix: "Fixed Robotic Limbs saying they're bleeding if they get damaged when the hatch is unscrewed." \ No newline at end of file