diff --git a/code/datums/martial/boxing.dm b/code/datums/martial/boxing.dm index e36d10e1ef5..21c3be691fa 100644 --- a/code/datums/martial/boxing.dm +++ b/code/datums/martial/boxing.dm @@ -47,8 +47,8 @@ D.visible_message(span_danger("[A] knocks [D] out with a haymaker!"), \ span_userdanger("You're knocked unconscious by [A]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) to_chat(A, span_danger("You knock [D] out with a haymaker!")) - D.apply_effect(200,EFFECT_KNOCKDOWN,armor_block) - D.SetSleeping(100) + D.apply_effect(20 SECONDS,EFFECT_KNOCKDOWN,armor_block) + D.SetSleeping(10 SECONDS) log_combat(A, D, "knocked out (boxing) ") return TRUE diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 7ea1b89b91c..42eed265aff 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -91,7 +91,7 @@ to_chat(attacker, span_danger("You leg sweep [defender]!")) playsound(get_turf(attacker), 'sound/effects/hit_kick.ogg', 50, TRUE, -1) defender.apply_damage(5, BRUTE, BODY_ZONE_CHEST) - defender.Knockdown(60) + defender.Knockdown(6 SECONDS) log_combat(attacker, defender, "leg sweeped") return TRUE diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm index 2a9daf050a3..2809ef85ada 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -5,7 +5,7 @@ /datum/martial_art/mushpunch/harm_act(mob/living/A, mob/living/D) var/atk_verb to_chat(A, span_spider("You begin to wind up an attack...")) - if(!do_after(A, 25, target = D)) + if(!do_after(A, 2.5 SECONDS, target = D)) to_chat(A, span_spider("Your attack was interrupted!")) return TRUE //martial art code was a mistake A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) @@ -17,7 +17,7 @@ playsound(D, 'sound/effects/meteorimpact.ogg', 25, TRUE, -1) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time. - D.Paralyze(20) + D.Paralyze(2 SECONDS) if(atk_verb) log_combat(A, D, "[atk_verb] (Mushroom Punch)") return TRUE diff --git a/code/datums/martial/psychotic_brawl.dm b/code/datums/martial/psychotic_brawl.dm index e79e6095ffc..196e903fd71 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -21,7 +21,7 @@ atk_verb = "helped" if(2) A.emote("cry") - A.Stun(20) + A.Stun(2 SECONDS) atk_verb = "cried looking at" if(3) if(A.grab_state >= GRAB_AGGRESSIVE) @@ -53,8 +53,8 @@ var/mob/living/carbon/defender = D if(!istype(defender.head,/obj/item/clothing/head/helmet/) && !istype(defender.head,/obj/item/clothing/head/utility/hardhat)) defender.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) - A.Stun(rand(10,45)) - D.Stun(rand(5,30)) + A.Stun(rand(1 SECONDS, 4.5 SECONDS)) + D.Stun(rand(0.5 SECONDS, 3 SECONDS)) if(5,6) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("kick", "hit", "slam") @@ -65,7 +65,7 @@ playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, TRUE, -1) var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time. - D.Paralyze(60) + D.Paralyze(6 SECONDS) if(7,8) return FALSE //Resume default behaviour diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index ce08cd4f290..a8600ef82f1 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -75,7 +75,7 @@ if(D.body_position == STANDING_UP) D.apply_damage(10, A.get_attack_type(), BODY_ZONE_HEAD, wound_bonus = CANT_WOUND) D.apply_damage(40, STAMINA, BODY_ZONE_HEAD) - D.Knockdown(40) + D.Knockdown(4 SECONDS) D.visible_message(span_warning("[A] kicks [D] in the head, sending them face first into the floor!"), \ span_userdanger("You are kicked in the head by [A], sending you crashing to the floor!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), COMBAT_MESSAGE_RANGE, A) else @@ -204,7 +204,7 @@ add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) to_chat(user, span_warning("You club yourself over the head with [src].")) - user.Paralyze(60) + user.Paralyze(6 SECONDS) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD) @@ -235,14 +235,14 @@ if(prob(10)) H.visible_message(span_warning("[H] collapses!"), \ span_userdanger("Your legs give out!")) - H.Paralyze(80) + H.Paralyze(8 SECONDS) if(H.staminaloss && !H.IsSleeping()) var/total_health = (H.health - H.staminaloss) if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat) H.visible_message(span_warning("[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!"), \ span_userdanger("You're knocked unconscious by [user]!"), span_hear("You hear a sickening sound of flesh hitting flesh!"), null, user) to_chat(user, span_danger("You deliver a heavy hit to [H]'s head, knocking [H.p_them()] out cold!")) - H.SetSleeping(600) + H.SetSleeping(60 SECONDS) H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 15, 150) else return ..() diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index e572c6a484f..ae1f77c0977 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -136,7 +136,7 @@ If you make a derivative work from this code, you must include this notification D.forceMove(A.loc) D.setDir(get_dir(D, A)) - D.Stun(80) + D.Stun(8 SECONDS) D.visible_message(span_danger("[A] starts spinning around with [D]!"), \ span_userdanger("You're spun around by [A]!"), span_hear("You hear aggressive shuffling!"), null, A) to_chat(A, span_danger("You start spinning around with [D]!")) @@ -299,7 +299,7 @@ If you make a derivative work from this code, you must include this notification playsound(A.loc, SFX_SWING_HIT, 50, TRUE) if (!D.stat) D.emote("scream") - D.Paralyze(40) + D.Paralyze(4 SECONDS) switch(rand(1,3)) if (2) @@ -343,7 +343,7 @@ If you make a derivative work from this code, you must include this notification to_chat(A, span_danger("You headbutt [D]!")) D.adjustBruteLoss(rand(10,20)) playsound(A.loc, SFX_SWING_HIT, 50, TRUE) - D.Unconscious(20) + D.Unconscious(2 SECONDS) log_combat(A, D, "headbutted") /datum/martial_art/wrestling/proc/kick(mob/living/A, mob/living/D) @@ -361,7 +361,7 @@ If you make a derivative work from this code, you must include this notification var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) if (T && isturf(T)) - D.Paralyze(20) + D.Paralyze(2 SECONDS) D.throw_at(T, 3, 2) log_combat(A, D, "roundhouse-kicked") @@ -433,7 +433,7 @@ If you make a derivative work from this code, you must include this notification else D.adjustBruteLoss(rand(20,30)) - D.Paralyze(40) + D.Paralyze(4 SECONDS) A.pixel_y = A.base_pixel_y @@ -458,7 +458,7 @@ If you make a derivative work from this code, you must include this notification D.visible_message(span_danger("[A] gets [D] in a cinch!"), \ span_userdanger("You're put into a cinch by [A]!"), span_hear("You hear aggressive shuffling!"), COMBAT_MESSAGE_RANGE, A) to_chat(A, span_danger("You get [D] in a cinch!")) - D.Stun(rand(60,100)) + D.Stun(rand(6 SECONDS, 10 SECONDS)) log_combat(A, D, "cinched") return 1