From 0b995a77c899a908a3972d464c875738d8b0bb0a Mon Sep 17 00:00:00 2001
From: meep109 <64867308+meep109@users.noreply.github.com>
Date: Mon, 15 Sep 2025 08:06:37 -0400
Subject: [PATCH] Buffs Skrell martial arts to guarantee dislocation (#21317)

right now it has a 30% even IF you hit the combo which sucks.

---------

Signed-off-by: meep109 <64867308+meep109@users.noreply.github.com>
---
 code/modules/martial_arts/skrell.dm    | 22 ++++------
 html/changelogs/meep109_skrellbuff.yml | 58 ++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 html/changelogs/meep109_skrellbuff.yml

diff --git a/code/modules/martial_arts/skrell.dm b/code/modules/martial_arts/skrell.dm
index 19124f0713c..ee59a1fca76 100644
--- a/code/modules/martial_arts/skrell.dm
+++ b/code/modules/martial_arts/skrell.dm
@@ -41,20 +41,14 @@
 
 /datum/martial_art/karak_virul/proc/dislocating_strike(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
 	A.do_attack_animation(D)
-	if(prob(30))
-		var/obj/item/organ/external/organ = D.get_organ(A.zone_sel.selecting)
-		if(!organ || ORGAN_IS_DISLOCATED(organ) || organ.dislocated == -1)
-			return 0
-		organ.dislocate(1)
-		A.visible_message(SPAN_WARNING("[A] strikes [D]'s [organ.name] with their closed fist!"))
-		D.visible_message(SPAN_DANGER("[D]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!"))
-		admin_attack_log(A, D, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of")
-		playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1)
-		return 1
-	else
-		playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1)
-		D.apply_damage(5, DAMAGE_BRUTE)
-		A.visible_message(SPAN_WARNING("[A] strikes [D] with their closed fist!"))
+	var/obj/item/organ/external/organ = D.get_organ(A.zone_sel.selecting)
+	if(!organ || ORGAN_IS_DISLOCATED(organ) || organ.dislocated == -1)
+		return 0
+	organ.dislocate(1)
+	A.visible_message(SPAN_WARNING("[A] strikes [D]'s [organ.name] with their closed fist!"))
+	D.visible_message(SPAN_DANGER("[D]'s [organ.joint] [pick("gives way","caves in","crumbles","collapses")]!"))
+	admin_attack_log(A, D, "dislocated [organ.joint].", "had his [organ.joint] dislocated.", "dislocated [organ.joint] of")
+	playsound(get_turf(A), /singleton/sound_category/punch_sound, 50, 1, -1)
 	return 1
 
 /datum/martial_art/karak_virul/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
diff --git a/html/changelogs/meep109_skrellbuff.yml b/html/changelogs/meep109_skrellbuff.yml
new file mode 100644
index 00000000000..0d1c2d948c5
--- /dev/null
+++ b/html/changelogs/meep109_skrellbuff.yml
@@ -0,0 +1,58 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: meep109
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - balance: "Makes skrell martial art dislocating move guaranteed dislocate, instead of a chance-based dislocate"