Merge pull request Huz2e#168 from Huz2e:balls_torture

Balls
Artemchik542 · Jul 14, 2024 · bdc1e20 · bdc1e20
2 parents a8177f8 + f300d60
commit bdc1e20
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm b/massmeta/code/modules/spells/spell_types/touch/testicular_torsion.dm
@@ -5,7 +5,7 @@
 	causing them to feel immense pain, may also break their legs."
 	button_icon = 'massmeta/icons/mob/actions/actions_spells.dmi'
 	button_icon_state = "torsion"
-	sound =  "massmeta/sounds/smites/testicular_torsion.ogg"
+	sound =  'massmeta/features/smites/sound/testicular_torsion.ogg'
 
 	school = SCHOOL_SANGUINE
 	invocation_type = INVOCATION_SHOUT
@@ -26,11 +26,14 @@
 
 /datum/action/cooldown/spell/touch/testicular_torsion/cast_on_hand_hit(obj/item/melee/touch_attack/hand, mob/living/victim, mob/living/carbon/caster)
 	if(!ishuman(victim))
-		return
+		to_chat(caster, span_warning("Must be a human!"))
+		return FALSE
 	var/mob/living/carbon/human/human_victim = victim
-	human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_L_LEG, wound_bonus = rand(45, 75), forced = TRUE)
-	human_victim.apply_damage(rand(40, 55), BRUTE, BODY_ZONE_R_LEG, wound_bonus = rand(45, 75), forced = TRUE)
-	var/list/phrase = world.file2list("massmeta/strings/balls_phrases.txt")
+	human_victim.apply_damage(rand(20, 30), BRUTE, BODY_ZONE_L_LEG, wound_bonus = CANT_WOUND)
+	human_victim.apply_damage(rand(20, 30), BRUTE, BODY_ZONE_R_LEG, wound_bonus = CANT_WOUND)
+	human_victim.cause_wound_of_type_and_severity(WOUND_BLUNT, human_victim.get_bodypart(BODY_ZONE_L_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_MODERATE)
+	human_victim.cause_wound_of_type_and_severity(WOUND_BLUNT, human_victim.get_bodypart(BODY_ZONE_R_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_MODERATE)
+	var/list/phrase = world.file2list("massmeta/features/smites/string/balls_phrases.txt")
 	human_victim.say(pick(phrase))
 	human_victim.emote("screech")
 	return TRUE

diff --git a/massmeta/features/smites/code/testicular_torsion.dm b/massmeta/features/smites/code/testicular_torsion.dm
@@ -12,12 +12,14 @@
 	if (carbon_target.gender == FEMALE)
 		to_chat(user, span_warning("Target has no balls!"), confidential = TRUE)
 		return
+	if (carbon_target.stat == DEAD)
+		to_chat(user, span_warning("Target must be alive."), confidential = TRUE)
+		return
 
-	carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_L_LEG, wound_bonus = rand(35,60), forced = TRUE)
-	carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_R_LEG, wound_bonus = rand(35,60), forced = TRUE)
-	carbon_target.emote("scream")
-	var/list/phrase = world.file2list("massmeta/features/smites/string/balls_phrases.txt")
-	carbon_target.say(pick(phrase))
+	carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_L_LEG, wound_bonus = CANT_WOUND, forced = TRUE)
+	carbon_target.apply_damage(rand(20, 40), BRUTE, BODY_ZONE_R_LEG, wound_bonus = CANT_WOUND, forced = TRUE)
+	carbon_target.cause_wound_of_type_and_severity(WOUND_BLUNT, carbon_target.get_bodypart(BODY_ZONE_L_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_SEVERE)
+	carbon_target.cause_wound_of_type_and_severity(WOUND_BLUNT, carbon_target.get_bodypart(BODY_ZONE_R_LEG), WOUND_SEVERITY_TRIVIAL, WOUND_SEVERITY_SEVERE)
 	carbon_target.Paralyze(15 SECONDS)
 
 	playsound(target, 'massmeta/features/smites/sound/testicular_torsion.ogg', 60)
@@ -26,3 +28,7 @@
 		span_userdanger("You can feel like your balls are being crushed!"),
 		span_danger("You can hear someone's balls bursting like balloons!")
 	)
+
+	carbon_target.emote("scream")
+	var/list/phrase = world.file2list("massmeta/features/smites/string/balls_phrases.txt")
+	carbon_target.say(pick(phrase))