From 87b85316711c044fb2c95195012e3109dc07f800 Mon Sep 17 00:00:00 2001
From: Sniblet <36427443+Sniblet@users.noreply.github.com>
Date: Mon, 13 Nov 2023 08:09:59 -0500
Subject: [PATCH] Psionic spellchecks (#17780)

* the thing

* tried to fix something i couldnt
---
 code/modules/psionics/abilities/mend.dm   | 14 ++++----
 code/modules/psionics/abilities/rend.dm   |  2 +-
 html/changelogs/sniblet-mend-feedback.yml | 42 +++++++++++++++++++++++
 3 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 html/changelogs/sniblet-mend-feedback.yml

diff --git a/code/modules/psionics/abilities/mend.dm b/code/modules/psionics/abilities/mend.dm
index b8c54eb15ee..39e611a572f 100644
--- a/code/modules/psionics/abilities/mend.dm
+++ b/code/modules/psionics/abilities/mend.dm
@@ -37,10 +37,10 @@
 	for(var/obj/item/organ/O in H.internal_organs)
 		if(do_mob(user, H, 15 SECONDS))
 			if(O.damage > 0) // Fix internal damage
-				to_chat(SPAN_NOTICE("You mend their [O]'s bruising."))
+				to_chat(user, SPAN_NOTICE("You mend their [O]'s bruising."))
 				O.heal_damage(O.damage)
 			if(HAS_FLAG(O.status, ORGAN_BROKEN))
-				to_chat(SPAN_NOTICE("You restart their [O]'s functionality."))
+				to_chat(user, SPAN_NOTICE("You restart their [O]'s functionality."))
 				O.status &= ~ORGAN_BROKEN
 			if(O.damage <= 5 && O.organ_tag == BP_EYES) // Fix eyes
 				H.sdisabilities &= ~BLIND
@@ -50,20 +50,20 @@
 		if(!O.robotic < ORGAN_ROBOT) // No robot parts for this.
 			continue
 		if(do_mob(user, H, 15 SECONDS))
-			to_chat(SPAN_NOTICE("You mend their [O]'s bruising."))
+			to_chat(user, SPAN_NOTICE("You mend their [O]'s bruising."))
 			O.heal_damage(0, O.damage, internal = TRUE, robo_repair = FALSE)
 
-	to_chat(user, SPAN_NOTICE("Finally, you flowing your regenerative psionic energy through their broken limbs..."))
+	to_chat(user, SPAN_NOTICE("Finally, you begin flowing your regenerative psionic energy through their broken limbs..."))
 	for(var/obj/item/organ/E in H.bad_external_organs) // Fix bones
 		var/obj/item/organ/external/affected = E
 		if(do_mob(user, H, 10 SECONDS))
 			if((affected.damage < affected.min_broken_damage * config.organ_health_multiplier) && (affected.status & ORGAN_BROKEN))
-				to_chat(SPAN_NOTICE("You mend their [affected] together."))
+				to_chat(user, SPAN_NOTICE("You mend their [affected] together."))
 				affected.status &= ~ORGAN_BROKEN
 			if(HAS_FLAG(affected.status, ORGAN_ARTERY_CUT))
-				to_chat(SPAN_NOTICE("You mend a spliced artery in their [affected]."))
+				to_chat(user, SPAN_NOTICE("You mend a spliced artery in their [affected]."))
 				affected.status &= ~ORGAN_ARTERY_CUT
 			if(HAS_FLAG(affected.status, ORGAN_DEAD))
-				to_chat(SPAN_NOTICE("You mend some necrosis from their [affected]."))
+				to_chat(user, SPAN_NOTICE("You mend some necrosis from their [affected]."))
 				affected.status &= ~ORGAN_DEAD
 	user.visible_message(SPAN_NOTICE("[user] raises their palm from [H]."), SPAN_NOTICE("You raise your palm, having finished your work."))
diff --git a/code/modules/psionics/abilities/rend.dm b/code/modules/psionics/abilities/rend.dm
index 58bc090a6e8..bc8c3231d68 100644
--- a/code/modules/psionics/abilities/rend.dm
+++ b/code/modules/psionics/abilities/rend.dm
@@ -17,7 +17,7 @@
 	armor_penetration = 30
 	cooldown = 30
 	psi_cost = 35
-	attack_verb = list("rends apart", "disintegrates")
+	attack_verb = list("rent apart", "disintegrated")
 	hitsound = 'sound/weapons/heavysmash.ogg'
 	flags = 0
 	var/structure_mode = FALSE
diff --git a/html/changelogs/sniblet-mend-feedback.yml b/html/changelogs/sniblet-mend-feedback.yml
new file mode 100644
index 00000000000..06cb9fc2188
--- /dev/null
+++ b/html/changelogs/sniblet-mend-feedback.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: Sniblet
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Using psi-mend now gives intended feedback."
+  - spellcheck: "Attacks with psi-rend now make grammatical sense."