From dc3a5b33cb1d705c6fa3c9936d0abf3c890cd6da Mon Sep 17 00:00:00 2001 From: necromanceranne Date: Sun, 23 Feb 2020 22:50:50 +1100 Subject: [PATCH] Some additional adjustments --- code/datums/martial/sleeping_carp.dm | 3 +-- code/game/objects/items/melee/misc.dm | 4 ++-- code/game/objects/items/stunbaton.dm | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 400eb37fbaa17..88d5833e062d9 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -135,8 +135,7 @@ to_chat(usr, "Gnashing Teeth: Harm Harm. Deal additional damage ever second punch, with a chance for even more damage!") to_chat(usr, "Crashing Wave Kick: Harm Disarm. Launch people brutally across rooms, and away from you.") to_chat(usr, "Keelhaul: Harm Grab. Kick opponents to the floor. Against prone targets, deal additional stamina damage and disarm them.") - - to_chat(usr, "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.") + to_chat(usr, "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.") /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 index c44c2402afd27..d39a9d6e681b4 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -240,7 +240,7 @@ to_chat(user, "You hit yourself over the head!") 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 index 9cc2bac1b19ef..7c74edcc12709 100644 --- 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)