Some additional adjustments

Mycah142 · Feb 23, 2020 · dc3a5b3 · dc3a5b3
1 parent fd810e3
commit dc3a5b3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm
@@ -135,8 +135,7 @@
 	to_chat(usr, "<span class='notice'>Gnashing Teeth</span>: Harm Harm. Deal additional damage ever second punch, with a chance for even more damage!")
 	to_chat(usr, "<span class='notice'>Crashing Wave Kick</span>: Harm Disarm. Launch people brutally across rooms, and away from you.")
 	to_chat(usr, "<span class='notice'>Keelhaul</span>: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.")
-
-	to_chat(usr, "<span class='notice'>In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and stamina damage, and quickly recover from stamina damage. However, you are not invincible, and sustained damage will take it's toll."</span>)
+	to_chat(usr, "<span class='notice'>In addition, your body has become incredibly resilient to most forms of attack. Weapons cannot readily pierce your hardened skin, and you are highly resistant to stuns and knockdowns, and quickly recover from stamina damage. However, you are not invincible, and sustained damage will take it's toll.</span>")
 
 /obj/item/twohanded/bostaff
 	name = "bo staff"

diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm
@@ -240,7 +240,7 @@
 		to_chat(user, "<span class ='userdanger'>You hit yourself over the head!</span>")
 
 		user.Paralyze(knockdown_time_carbon * force)
-		user.adjustStaminaLoss(stamina_damage)
+		user.apply_damage(stamina_damage, STAMINA, BODY_ZONE_HEAD)
 
 		additional_effects_carbon(user) // user is the target here
 		if(ishuman(user))
@@ -292,7 +292,7 @@
 
 			playsound(get_turf(src), on_stun_sound, 75, TRUE, -1)
 			target.Knockdown(knockdown_time_carbon)
-			target.adjustStaminaLoss(stamina_damage)
+			target.apply_damage(stamina_damage, STAMINA)
 			additional_effects_carbon(target, user)
 
 			log_combat(user, target, "stunned", src)

diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
@@ -223,7 +223,7 @@
 	L.Jitter(20)
 	L.confused = max(confusion_amt, L.confused)
 	L.stuttering = max(8, L.stuttering)
-	L.adjustStaminaLoss(stamina_loss_amt)
+	L.apply_damage(stamina_loss_amt, STAMINA)
 
 	SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK)
 	addtimer(CALLBACK(src, .proc/apply_stun_effect_end, L), apply_stun_delay)