cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Some additional adjustments

Browse Source
This commit is contained in:
necromanceranne
2020-02-23 22:50:50 +11:00
parent fd810e30f2
commit dc3a5b33cb
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/sleeping_carp.dm
+1 -2
View File
@@ -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"
code/game/objects/items/melee/misc.dm
+2 -2
View File
@@ -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)
code/game/objects/items/stunbaton.dm
+1 -1
View File
@@ -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)