cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +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/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)