From 319046545cd1a79456aa4ed87508c54e27e3a6a0 Mon Sep 17 00:00:00 2001
From: JimKil3 <47290811+JimKil3@users.noreply.github.com>
Date: Sat, 22 Apr 2023 03:17:52 -0400
Subject: [PATCH] organ tweaks and grammar (#20732)
---
code/modules/surgery/organs/augments_arms.dm | 1 +
code/modules/surgery/organs/subtypes/machine.dm | 3 +++
code/modules/surgery/organs_internal.dm | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 9eb981b981f..2ef6161fa7a 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -340,6 +340,7 @@
desc = "An implant commonly installed inside IPCs in order to allow them to easily collect energy from their environment"
origin_tech = "materials=3;biotech=2;powerstorage=3"
contents = newlist(/obj/item/apc_powercord)
+ requires_robotic_bodypart = TRUE
/obj/item/organ/internal/cyberimp/arm/power_cord/emp_act(severity)
// To allow repair via nanopaste/screwdriver
diff --git a/code/modules/surgery/organs/subtypes/machine.dm b/code/modules/surgery/organs/subtypes/machine.dm
index 8c4b7258232..7acdb7a461c 100644
--- a/code/modules/surgery/organs/subtypes/machine.dm
+++ b/code/modules/surgery/organs/subtypes/machine.dm
@@ -111,6 +111,7 @@
slot = "heart"
vital = TRUE
status = ORGAN_ROBOT
+ requires_robotic_bodypart = TRUE
/obj/item/organ/internal/eyes/optical_sensor
name = "optical sensor"
@@ -119,6 +120,7 @@
status = ORGAN_ROBOT
// dead_icon = "camera_broken"
weld_proof = TRUE
+ requires_robotic_bodypart = TRUE
/obj/item/organ/internal/eyes/optical_sensor/remove(mob/living/user,special = 0)
if(!special)
@@ -152,6 +154,7 @@
icon_state = "taperecorder_idle"
status = ORGAN_ROBOT
dead_icon = "taperecorder_empty"
+ requires_robotic_bodypart = TRUE
/obj/item/organ/internal/ears/microphone/remove(mob/living/user, special = FALSE)
if(!special)
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 26c346704eb..71b7b5b240d 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -394,7 +394,7 @@
return SURGERY_BEGINSTEP_SKIP
if(I.requires_robotic_bodypart)
- to_chat(user, "[I] is an organ that requires a robotic interface[target].")
+ to_chat(user, "[I] is an organ that requires a robotic interface! [target]'s [parse_zone(target_zone)] does not have one.")
return SURGERY_BEGINSTEP_SKIP
if(target_zone != I.parent_organ || target.get_organ_slot(I.slot))