diff --git a/code/datums/brain_damage/mild.dm b/code/datums/brain_damage/mild.dm index 235417d62c..1553254ea3 100644 --- a/code/datums/brain_damage/mild.dm +++ b/code/datums/brain_damage/mild.dm @@ -136,7 +136,7 @@ fall_chance += 2 if(prob(fall_chance) && !owner.lying && !owner.buckled) to_chat(owner, "Your leg gives out!") - owner.Knockdown(35) + owner.DefaultCombatKnockdown(35) else if(owner.get_active_held_item()) var/drop_chance = 1 diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index f0333072a8..863d55ccab 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -59,4 +59,4 @@ "You slide on [A]!") cooldown = world.time - H.Knockdown(60) + H.DefaultCombatKnockdown(60) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index bc185994f6..d606478a6a 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -100,7 +100,7 @@ AM.forceMove(T) if(isliving(AM)) var/mob/living/L = AM - L.Knockdown(100) + L.DefaultCombatKnockdown(100) L.adjustBruteLoss(30) falling_atoms -= AM diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index 08f3c1d643..c6b062509d 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -54,7 +54,7 @@ msg += " and knocks [target] [target_buckled? "off of [target.buckled]" : "down"]" if(target_buckled) target.buckled.unbuckle_mob(target) - target.Knockdown(knockdown_time) + target.DefaultCombatKnockdown(knockdown_time) if(length(msg)) user.visible_message("[msg]!") diff --git a/code/datums/components/riding.dm b/code/datums/components/riding.dm index c05b07a693..55166cdf4a 100644 --- a/code/datums/components/riding.dm +++ b/code/datums/components/riding.dm @@ -240,7 +240,7 @@ /datum/component/riding/human/force_dismount(mob/living/user) var/atom/movable/AM = parent AM.unbuckle_mob(user) - user.Knockdown(60) + user.DefaultCombatKnockdown(60) user.visible_message("[AM] pushes [user] off of [AM.p_them()]!") /datum/component/riding/cyborg @@ -298,7 +298,7 @@ M.Move(targetm) M.visible_message("[M] is thrown clear of [AM]!") M.throw_at(target, 14, 5, AM) - M.Knockdown(60) + M.DefaultCombatKnockdown(60) /datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, mob/living/riding_target_override) var/list/equipped diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index 1d5549d0fe..b74f71aaa5 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -22,7 +22,7 @@ return //undeads are unaffected by the spook-pocalypse. if(istype(H.dna.species, /datum/species/zombie)) H.adjustStaminaLoss(25) - H.Knockdown(15) //zombies can't resist the doot + H.DefaultCombatKnockdown(15) //zombies can't resist the doot C.Jitter(35) C.stuttering = 20 if((!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) @@ -36,7 +36,7 @@ /datum/component/spooky/proc/spectral_change(mob/living/carbon/human/H, mob/user) if((H.getStaminaLoss() > 95) && (!istype(H.dna.species, /datum/species/skeleton)) && (!istype(H.dna.species, /datum/species/golem)) && (!istype(H.dna.species, /datum/species/android)) && (!istype(H.dna.species, /datum/species/jelly))) - H.Knockdown(20) + H.DefaultCombatKnockdown(20) H.set_species(/datum/species/skeleton) H.visible_message("[H] has given up on life as a mortal.") var/T = get_turf(H) diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index bf97ec6516..93a40abd93 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -11,7 +11,7 @@ var/turf/loccheck = get_turf(A) if(is_reebe(loccheck.z)) user.visible_message("An unseen force knocks [user] to the ground!", "\"I think not!\"") - user.Knockdown(60) + user.DefaultCombatKnockdown(60) return if(istype(loccheck.loc, /area/fabric_of_reality)) to_chat(user, "You can't do that here!") @@ -25,7 +25,7 @@ for(var/mob/living/M in T) if(M.movement_type & FLYING) M.visible_message("The bluespace collapse crushes the air towards it, pulling [M] towards the ground...") - M.Knockdown(5, TRUE, TRUE) //Overrides stun absorbs. + M.DefaultCombatKnockdown(5, TRUE, TRUE) //Overrides stun absorbs. T.TerraformTurf(/turf/open/chasm/magic, /turf/open/chasm/magic) for (var/obj/structure/ladder/unbreakable/binary/ladder in GLOB.ladders) ladder.ActivateAlmonds() diff --git a/code/datums/diseases/heart_failure.dm b/code/datums/diseases/heart_failure.dm index 2389052a54..be97e44de3 100644 --- a/code/datums/diseases/heart_failure.dm +++ b/code/datums/diseases/heart_failure.dm @@ -44,7 +44,7 @@ if(prob(25)) affected_mob.vomit(95) H.emote("cough") - H.Knockdown(40) + H.DefaultCombatKnockdown(40) H.losebreath += 4 if(prob(3)) to_chat(H, "You feel very weak and dizzy...") diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 4ec16ac18c..4fb635176f 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -47,7 +47,7 @@ "[A] slams you into the ground!") playsound(get_turf(A), 'sound/weapons/slam.ogg', 50, 1, -1) D.apply_damage(10, BRUTE) - D.Knockdown(120) + D.DefaultCombatKnockdown(120) log_combat(A, D, "slammed (CQC)") return TRUE @@ -152,7 +152,7 @@ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(10, BRUTE) - D.Knockdown(60) + D.DefaultCombatKnockdown(60) log_combat(A, D, "sweeped (CQC)") return TRUE diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm index 4e8dacaef9..617980ea5c 100644 --- a/code/datums/martial/krav_maga.dm +++ b/code/datums/martial/krav_maga.dm @@ -102,7 +102,7 @@ "[A] leg sweeps you!") playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, 1, -1) D.apply_damage(5, BRUTE) - D.Knockdown(40, override_hardstun = 0.01, override_stamdmg = 25) + D.DefaultCombatKnockdown(40, override_hardstun = 0.01, override_stamdmg = 25) log_combat(A, D, "leg sweeped") return 1 diff --git a/code/datums/martial/mushpunch.dm b/code/datums/martial/mushpunch.dm index 1ef7734771..fe9f0d77d6 100644 --- a/code/datums/martial/mushpunch.dm +++ b/code/datums/martial/mushpunch.dm @@ -16,7 +16,7 @@ playsound(D, 'sound/effects/meteorimpact.ogg', 25, 1, -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.Knockdown(20) + D.DefaultCombatKnockdown(20) 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 45d73353f9..7766715a51 100644 --- a/code/datums/martial/psychotic_brawl.dm +++ b/code/datums/martial/psychotic_brawl.dm @@ -49,7 +49,7 @@ if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat)) D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) A.Stun(rand(10,45)) - D.Knockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency + D.DefaultCombatKnockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency if(5,6) A.do_attack_animation(D, ATTACK_EFFECT_PUNCH) atk_verb = pick("punches", "kicks", "hits", "slams into") @@ -59,7 +59,7 @@ playsound(get_turf(D), 'sound/effects/meteorimpact.ogg', 25, 1, -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.Knockdown(60) + D.DefaultCombatKnockdown(60) if(7,8) basic_hit(A,D) diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm index 9e00c90a92..9da7c80ed3 100644 --- a/code/datums/martial/rising_bass.dm +++ b/code/datums/martial/rising_bass.dm @@ -43,7 +43,7 @@ "[A] kicks you in the side, forcing you to step away!") playsound(get_turf(A), 'sound/weapons/thudswoosh.ogg', 50, 1, -1) D.apply_damage(5, BRUTE, BODY_ZONE_CHEST) - D.Knockdown(60) + D.DefaultCombatKnockdown(60) var/L = H for(var/obj/i in H.contents) if(!istype(i,/mob) && i.density == 1) @@ -68,7 +68,7 @@ D.apply_damage(10, BRUTE, BODY_ZONE_CHEST) D.apply_damage(30, BRUTE, BODY_ZONE_HEAD) D.Sleeping(60) - D.Knockdown(300) + D.DefaultCombatKnockdown(300) D.forceMove(L) log_combat(A, D, "shoulder flipped (Rising Bass)") return 1 @@ -83,7 +83,7 @@ var/atom/F = get_edge_target_turf(D, get_dir(A, get_step_away(D, A))) D.throw_at(F, 10, 1) D.apply_damage(10, BRUTE, BODY_ZONE_CHEST) - D.Knockdown(90) + D.DefaultCombatKnockdown(90) log_combat(A, D, "repulse punched (Rising Bass)") return 1 return basic_hit(A,D) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 85f8a4a101..1e084bb936 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -46,7 +46,7 @@ D.emote("scream") D.dropItemToGround(D.get_active_held_item()) D.apply_damage(5, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) - D.Knockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() + D.DefaultCombatKnockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() return TRUE return basic_hit(A,D) @@ -58,7 +58,7 @@ D.visible_message("[A] kicks [D] in the back!", \ "[A] kicks you in the back, making you stumble and fall!") step_to(D,get_step(D,D.dir),1) - D.Knockdown(80) + D.DefaultCombatKnockdown(80) playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) return TRUE else @@ -75,7 +75,7 @@ "[A] winds you with a knee in the stomach!") D.audible_message("[D] gags!") D.losebreath += 3 - D.Knockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() + D.DefaultCombatKnockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) return TRUE return basic_hit(A,D) @@ -89,7 +89,7 @@ D.apply_damage(20, BRUTE, BODY_ZONE_HEAD) D.drop_all_held_items() playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1) - D.Knockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() + D.DefaultCombatKnockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun() return TRUE return basic_hit(A,D) @@ -134,7 +134,7 @@ playsound(get_turf(D), 'sound/weapons/punch1.ogg', 25, 1, -1) if(prob(D.getBruteLoss()) && !D.lying) D.visible_message("[D] stumbles and falls!", "The blow sends you to the ground!") - D.Knockdown(80) + D.DefaultCombatKnockdown(80) log_combat(A, D, "[atk_verb] (Sleeping Carp)") return TRUE @@ -192,7 +192,7 @@ add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head with [src].") - user.Knockdown(60) + user.DefaultCombatKnockdown(60) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD) @@ -226,7 +226,7 @@ if(prob(10)) H.visible_message("[H] collapses!", \ "Your legs give out!") - H.Knockdown(80) + H.DefaultCombatKnockdown(80) if(H.staminaloss && !H.IsSleeping()) var/total_health = (H.health - H.staminaloss) if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat) diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index c967779d03..d70ea49108 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -303,7 +303,7 @@ playsound(A.loc, "swing_hit", 50, 1) if (!D.stat) D.emote("scream") - D.Knockdown(40) + D.DefaultCombatKnockdown(40) switch(rand(1,3)) if (2) @@ -361,7 +361,7 @@ var/turf/T = get_edge_target_turf(A, get_dir(A, get_step_away(D, A))) if (T && isturf(T)) - D.Knockdown(20) + D.DefaultCombatKnockdown(20) D.throw_at(T, 3, 2) log_combat(A, D, "roundhouse-kicked") @@ -400,7 +400,7 @@ if (falling == 1) A.visible_message("...and dives head-first into the ground, ouch!") A.adjustBruteLoss(rand(10,20)) - A.Knockdown(60) + A.DefaultCombatKnockdown(60) to_chat(A, "[D] is too far away!") return 0 @@ -429,7 +429,7 @@ else D.adjustBruteLoss(rand(20,30)) - D.Knockdown(40) + D.DefaultCombatKnockdown(40) A.pixel_y = 0 diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 5dab98d5ca..ee6d9e2759 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -97,7 +97,7 @@ if(owner.stun_absorption[i]["end_time"] > world.time && owner.stun_absorption[i]["priority"] > vanguard["priority"]) otheractiveabsorptions = TRUE if(!GLOB.ratvar_awakens && stuns_blocked && !otheractiveabsorptions) - owner.Knockdown(stuns_blocked) + owner.DefaultCombatKnockdown(stuns_blocked) message_to_owner = "The weight of the Vanguard's protection crashes down upon you!" if(stuns_blocked >= 300) message_to_owner += "\nYou faint from the exertion!" diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index f5f012e7f9..bd78288092 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -179,7 +179,7 @@ if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(chargecost = 0) && number_legs) if(force_damage || owner.m_intent != MOVE_INTENT_WALK) if(GLOB.ratvar_awakens) - owner.Knockdown(20) + owner.DefaultCombatKnockdown(20) if(iscultist(owner)) owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_L_LEG) owner.apply_damage(cultist_damage_on_toggle * 0.5, BURN, BODY_ZONE_R_LEG) @@ -526,7 +526,7 @@ var/old_oxyloss /datum/status_effect/kindle/tick() - owner.Knockdown(15, TRUE, FALSE, 15) + owner.DefaultCombatKnockdown(15, TRUE, FALSE, 15) if(iscarbon(owner)) var/mob/living/carbon/C = owner C.silent = max(2, C.silent) diff --git a/code/game/gamemodes/gangs/gang_pen.dm b/code/game/gamemodes/gangs/gang_pen.dm index 0851f3b596..b7bd6cca5e 100644 --- a/code/game/gamemodes/gangs/gang_pen.dm +++ b/code/game/gamemodes/gangs/gang_pen.dm @@ -54,6 +54,6 @@ return var/mob/living/carbon/human/H = gangster_mind.current // we are sure the dude's human cause it's checked in attack() H.silent = max(H.silent, 5) - H.Knockdown(100) + H.DefaultCombatKnockdown(100) gangster_mind.add_antag_datum(/datum/antagonist/gang, gang) return TRUE \ No newline at end of file diff --git a/code/game/machinery/computer/arcade/orion_trail.dm b/code/game/machinery/computer/arcade/orion_trail.dm index c8c7bc1319..2304312953 100644 --- a/code/game/machinery/computer/arcade/orion_trail.dm +++ b/code/game/machinery/computer/arcade/orion_trail.dm @@ -217,7 +217,7 @@ M.vomit(10, distance = 5) if(ORION_TRAIL_FLUX) if(prob(75)) - M.Knockdown(60) + M.DefaultCombatKnockdown(60) say("A sudden gust of powerful wind slams [M] into the floor!") M.take_bodypart_damage(25) playsound(loc, 'sound/weapons/genhit.ogg', 100, 1) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 03c1bb3bc8..fec69574c9 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -769,7 +769,7 @@ if(!istype(H.head, /obj/item/clothing/head/helmet)) H.visible_message("[user] headbutts the airlock.", \ "You headbutt the airlock!") - H.Knockdown(100) + H.DefaultCombatKnockdown(100) H.apply_damage(10, BRUTE, BODY_ZONE_HEAD) else visible_message("[user] headbutts the airlock. Good thing [user.p_theyre()] wearing a helmet.") @@ -1033,7 +1033,7 @@ if(!I.use_tool(src, user, 150, volume=50)) to_chat(user, "You slip and [charge] detonates!") charge.ex_act(EXPLODE_DEVASTATE) - user.Knockdown(60) + user.DefaultCombatKnockdown(60) return user.visible_message("[user] removes [charge] from [src].", \ "You gently pry out [charge] from [src] and unhook its wires.") diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 50ae7dab18..530a287134 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -508,7 +508,7 @@ throwtarget = get_edge_target_turf(src, get_dir(src, get_step_away(L, src))) SEND_SOUND(L, sound(pick('sound/hallucinations/turn_around1.ogg','sound/hallucinations/turn_around2.ogg'),0,1,50)) flash_color(L, flash_color="#960000", flash_time=20) - L.Knockdown(40) + L.DefaultCombatKnockdown(40) L.throw_at(throwtarget, 5, 1) return 0 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index ee8742e84f..cf846d2b5b 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -319,10 +319,10 @@ else if(ishuman(L)) //For humans L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) L.emote("scream") - L.Knockdown(100) + L.DefaultCombatKnockdown(100) else if(ismonkey(L)) //For monkeys L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) else //for simple_animals & borgs L.adjustBruteLoss(DOOR_CRUSH_DAMAGE) var/turf/location = get_turf(src) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index def530a14d..99b412e18b 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -115,7 +115,7 @@ continue if(L.flash_act(affect_silicon = 1)) - L.Knockdown(strength) + L.DefaultCombatKnockdown(strength) flashed = TRUE if(flashed) diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 9f8f3ef742..70563b730a 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -177,7 +177,7 @@ M.SetSleeping(0) M.stuttering += 20 M.adjustEarDamage(0, 30) - M.Knockdown(60) + M.DefaultCombatKnockdown(60) if(prob(30)) M.Stun(200) M.Unconscious(80) diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm index fbe25c5d1b..8c3ffa3cfc 100644 --- a/code/game/objects/effects/anomalies.dm +++ b/code/game/objects/effects/anomalies.dm @@ -113,7 +113,7 @@ /obj/effect/anomaly/grav/proc/gravShock(mob/living/A) if(boing && isliving(A) && !A.stat) - A.Knockdown(40) + A.DefaultCombatKnockdown(40) var/atom/target = get_edge_target_turf(A, get_dir(src, get_step_away(A, src))) A.throw_at(target, 5, 1) boing = 0 diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 18c1ff5890..4f305b3102 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -112,7 +112,7 @@ for(var/mob/living/L in viewers(1, location)) if(prob(50 * amount)) to_chat(L, "The explosion knocks you down.") - L.Knockdown(rand(20,100)) + L.DefaultCombatKnockdown(rand(20,100)) return else dyn_explosion(location, amount, flashing_factor) \ No newline at end of file diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm index 08f698e018..f17fce64d8 100644 --- a/code/game/objects/effects/mines.dm +++ b/code/game/objects/effects/mines.dm @@ -48,7 +48,7 @@ /obj/effect/mine/stun/mineEffect(mob/living/victim) if(isliving(victim)) - victim.Knockdown(stun_time) + victim.DefaultCombatKnockdown(stun_time) /obj/effect/mine/kickmine name = "kick mine" diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a410827347..1a73c87440 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -544,7 +544,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE) to_chat(M, "You drop what you're holding and clutch at your eyes!") M.adjust_blurriness(10) M.Unconscious(20) - M.Knockdown(40) + M.DefaultCombatKnockdown(40) if (prob(eyes.damage - 10 + 1)) M.become_blind(EYE_DAMAGE) to_chat(M, "You go blind!") diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 884f5c4400..eeaea5dc70 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -853,7 +853,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(prob(5))//small chance for the vape to break and deal damage if it's emagged playsound(get_turf(src), 'sound/effects/pop_expl.ogg', 50, 0) M.apply_damage(20, BURN, BODY_ZONE_HEAD) - M.Knockdown(300, 1, 0) + M.DefaultCombatKnockdown(300, 1, 0) var/datum/effect_system/spark_spread/sp = new /datum/effect_system/spark_spread sp.set_up(5, 1, src) sp.start() diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 41ab418cf2..0b66560189 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -695,7 +695,7 @@ C.blind_eyes(1) if(C.get_eye_protection() <= 0) // no eye protection? ARGH IT BURNS. C.confused = max(C.confused, 3) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) if(ishuman(C) && actually_paints) var/mob/living/carbon/human/H = C H.lip_style = "spray_face" diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 07d58c1754..ec1a50804f 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -473,7 +473,7 @@ M.visible_message("[user] zaps [M] with [src]!", \ "[user] zaps [M] with [src]!") M.adjustStaminaLoss(50) - M.Knockdown(100) + M.DefaultCombatKnockdown(100) M.updatehealth() //forces health update before next life tick playsound(src, 'sound/machines/defib_zap.ogg', 50, 1, -1) M.emote("gasp") @@ -530,7 +530,7 @@ H.set_heartattack(TRUE) H.apply_damage(50, BURN, BODY_ZONE_CHEST) log_combat(user, H, "overloaded the heart of", defib) - H.Knockdown(100) + H.DefaultCombatKnockdown(100) H.Jitter(100) if(req_defib) defib.deductcharge(revivecost) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 1654ecde41..5a343ced30 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -108,7 +108,7 @@ //chance to actually hit the eyes depends on internal component if(prob(effectchance * diode.rating)) S.flash_act(affect_silicon = 1) - S.Knockdown(rand(100,200)) + S.DefaultCombatKnockdown(rand(100,200)) to_chat(S, "Your sensors were overloaded by a laser!") outmsg = "You overload [S] by shining [src] at [S.p_their()] sensors." else diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm index b74b0fa3d4..465cc28acb 100644 --- a/code/game/objects/items/devices/radio/electropack.dm +++ b/code/game/objects/items/devices/radio/electropack.dm @@ -113,7 +113,7 @@ s.set_up(3, 1, L) s.start() - L.Knockdown(100) + L.DefaultCombatKnockdown(100) if(master) master.receive_signal() diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index fc768cd38e..a1f7854a4a 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -44,7 +44,7 @@ effective or pretty fucking useless. for(var/mob/living/carbon/human/M in urange(10, user, 1)) if(prob(50)) - M.Knockdown(rand(200,400)) + M.DefaultCombatKnockdown(rand(200,400)) to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.") else diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 70cd503ef4..004dc1d5e5 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -294,7 +294,7 @@ /obj/item/book/granter/spell/knock/recoil(mob/living/user) ..() to_chat(user,"You're knocked down!") - user.Knockdown(40) + user.DefaultCombatKnockdown(40) /obj/item/book/granter/spell/barnyard spell = /obj/effect/proc_holder/spell/targeted/barnyardcurse diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 724cfc8f9d..10f85a87e8 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -31,7 +31,7 @@ M.show_message("BANG", MSG_AUDIBLE) var/distance = get_dist(get_turf(M), source) if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. - M.Knockdown(200) + M.DefaultCombatKnockdown(200) M.soundbang_act(1, 200, 10, 15) else M.soundbang_act(1, max(200/max(1,distance), 60), rand(0, 5)) @@ -41,4 +41,4 @@ return var/distance = get_dist(get_turf(M), source) if(M.flash_act(affect_silicon = 1)) - M.Knockdown(max(200/max(1,distance), 60)) + M.DefaultCombatKnockdown(max(200/max(1,distance), 60)) diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm index 246dd77684..6b8dea8e79 100644 --- a/code/game/objects/items/handcuffs.dm +++ b/code/game/objects/items/handcuffs.dm @@ -351,7 +351,7 @@ C.update_inv_legcuffed() SSblackbox.record_feedback("tally", "handcuffs", 1, type) to_chat(C, "\The [src] ensnares you!") - C.Knockdown(knockdown) + C.DefaultCombatKnockdown(knockdown) /obj/item/restraints/legcuffs/bola/tactical//traitor variant name = "reinforced bola" diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm index da572d4d61..c961134244 100644 --- a/code/game/objects/items/his_grace.dm +++ b/code/game/objects/items/his_grace.dm @@ -92,7 +92,7 @@ master.emote("scream") master.remove_status_effect(STATUS_EFFECT_HISGRACE) REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) - master.Knockdown(60) + master.DefaultCombatKnockdown(60) master.adjustBruteLoss(master.maxHealth) playsound(master, 'sound/effects/splat.ogg', 100, 0) else diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 7a83893f8b..b6a218520f 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -673,7 +673,7 @@ add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head with [src].") - user.Knockdown(60) + user.DefaultCombatKnockdown(60) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD) diff --git a/code/game/objects/items/implants/implant_explosive.dm b/code/game/objects/items/implants/implant_explosive.dm index b93c9419a3..e376e37cb5 100644 --- a/code/game/objects/items/implants/implant_explosive.dm +++ b/code/game/objects/items/implants/implant_explosive.dm @@ -78,7 +78,7 @@ return if(message && imp_in.stat == CONSCIOUS) imp_in.visible_message("[imp_in] doubles over in pain!") - imp_in.Knockdown(140) + imp_in.DefaultCombatKnockdown(140) /obj/item/implant/explosive/proc/boom_goes_the_weasel() explosion(get_turf(imp_in ? imp_in : src), heavy, medium, weak, weak, flame_range = weak) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index 4242fb6c4b..978b6f95eb 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -199,7 +199,7 @@ add_fingerprint(user) if((HAS_TRAIT(user, TRAIT_CLUMSY)) && prob(50)) to_chat(user, "You club yourself over the head.") - user.Knockdown(60 * force) + user.DefaultCombatKnockdown(60 * force) if(ishuman(user)) var/mob/living/carbon/human/H = user H.apply_damage(2*force, BRUTE, BODY_ZONE_HEAD) @@ -224,7 +224,7 @@ if(check_martial_counter(H, user)) return playsound(get_turf(src), 'sound/effects/woodhit.ogg', 75, 1, -1) - target.Knockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg) + target.DefaultCombatKnockdown(softstun_ds, TRUE, FALSE, hardstun_ds, stam_dmg) log_combat(user, target, "stunned", src) src.add_fingerprint(user) target.visible_message("[user] has knocked down [target] with [src]!", \ diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index e63b4d7a3a..630ca1bcbd 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -168,7 +168,7 @@ if(pressureSetting >= 3 && iscarbon(user)) var/mob/living/carbon/C = user C.visible_message("[C] is thrown down by the force of the cannon!", "[src] slams into your shoulder, knocking you down!") - C.Knockdown(60) + C.DefaultCombatKnockdown(60) /obj/item/pneumatic_cannon/proc/fire_items(turf/target, mob/user) if(fire_mode == PCANNON_FIREALL) diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index c09f5b1b65..4d006e3806 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -20,7 +20,7 @@ return user.do_attack_animation(M) - M.Knockdown(100) + M.DefaultCombatKnockdown(100) M.apply_effect(EFFECT_STUTTER, 5) M.visible_message("[user] has prodded [M] with [src]!", \ @@ -330,7 +330,7 @@ C.stuttering += 10 C.Jitter(10) if(2) - C.Knockdown(40) + C.DefaultCombatKnockdown(40) C.confused += 10 C.stuttering += 15 C.Jitter(25) diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index eafa79798e..a5f438ea65 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -336,7 +336,7 @@ if(ishuman(M) || ismonkey(M)) if(prob(10)) - M.Knockdown(40) + M.DefaultCombatKnockdown(40) update_icon() /obj/item/storage/bag/tray/update_icon() diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 6972587263..2882252e5c 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -188,7 +188,7 @@ stunpwr *= round(stuncharge/hitcost, 0.1) - L.Knockdown(stunpwr) + L.DefaultCombatKnockdown(stunpwr) L.adjustStaminaLoss(stunpwr*0.1)//CIT CHANGE - makes stunbatons deal extra staminaloss. Todo: make this also deal pain when pain gets implemented. L.apply_effect(EFFECT_STUTTER, stunforce) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) @@ -212,7 +212,7 @@ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ "You accidentally hit yourself with [src]!") SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) - user.Knockdown(stunforce*3) + user.DefaultCombatKnockdown(stunforce*3) playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) deductcharge(hitcost) diff --git a/code/game/objects/items/teleprod.dm b/code/game/objects/items/teleprod.dm index f427bf6c4c..8bf989e7a5 100644 --- a/code/game/objects/items/teleprod.dm +++ b/code/game/objects/items/teleprod.dm @@ -16,7 +16,7 @@ user.visible_message("[user] accidentally hits [user.p_them()]self with [src]!", \ "You accidentally hit yourself with [src]!") SEND_SIGNAL(user, COMSIG_LIVING_MINOR_SHOCK) - user.Knockdown(stunforce*3) + user.DefaultCombatKnockdown(stunforce*3) playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) if(do_teleport(user, get_turf(user), 50, channel = TELEPORT_CHANNEL_BLUESPACE)) deductcharge(hitcost) diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm index cf050f62d1..b6cfc15137 100644 --- a/code/game/objects/structures.dm +++ b/code/game/objects/structures.dm @@ -33,7 +33,7 @@ if(structureclimber && structureclimber != user) user.changeNext_move(CLICK_CD_MELEE) user.do_attack_animation(src) - structureclimber.Knockdown(40) + structureclimber.DefaultCombatKnockdown(40) structureclimber.visible_message("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].") /obj/structure/ui_act(action, params) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index e61a17b4ec..a339d964ca 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -332,7 +332,7 @@ if(iscarbon(target)) var/mob/living/carbon/C = target if(C.health < C.maxHealth*0.5) - C.Knockdown(20) + C.DefaultCombatKnockdown(20) smash(user) /obj/item/chair/stool diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 38944c0384..fbf39887f7 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -431,7 +431,7 @@ "You hear a loud metal bang.") var/mob/living/L = O if(!issilicon(L)) - L.Knockdown(40) + L.DefaultCombatKnockdown(40) O.forceMove(T) close() else diff --git a/code/game/objects/structures/petrified_statue.dm b/code/game/objects/structures/petrified_statue.dm index 65ffb7e2e5..a8a5a577c2 100644 --- a/code/game/objects/structures/petrified_statue.dm +++ b/code/game/objects/structures/petrified_statue.dm @@ -49,7 +49,7 @@ if(S.mind) if(petrified_mob) S.mind.transfer_to(petrified_mob) - petrified_mob.Knockdown(100) + petrified_mob.DefaultCombatKnockdown(100) to_chat(petrified_mob, "You slowly come back to your senses. You are in control of yourself again!") qdel(S) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 99f8875aef..273e846ad0 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -128,7 +128,7 @@ pushed_mob.pass_flags &= ~PASSTABLE if(pushed_mob.loc != loc) //Something prevented the tabling return - pushed_mob.Knockdown(40) + pushed_mob.DefaultCombatKnockdown(40) pushed_mob.visible_message("[user] slams [pushed_mob] onto [src]!", \ "[user] slams you onto [src]!") log_combat(user, pushed_mob, "tabled", null, "onto [src]") @@ -139,7 +139,7 @@ /obj/structure/table/shove_act(mob/living/target, mob/living/user) if(!target.resting) - target.Knockdown(SHOVE_KNOCKDOWN_TABLE) + target.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_TABLE) user.visible_message("[user.name] shoves [target.name] onto \the [src]!", "You shove [target.name] onto \the [src]!", null, COMBAT_MESSAGE_RANGE) target.forceMove(src.loc) @@ -249,7 +249,7 @@ debris -= AM if(istype(AM, /obj/item/shard)) AM.throw_impact(L) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) qdel(src) /obj/structure/table/glass/deconstruct(disassembled = TRUE, wrench_disassembly = 0) diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm index c386726f34..f821041894 100644 --- a/code/game/objects/structures/transit_tubes/station.dm +++ b/code/game/objects/structures/transit_tubes/station.dm @@ -74,7 +74,7 @@ pod.visible_message("[user] starts putting [GM] into the [pod]!") if(do_after(user, 15, target = src)) if(open_status == STATION_TUBE_OPEN && GM && user.grab_state >= GRAB_AGGRESSIVE && user.pulling == GM && !GM.buckled && !GM.has_buckled_mobs()) - GM.Knockdown(100) + GM.DefaultCombatKnockdown(100) src.Bumped(GM) break else diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm index 9c1859df08..d2282baea8 100644 --- a/code/game/objects/structures/traps.dm +++ b/code/game/objects/structures/traps.dm @@ -83,7 +83,7 @@ /obj/structure/trap/stun/trap_effect(mob/living/L) L.electrocute_act(30, src, safety=1) // electrocute act does a message. - L.Knockdown(100) + L.DefaultCombatKnockdown(100) /obj/structure/trap/fire name = "flame trap" @@ -92,7 +92,7 @@ /obj/structure/trap/fire/trap_effect(mob/living/L) to_chat(L, "Spontaneous combustion!") - L.Knockdown(20) + L.DefaultCombatKnockdown(20) /obj/structure/trap/fire/flare() ..() @@ -106,7 +106,7 @@ /obj/structure/trap/chill/trap_effect(mob/living/L) to_chat(L, "You're frozen solid!") - L.Knockdown(20) + L.DefaultCombatKnockdown(20) L.adjust_bodytemperature(-300) L.apply_status_effect(/datum/status_effect/freon) @@ -119,7 +119,7 @@ /obj/structure/trap/damage/trap_effect(mob/living/L) to_chat(L, "The ground quakes beneath your feet!") - L.Knockdown(100) + L.DefaultCombatKnockdown(100) L.adjustBruteLoss(35) /obj/structure/trap/damage/flare() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index e2e0f703f7..bdf621f54c 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -529,7 +529,7 @@ if(B.cell.charge > 0 && B.status == 1) flick("baton_active", src) var/stunforce = B.stunforce - user.Knockdown(stunforce) + user.DefaultCombatKnockdown(stunforce) user.stuttering = stunforce/20 B.deductcharge(B.hitcost) user.visible_message("[user] shocks [user.p_them()]self while attempting to wash the active [B.name]!", \ diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 577c45a7f0..fb3087a1a8 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -273,7 +273,7 @@ var/olddir = C.dir if(!(lube & SLIDE_ICE)) - C.Knockdown(knockdown_amount) + C.DefaultCombatKnockdown(knockdown_amount) C.stop_pulling() else C.Stun(20) diff --git a/code/modules/admin/verbs/bluespacearty.dm b/code/modules/admin/verbs/bluespacearty.dm index 97248b572b..2910d6dd85 100644 --- a/code/modules/admin/verbs/bluespacearty.dm +++ b/code/modules/admin/verbs/bluespacearty.dm @@ -21,6 +21,6 @@ target.gib(1, 1) else target.adjustBruteLoss(min(99,(target.health - 1))) - target.Knockdown(400) + target.DefaultCombatKnockdown(400) target.stuttering = 20 diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index fce45810d1..f558132b82 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -507,7 +507,7 @@ L.lastattackerckey = user.ckey L.adjustStaminaLoss(35) //because previously it took 5-6 hits to actually "incapacitate" someone for the purposes of the sleep inducement - L.Knockdown(140) + L.DefaultCombatKnockdown(140) L.apply_effect(EFFECT_STUTTER, 7) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) diff --git a/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm index 49aada3611..8f710a4344 100644 --- a/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm +++ b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm @@ -72,7 +72,7 @@ if(rand(5 + powerlevel) >= 5) target.visible_message("[user] lands a vicious punch, sending [target] away!", \ "[user] has landed a horrifying punch on you, sending you flying!!", null, COMBAT_MESSAGE_RANGE) - target.Knockdown(min(5, rand(10, 10 * powerlevel)) ) + target.DefaultCombatKnockdown(min(5, rand(10, 10 * powerlevel)) ) // Chance of KO if(rand(6 + powerlevel) >= 6 && target.stat <= UNCONSCIOUS) target.Unconscious(40) @@ -147,7 +147,7 @@ // Knock Down (if Living) if (isliving(M)) var/mob/living/L = M - L.Knockdown(pull_power * 10 + 20) + L.DefaultCombatKnockdown(pull_power * 10 + 20) // Knock Back (before Knockdown, which probably cancels pull) var/send_dir = get_dir(owner, M) var/turf/T = get_ranged_target_turf(M, send_dir, pull_power) diff --git a/code/modules/antagonists/bloodsucker/powers/bs_feed.dm b/code/modules/antagonists/bloodsucker/powers/bs_feed.dm index 7c4cf46e3c..03ac85cc0c 100644 --- a/code/modules/antagonists/bloodsucker/powers/bs_feed.dm +++ b/code/modules/antagonists/bloodsucker/powers/bs_feed.dm @@ -306,7 +306,7 @@ // Bloodsuckers not affected by "the Kiss" of another vampire if (!target.mind || !target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) target.Unconscious(50,0) - target.Knockdown(40 + 5 * level_current,1) + target.DefaultCombatKnockdown(40 + 5 * level_current,1) // NOTE: THis is based on level of power! if (ishuman(target)) target.adjustStaminaLoss(5, forced = TRUE)// Base Stamina Damage diff --git a/code/modules/antagonists/bloodsucker/powers/bs_haste.dm b/code/modules/antagonists/bloodsucker/powers/bs_haste.dm index ee1dd3007c..154a41dc44 100644 --- a/code/modules/antagonists/bloodsucker/powers/bs_haste.dm +++ b/code/modules/antagonists/bloodsucker/powers/bs_haste.dm @@ -70,7 +70,7 @@ if (newtarget && newtarget != target && !(newtarget in foundtargets))//!newtarget.IsKnockdown()) if (rand(0, 5) < level_current) playsound(get_turf(newtarget), "sound/weapons/punch[rand(1,4)].ogg", 15, 1, -1) - newtarget.Knockdown(10 + level_current * 5) + newtarget.DefaultCombatKnockdown(10 + level_current * 5) if(newtarget.IsStun()) newtarget.spin(10,1) if (rand(0,4)) diff --git a/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm index 2c1b8d6321..f9c9d3b590 100644 --- a/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm +++ b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm @@ -70,7 +70,7 @@ if(target.Adjacent(owner)) // LEVEL 2: If behind target, mute or unconscious! if(do_knockdown) // && level_current >= 1) - target.Knockdown(15 + 10 * level_current,1) + target.DefaultCombatKnockdown(15 + 10 * level_current,1) target.adjustStaminaLoss(40 + 10 * level_current) // Cancel Walk (we were close enough to contact them) walk(owner, 0) diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index 1e06fb39de..2a134748d4 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -30,7 +30,7 @@ H.confused += 3 for(var/mob/living/silicon/S in range(2,user)) to_chat(S, "Your sensors are disabled by a shower of blood!") - S.Knockdown(60) + S.DefaultCombatKnockdown(60) var/turf = get_turf(user) user.gib() . = TRUE diff --git a/code/modules/antagonists/changeling/powers/shriek.dm b/code/modules/antagonists/changeling/powers/shriek.dm index 65e58ae65b..3de220dbcb 100644 --- a/code/modules/antagonists/changeling/powers/shriek.dm +++ b/code/modules/antagonists/changeling/powers/shriek.dm @@ -24,7 +24,7 @@ if(issilicon(M)) SEND_SOUND(M, sound('sound/weapons/flash.ogg')) - M.Knockdown(rand(100,200)) + M.DefaultCombatKnockdown(rand(100,200)) for(var/obj/machinery/light/L in range(4, user)) L.on = 1 diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm index 1f25e06324..a98700683e 100644 --- a/code/modules/antagonists/changeling/powers/strained_muscles.dm +++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm @@ -26,7 +26,7 @@ changeling.chem_recharge_slowdown -= 0.5 if(stacks >= 20) to_chat(user, "We collapse in exhaustion.") - user.Knockdown(60) + user.DefaultCombatKnockdown(60) user.emote("gasp") INVOKE_ASYNC(src, .proc/muscle_loop, user) @@ -40,7 +40,7 @@ if(user.stat != CONSCIOUS || user.staminaloss >= 90) active = !active to_chat(user, "Our muscles relax without the energy to strengthen them.") - user.Knockdown(40) + user.DefaultCombatKnockdown(40) user.remove_movespeed_modifier(MOVESPEED_ID_CHANGELING_MUSCLES) changeling.chem_recharge_slowdown -= 0.5 break diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index a27f911163..01e93b95ae 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -80,7 +80,7 @@ if(iscultist(L)) //No longer stuns cultists, instead sets them on fire and burns them to_chat(L, "\"Watch your step, wretch.\"") L.adjustFireLoss(10) - L.Knockdown(20, FALSE) + L.DefaultCombatKnockdown(20, FALSE) L.adjust_fire_stacks(5) //Burn! L.IgniteMob() else @@ -155,7 +155,7 @@ if(brutedamage || burndamage) L.adjustBruteLoss(-(brutedamage * 0.25)) L.adjustFireLoss(-(burndamage * 0.25)) - L.Knockdown(50) //Completely defenseless for five seconds - mainly to give them time to read over the information they've just been presented with + L.DefaultCombatKnockdown(50) //Completely defenseless for five seconds - mainly to give them time to read over the information they've just been presented with if(iscarbon(L)) var/mob/living/carbon/C = L C.silent += 5 diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 1f616b7dbc..0be1817653 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -196,7 +196,7 @@ if(!iscultist(L)) L.visible_message("[L]'s eyes blaze with brilliant light!", \ "Your vision suddenly screams with white-hot light!") - L.Knockdown(15, TRUE, FALSE, 15) + L.DefaultCombatKnockdown(15, TRUE, FALSE, 15) L.apply_status_effect(STATUS_EFFECT_KINDLE) L.flash_act(1, 1) if(issilicon(target)) diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index 7534f7c043..3c7004880b 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -57,15 +57,15 @@ else if(!..()) if(!L.anti_magic_check()) if(issilicon(L)) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) else if(iscultist(L)) L.confused += CLAMP(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage to_chat(L, "[src] crashes into you with burning force, sending you reeling!") L.adjust_fire_stacks(2) - L.Knockdown(1) + L.DefaultCombatKnockdown(1) L.IgniteMob() else - L.Knockdown(40) + L.DefaultCombatKnockdown(40) GLOB.clockwork_vitality += L.adjustFireLoss(bonus_burn * 3) //normally a total of 40 damage, 70 with ratvar break_spear(T) else diff --git a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm index 644d9eedd5..6a53097922 100644 --- a/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm +++ b/code/modules/antagonists/clockcult/clock_items/judicial_visor.dm @@ -176,7 +176,7 @@ var/datum/status_effect/belligerent/B = C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) if(!QDELETED(B)) B.duration = world.time + 30 - C.Knockdown(5) //knocks down for half a second if affected + C.DefaultCombatKnockdown(5) //knocks down for half a second if affected sleep(!GLOB.ratvar_approaches ? 16 : 10) name = "judicial blast" layer = ABOVE_ALL_MOB_LAYER @@ -196,7 +196,7 @@ L.visible_message("Strange energy flows into [L]'s [I.name]!", \ "Your [I.name] shields you from [src]!") continue - L.Knockdown(15) //knocks down briefly when exploding + L.DefaultCombatKnockdown(15) //knocks down briefly when exploding if(!iscultist(L)) L.visible_message("[L] is struck by a judicial explosion!", \ "[!issilicon(L) ? "An unseen force slams you into the ground!" : "ERROR: Motor servos disabled by external source!"]") diff --git a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm index 1158b02a4c..98b3c32b0f 100644 --- a/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm +++ b/code/modules/antagonists/clockcult/clock_structures/taunting_trail.dm @@ -57,5 +57,5 @@ L.confused = min(L.confused + 15, 50) L.dizziness = min(L.dizziness + 15, 50) if(L.confused >= 25) - L.Knockdown(FLOOR(L.confused * 0.8, 1)) + L.DefaultCombatKnockdown(FLOOR(L.confused * 0.8, 1)) take_damage(max_integrity) diff --git a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm index 2f0db73bfc..a4b19f2d40 100644 --- a/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm +++ b/code/modules/antagonists/clockcult/clock_structures/traps/brass_skewer.dm @@ -22,7 +22,7 @@ if(buckled_mobs && LAZYLEN(buckled_mobs)) var/mob/living/L = buckled_mobs[1] if(iscarbon(L)) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) L.visible_message("[L] is maimed as the skewer shatters while still in [L.p_their()] body!") L.adjustBruteLoss(15) unbuckle_mob(L) @@ -117,6 +117,6 @@ return skewee.visible_message("[skewee] comes free of [src] with a squelching pop!", \ "You come free of [src]!") - skewee.Knockdown(30) + skewee.DefaultCombatKnockdown(30) playsound(skewee, 'sound/misc/desceration-03.ogg', 50, TRUE) unbuckle_mob(skewee) diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index 794010d9c0..88b5eb521a 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -439,7 +439,7 @@ "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!") else if(!iscultist(L)) - L.Knockdown(160) + L.DefaultCombatKnockdown(160) L.adjustStaminaLoss(140) //Ensures hard stamcrit L.flash_act(1,1) if(issilicon(target)) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index b4ddb9dbff..91a7343a72 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -49,7 +49,7 @@ /obj/item/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) if(!iscultist(user)) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) user.dropItemToGround(src, TRUE) user.visible_message("A powerful force shoves [user] away from [target]!", \ "\"You shouldn't play with sharp things. You'll poke someone's eye out.\"") @@ -148,7 +148,7 @@ user.emote("scream") user.apply_damage(30, BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)) user.dropItemToGround(src, TRUE) - user.Knockdown(50) + user.DefaultCombatKnockdown(50) return force = initial(force) jaunt.Grant(user, src) @@ -405,7 +405,7 @@ to_chat(user, "An overwhelming sense of nausea overpowers you!") user.dropItemToGround(src, TRUE) user.Dizzy(30) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) else to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") to_chat(user, "The armor squeezes at your body!") @@ -457,7 +457,7 @@ to_chat(user, "An overwhelming sense of nausea overpowers you!") user.dropItemToGround(src, TRUE) user.Dizzy(30) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) else to_chat(user, "\"Trying to use things you don't own is bad, you know.\"") to_chat(user, "The robes squeeze at your body!") @@ -478,7 +478,7 @@ to_chat(user, "\"You want to be blind, do you?\"") user.dropItemToGround(src, TRUE) user.Dizzy(30) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) user.blind_eyes(30) /obj/item/reagent_containers/glass/beaker/unholywater @@ -499,7 +499,7 @@ /obj/item/shuttle_curse/attack_self(mob/living/user) if(!iscultist(user)) user.dropItemToGround(src, TRUE) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) to_chat(user, "A powerful force shoves you away from [src]!") return if(curselimit > 1) @@ -705,10 +705,10 @@ if(is_servant_of_ratvar(L)) to_chat(L, "\"Kneel for me, scum\"") L.confused += CLAMP(10 - L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before - L.Knockdown(15) + L.DefaultCombatKnockdown(15) L.adjustBruteLoss(10) else - L.Knockdown(50) + L.DefaultCombatKnockdown(50) break_spear(T) else ..() @@ -843,7 +843,7 @@ INVOKE_ASYNC(src, .proc/pewpew, user, params) var/obj/structure/emergency_shield/invoker/N = new(user.loc) if(do_after(user, 90, target = user)) - user.Knockdown(40) + user.DefaultCombatKnockdown(40) to_chat(user, "You have exhausted the power of this spell!") firing = FALSE if(N) @@ -908,7 +908,7 @@ else var/mob/living/L = target if(L.density) - L.Knockdown(20) + L.DefaultCombatKnockdown(20) L.adjustBruteLoss(45) playsound(L, 'sound/hallucinations/wail.ogg', 50, 1) L.emote("scream") @@ -944,7 +944,7 @@ T.visible_message("The sheer force from [P] shatters the mirror shield!") new /obj/effect/temp_visual/cult/sparks(T) playsound(T, 'sound/effects/glassbr3.ogg', 100) - owner.Knockdown(25) + owner.DefaultCombatKnockdown(25) qdel(src) return FALSE if(P.is_reflectable) @@ -1001,9 +1001,9 @@ else if(!..()) if(!L.anti_magic_check()) if(is_servant_of_ratvar(L)) - L.Knockdown(60) + L.DefaultCombatKnockdown(60) else - L.Knockdown(30) + L.DefaultCombatKnockdown(30) if(D.thrower) for(var/mob/living/Next in orange(2, T)) if(!Next.density || iscultist(Next)) diff --git a/code/modules/antagonists/cult/runes.dm b/code/modules/antagonists/cult/runes.dm index da002e568c..8253efb313 100644 --- a/code/modules/antagonists/cult/runes.dm +++ b/code/modules/antagonists/cult/runes.dm @@ -219,7 +219,7 @@ structure_check() searches for nearby cultist structures required for the invoca L.visible_message("[L]'s eyes glow a defiant yellow!", \ "\"Stop resisting. You will be mi-\"\n\ \"Give up and you will feel pain unlike anything you've ever felt!\"") - L.Knockdown(80) + L.DefaultCombatKnockdown(80) else if(is_convertable) do_convert(L, invokers) else @@ -908,7 +908,7 @@ structure_check() searches for nearby cultist structures required for the invoca if(affecting.key) affecting.visible_message("[affecting] slowly relaxes, the glow around [affecting.p_them()] dimming.", \ "You are re-united with your physical form. [src] releases its hold over you.") - affecting.Knockdown(40) + affecting.DefaultCombatKnockdown(40) break if(affecting.health <= 10) to_chat(G, "Your body can no longer sustain the connection!") @@ -970,7 +970,7 @@ structure_check() searches for nearby cultist structures required for the invoca playsound(T, 'sound/magic/enter_blood.ogg', 100, 1) visible_message("A colossal shockwave of energy bursts from the rune, disintegrating it in the process!") for(var/mob/living/L in range(src, 3)) - L.Knockdown(30) + L.DefaultCombatKnockdown(30) empulse(T, 0.42*(intensity), 1) var/list/images = list() var/zmatch = T.z diff --git a/code/modules/antagonists/devil/devil_helpers.dm b/code/modules/antagonists/devil/devil_helpers.dm index 4d0a781570..d3445eac0f 100644 --- a/code/modules/antagonists/devil/devil_helpers.dm +++ b/code/modules/antagonists/devil/devil_helpers.dm @@ -32,7 +32,7 @@ if(BANE_HARVEST) if(istype(weapon, /obj/item/reagent_containers/food/snacks/grown/)) visible_message("The spirits of the harvest aid in the exorcism.", "The harvest spirits are harming you.") - Knockdown(40) + DefaultCombatKnockdown(40) qdel(weapon) return 2 return 1 \ No newline at end of file diff --git a/code/modules/antagonists/swarmer/swarmer.dm b/code/modules/antagonists/swarmer/swarmer.dm index ce455d9e67..fbd4aafd77 100644 --- a/code/modules/antagonists/swarmer/swarmer.dm +++ b/code/modules/antagonists/swarmer/swarmer.dm @@ -584,7 +584,7 @@ playsound(loc,'sound/effects/snap.ogg',50, 1, -1) L.electrocute_act(0, src, 1, 1, 1) if(iscyborg(L)) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) qdel(src) ..() diff --git a/code/modules/antagonists/wizard/equipment/artefact.dm b/code/modules/antagonists/wizard/equipment/artefact.dm index a0dbc4d9b1..676ef68ea9 100644 --- a/code/modules/antagonists/wizard/equipment/artefact.dm +++ b/code/modules/antagonists/wizard/equipment/artefact.dm @@ -261,7 +261,7 @@ GiveHint(target) else if(is_pointed(I)) to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") - target.Knockdown(40) + target.DefaultCombatKnockdown(40) GiveHint(target) else if(istype(I, /obj/item/bikehorn)) to_chat(target, "HONK") diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index 2ac3b34f60..b8efc28b1c 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -150,7 +150,7 @@ var/mob/living/silicon/robot/R = M log_combat(user, R, "flashed", src) update_icon(1) - R.Knockdown(rand(80,120)) + R.DefaultCombatKnockdown(rand(80,120)) var/diff = 5 * CONFUSION_STACK_MAX_MULTIPLIER - M.confused R.confused += min(5, diff) R.flash_act(affect_silicon = 1) @@ -204,7 +204,7 @@ . = ..() new /obj/effect/temp_visual/borgflash(get_turf(src)) if(. && !CONFIG_GET(flag/disable_borg_flash_knockdown) && iscarbon(M) && !M.resting && !M.get_eye_protection()) - M.Knockdown(80) + M.DefaultCombatKnockdown(80) /obj/item/assembly/flash/cyborg/attack_self(mob/user) ..() diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index 950c0dd109..3e81322fc6 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -48,7 +48,7 @@ if("feet") if(!H.shoes) affecting = H.get_bodypart(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)) - H.Knockdown(60) + H.DefaultCombatKnockdown(60) if(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND) if(!H.gloves) affecting = H.get_bodypart(type) diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm index 5a53e2776a..2a5960086b 100644 --- a/code/modules/clothing/spacesuits/chronosuit.dm +++ b/code/modules/clothing/spacesuits/chronosuit.dm @@ -220,7 +220,7 @@ if(user.wear_suit == src) if(hard_landing) user.electrocute_act(35, src, safety = 1) - user.Knockdown(200) + user.DefaultCombatKnockdown(200) if(!silent) to_chat(user, "\nroot@ChronosuitMK4# chronowalk4 --stop\n") if(camera) diff --git a/code/modules/clothing/spacesuits/flightsuit.dm b/code/modules/clothing/spacesuits/flightsuit.dm index 04aacfc3f5..2f9ded7848 100644 --- a/code/modules/clothing/spacesuits/flightsuit.dm +++ b/code/modules/clothing/spacesuits/flightsuit.dm @@ -481,7 +481,7 @@ adjust_momentum(0, 0, 10) wearer.visible_message("[wearer]'s flight suit crashes into the ground!") if(knockdown) - wearer.Knockdown(80) + wearer.DefaultCombatKnockdown(80) momentum_x = 0 momentum_y = 0 calculate_momentum_speed() diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index 0d2f68f580..972a0b02e6 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -242,7 +242,7 @@ return owner.visible_message("The reactive teleport system flings [H] clear of [attack_text] and slams [H.p_them()] into a fabricated table!") owner.visible_message("[H] GOES ON THE TABLE!!!") - owner.Knockdown(40) + owner.DefaultCombatKnockdown(40) var/list/turfs = new/list() for(var/turf/T in orange(tele_range, H)) if(T.density) diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index 79bd866fca..13a2bc0135 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -42,7 +42,7 @@ if(R.has_buckled_mobs()) for(var/mob/living/L in R.buckled_mobs) L.visible_message("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!") //I know it's bad. - L.Knockdown(10) + L.DefaultCombatKnockdown(10) R.unbuckle_mob(L) do_sparks(5, 0, L) ..() diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm index f5262742e2..b3005dbb0d 100644 --- a/code/modules/flufftext/Hallucination.dm +++ b/code/modules/flufftext/Hallucination.dm @@ -217,7 +217,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /obj/effect/hallucination/simple/xeno/throw_impact(A) update_icon("alienh_pounce") if(A == target && target.stat!=DEAD) - target.Knockdown(100) + target.DefaultCombatKnockdown(100) target.visible_message("[target] flails around wildly.","[name] pounces on you!") /datum/hallucination/xeno_attack @@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( shake_camera(target, 2, 1) if(bubblegum.Adjacent(target) && !charged) charged = TRUE - target.Knockdown(80) + target.DefaultCombatKnockdown(80) target.adjustStaminaLoss(40) step_away(target, bubblegum) shake_camera(target, 4, 3) @@ -1102,7 +1102,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( if(istype(target, /obj/effect/dummy/phased_mob)) return to_chat(target, "You fall into the chasm!") - target.Knockdown(40) + target.DefaultCombatKnockdown(40) addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, target, "It's surprisingly shallow."), 15) QDEL_IN(src, 30) @@ -1136,7 +1136,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( set waitfor = FALSE ..() target.set_screwyhud(SCREWYHUD_DEAD) - target.Knockdown(300) + target.DefaultCombatKnockdown(300) target.silent += 10 to_chat(target, "[target.real_name] has died at [get_area_name(target)].") if(prob(50)) @@ -1241,7 +1241,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( /datum/hallucination/shock/proc/shock_drop() target.jitteriness = max(target.jitteriness - 990, 10) //Still jittery, but vastly less - target.Knockdown(60) + target.DefaultCombatKnockdown(60) /datum/hallucination/husks @@ -1314,7 +1314,7 @@ GLOBAL_LIST_INIT(hallucination_list, list( "[G] grabs your wrist and violently wrenches it to the side!") C.emote("scream") C.dropItemToGround(C.get_active_held_item()) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) else to_chat(C,"[G] violently grabs you!") qdel(src) diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 271ff93b15..3b4a58c715 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -85,7 +85,7 @@ head_attack_message = " on the head" //Knockdown the target for the duration that we calculated and divide it by 5. if(armor_duration) - target.Knockdown(min(armor_duration, 200)) // Never knockdown more than a flash! + target.DefaultCombatKnockdown(min(armor_duration, 200)) // Never knockdown more than a flash! //Display an attack message. if(target != user) diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm index cf499c9d15..3d19297412 100644 --- a/code/modules/food_and_drinks/food/snacks_meat.dm +++ b/code/modules/food_and_drinks/food/snacks_meat.dm @@ -225,7 +225,7 @@ if(iscarbon(M)) M.visible_message("[src] bursts out of [M]!") M.emote("scream") - M.Knockdown(40) + M.DefaultCombatKnockdown(40) M.adjustBruteLoss(60) Expand() return ..() diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm index bc66d353e1..64e5f1e31d 100644 --- a/code/modules/food_and_drinks/food/snacks_pie.dm +++ b/code/modules/food_and_drinks/food/snacks_pie.dm @@ -49,7 +49,7 @@ else creamoverlay.icon_state = "creampie_human" if(stunning) - H.Knockdown(20) //splat! + H.DefaultCombatKnockdown(20) //splat! H.adjust_blurriness(1) H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!") playsound(H, "desceration", 50, TRUE) @@ -82,7 +82,7 @@ A.throw_at(T, 1, 1) M.visible_message("[src] bursts out of [M]!") M.emote("scream") - M.Knockdown(40) + M.DefaultCombatKnockdown(40) M.adjustBruteLoss(60) return ..() diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 1bc2e4bb89..eb0b60050e 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -150,6 +150,6 @@ God bless America. reagents.reaction(C, TOUCH) C.apply_damage(min(30, reagents.total_volume), BURN, BODY_ZONE_HEAD) reagents.remove_any((reagents.total_volume/2)) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) user.changeNext_move(CLICK_CD_MELEE) return ..() diff --git a/code/modules/holodeck/items.dm b/code/modules/holodeck/items.dm index 5c143f7a25..450a32e960 100644 --- a/code/modules/holodeck/items.dm +++ b/code/modules/holodeck/items.dm @@ -87,7 +87,7 @@ playsound(src, 'sound/items/dodgeball.ogg', 50, 1) M.apply_damage(10, STAMINA) if(prob(5)) - M.Knockdown(60) + M.DefaultCombatKnockdown(60) visible_message("[M] is knocked right off [M.p_their()] feet!") // @@ -117,7 +117,7 @@ to_chat(user, "You need a better grip to do that!") return L.forceMove(loc) - L.Knockdown(100) + L.DefaultCombatKnockdown(100) visible_message("[user] dunks [L] into \the [src]!") user.stop_pulling() else diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm index dbcce2830b..8115ce2313 100644 --- a/code/modules/hydroponics/grown/nettle.dm +++ b/code/modules/hydroponics/grown/nettle.dm @@ -98,7 +98,7 @@ /obj/item/reagent_containers/food/snacks/grown/nettle/death/pickup(mob/living/carbon/user) if(..()) if(prob(50)) - user.Knockdown(100) + user.DefaultCombatKnockdown(100) to_chat(user, "You are stunned by the Deathnettle as you try picking it up!") /obj/item/reagent_containers/food/snacks/grown/nettle/death/attack(mob/living/carbon/M, mob/user) @@ -111,5 +111,5 @@ M.adjust_blurriness(force/7) if(prob(20)) M.Unconscious(force / 0.3) - M.Knockdown(force / 0.75) + M.DefaultCombatKnockdown(force / 0.75) M.drop_all_held_items() diff --git a/code/modules/integrated_electronics/subtypes/weaponized.dm b/code/modules/integrated_electronics/subtypes/weaponized.dm index 350f05914d..02340970af 100644 --- a/code/modules/integrated_electronics/subtypes/weaponized.dm +++ b/code/modules/integrated_electronics/subtypes/weaponized.dm @@ -336,7 +336,7 @@ if(!L || !isliving(L)) return 0 - L.Knockdown(stunforce) + L.DefaultCombatKnockdown(stunforce) SEND_SIGNAL(L, COMSIG_LIVING_MINOR_SHOCK) message_admins("stunned someone with an assembly. Last touches: Assembly: [assembly.fingerprintslast] Circuit: [fingerprintslast]") diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 5e2e8bdd5a..c31008fa62 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -93,7 +93,7 @@ playsound(M,'sound/weapons/resonator_blast.ogg',50,1) if(iscarbon(M)) var/mob/living/carbon/L = M - L.Knockdown(60) + L.DefaultCombatKnockdown(60) if(ishuman(L)) shake_camera(L, 20, 1) addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20) diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm index f46f4f785c..f44e5b42c2 100644 --- a/code/modules/mining/fulton.dm +++ b/code/modules/mining/fulton.dm @@ -73,7 +73,7 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons) var/mutable_appearance/balloon3 if(isliving(A)) var/mob/living/M = A - M.Knockdown(320) // Keep them from moving during the duration of the extraction + M.DefaultCombatKnockdown(320) // Keep them from moving during the duration of the extraction M.buckled = 0 // Unbuckle them to prevent anchoring problems else A.anchored = TRUE diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index d1ed09665b..fe3a1696a4 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -65,16 +65,16 @@ var/mob/living/L = A if(!L.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK)) L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") - L.Knockdown(100) + L.DefaultCombatKnockdown(100) sleep(2)//Runtime prevention (infinite bump() calls on hulks) step_towards(src,L) else - Knockdown(40, 1, 1) + DefaultCombatKnockdown(40, 1, 1) toggle_leap(0) else if(A.density && !A.CanPass(src)) visible_message("[src] smashes into [A]!", "[src] smashes into [A]!") - Knockdown(40, 1, 1) + DefaultCombatKnockdown(40, 1, 1) if(leaping) leaping = 0 diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index e4e8f06cfa..3c7da07ef7 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -138,7 +138,7 @@ else if(ishuman(owner)) //Humans, being more fragile, are more overwhelmed by the mental backlash. to_chat(owner, "You feel a splitting pain in your head, and are struck with a wave of nausea. You cannot hear the hivemind anymore!") owner.emote("scream") - owner.Knockdown(100) + owner.DefaultCombatKnockdown(100) owner.jitteriness += 30 owner.confused += 30 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 102bc6fc3d..5f48c6dc3d 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -105,7 +105,7 @@ hurt = FALSE if(hit_atom.density && isturf(hit_atom)) if(hurt) - Knockdown(20) + DefaultCombatKnockdown(20) take_bodypart_damage(10) if(iscarbon(hit_atom) && hit_atom != src) var/mob/living/carbon/victim = hit_atom @@ -114,8 +114,8 @@ if(hurt) victim.take_bodypart_damage(10) take_bodypart_damage(10) - victim.Knockdown(20) - Knockdown(20) + victim.DefaultCombatKnockdown(20) + DefaultCombatKnockdown(20) visible_message("[src] crashes into [victim], knocking them both over!",\ "You violently crash into [victim]!") playsound(src,'sound/weapons/punch1.ogg',50,1) @@ -304,7 +304,7 @@ /mob/living/carbon/resist_fire() fire_stacks -= 5 - Knockdown(60, TRUE, TRUE) + DefaultCombatKnockdown(60, TRUE, TRUE) spin(32,2) visible_message("[src] rolls on the floor, trying to put [p_them()]self out!", \ "You stop, drop, and roll!") @@ -490,7 +490,7 @@ visible_message("[src] dry heaves!", \ "You try to throw up, but there's nothing in your stomach!") if(stun) - Knockdown(200) + DefaultCombatKnockdown(200) return 1 if(is_mouth_covered()) //make this add a blood/vomit overlay later it'll be hilarious @@ -576,7 +576,7 @@ if(total_health <= crit_threshold && !stat) if(!IsKnockdown()) to_chat(src, "You're too exhausted to keep going...") - Knockdown(100) + DefaultCombatKnockdown(100) update_health_hud() /mob/living/carbon/update_sight() diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index ba40ae8e5f..3c1a529d3f 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -188,7 +188,7 @@ do_sparks(5, TRUE, src) var/power = M.powerlevel + rand(0,3) - Knockdown(power*20) + DefaultCombatKnockdown(power*20) if(stuttering < power) stuttering = power if (prob(stunprob) && M.powerlevel >= 8) @@ -262,7 +262,7 @@ spawn(20) jitteriness = max(jitteriness - 990, 10) //Still jittery, but vastly less if((!tesla_shock || (tesla_shock && siemens_coeff > 0.5)) && stun) - Knockdown(60) + DefaultCombatKnockdown(60) if(override) return override else @@ -415,7 +415,7 @@ var/effect_amount = intensity - ear_safety if(effect_amount > 0) if(stun_pwr) - Knockdown(stun_pwr*effect_amount) + DefaultCombatKnockdown(stun_pwr*effect_amount) if(istype(ears) && (deafen_pwr || damage_pwr)) var/ear_damage = damage_pwr * effect_amount diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 0007233975..b6461f3c71 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -842,7 +842,7 @@ visible_message("[src] dry heaves!", \ "You try to throw up, but there's nothing in your stomach!") if(stun) - Knockdown(200) + DefaultCombatKnockdown(200) return 1 ..() diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 2b1d6afc4f..fe1a6d7d1c 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -176,7 +176,7 @@ "[M] disarmed [src]!") else if(!M.client || prob(5)) // only natural monkeys get to stun reliably, (they only do it occasionaly) playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) - Knockdown(100) + DefaultCombatKnockdown(100) log_combat(M, src, "tackled") visible_message("[M] has tackled down [src]!", \ "[M] has tackled down [src]!") @@ -225,9 +225,9 @@ else playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if(!lying) //CITADEL EDIT - Knockdown(100, TRUE, FALSE, 30, 25) + DefaultCombatKnockdown(100, TRUE, FALSE, 30, 25) else - Knockdown(100) + DefaultCombatKnockdown(100) log_combat(M, src, "tackled") visible_message("[M] has tackled down [src]!", \ "[M] has tackled down [src]!") @@ -294,10 +294,10 @@ switch(M.damtype) if("brute") if(M.force > 35) // durand and other heavy mechas - Knockdown(50) + DefaultCombatKnockdown(50) src.throw_at(throw_target, rand(1,5), 7) else if(M.force >= 20 && !IsKnockdown()) // lightweight mechas like gygax - Knockdown(30) + DefaultCombatKnockdown(30) src.throw_at(throw_target, rand(1,3), 7) update |= temp.receive_damage(dmg, 0) playsound(src, 'sound/weapons/punch4.ogg', 50, 1) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 2e069297b3..2324fe4b99 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -1372,7 +1372,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB)) if(!H.IsKnockdown()) H.emote("collapse") - H.Knockdown(RAD_MOB_KNOCKDOWN_AMOUNT) + H.DefaultCombatKnockdown(RAD_MOB_KNOCKDOWN_AMOUNT) to_chat(H, "You feel weak.") if(radiation > RAD_MOB_VOMIT && prob(RAD_MOB_VOMIT_PROB)) @@ -1896,13 +1896,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) var/directional_blocked = !target.Adjacent(target_shove_turf) var/targetatrest = target.resting if((directional_blocked || !(target_collateral_human || target_shove_turf.shove_act(target, user))) && !targetatrest) - target.Knockdown(SHOVE_KNOCKDOWN_SOLID) + target.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_SOLID) user.visible_message("[user.name] shoves [target.name], knocking them down!", "You shove [target.name], knocking them down!", null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "shoved", "knocking them down") else if(target_collateral_human && !targetatrest) - target.Knockdown(SHOVE_KNOCKDOWN_HUMAN) - target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL) + target.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_HUMAN) + target_collateral_human.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_COLLATERAL) user.visible_message("[user.name] shoves [target.name] into [target_collateral_human.name]!", "You shove [target.name] into [target_collateral_human.name]!", null, COMBAT_MESSAGE_RANGE) log_combat(user, target, "shoved", "into [target_collateral_human.name]") diff --git a/code/modules/mob/living/carbon/human/species_types/podpeople.dm b/code/modules/mob/living/carbon/human/species_types/podpeople.dm index f0dd48c6c1..735eaab379 100644 --- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm @@ -57,7 +57,7 @@ if(/obj/item/projectile/energy/floramut) if(prob(15)) H.rad_act(rand(30,80)) - H.Knockdown(100) + H.DefaultCombatKnockdown(100) H.visible_message("[H] writhes in pain as [H.p_their()] vacuoles boil.", "You writhe in pain as your vacuoles boil!", "You hear the crunching of leaves.") if(prob(80)) H.randmutb() diff --git a/code/modules/mob/living/carbon/human/status_procs.dm b/code/modules/mob/living/carbon/human/status_procs.dm index 49121c9409..37bafdab67 100644 --- a/code/modules/mob/living/carbon/human/status_procs.dm +++ b/code/modules/mob/living/carbon/human/status_procs.dm @@ -3,7 +3,7 @@ amount = dna.species.spec_stun(src,amount) return ..() -/mob/living/carbon/human/Knockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) +/mob/living/carbon/human/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) amount = dna.species.spec_stun(src,amount) return ..() diff --git a/code/modules/mob/living/carbon/monkey/life.dm b/code/modules/mob/living/carbon/monkey/life.dm index 906e138b0a..385ae6cfd4 100644 --- a/code/modules/mob/living/carbon/monkey/life.dm +++ b/code/modules/mob/living/carbon/monkey/life.dm @@ -33,7 +33,7 @@ if(radiation > RAD_MOB_KNOCKDOWN && prob(RAD_MOB_KNOCKDOWN_PROB)) if(!IsKnockdown()) emote("collapse") - Knockdown(RAD_MOB_KNOCKDOWN_AMOUNT) + DefaultCombatKnockdown(RAD_MOB_KNOCKDOWN_AMOUNT) to_chat(src, "You feel weak.") if(radiation > RAD_MOB_MUTATE) if(prob(1)) diff --git a/code/modules/mob/living/carbon/monkey/monkey_defense.dm b/code/modules/mob/living/carbon/monkey/monkey_defense.dm index 32e3d21ee2..3fd0001a12 100644 --- a/code/modules/mob/living/carbon/monkey/monkey_defense.dm +++ b/code/modules/mob/living/carbon/monkey/monkey_defense.dm @@ -82,7 +82,7 @@ if(!IsUnconscious()) M.do_attack_animation(src, ATTACK_EFFECT_DISARM) if (prob(25)) - Knockdown(40) + DefaultCombatKnockdown(40) playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1) log_combat(M, src, "pushed") visible_message("[M] has pushed down [src]!", \ @@ -126,7 +126,7 @@ var/obj/item/I = null playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1) if(prob(95)) - Knockdown(20) + DefaultCombatKnockdown(20) visible_message("[M] has tackled down [name]!", \ "[M] has tackled down [name]!", null, COMBAT_MESSAGE_RANGE) else diff --git a/code/modules/mob/living/damage_procs.dm b/code/modules/mob/living/damage_procs.dm index 57b65a53f7..dc53337e2d 100644 --- a/code/modules/mob/living/damage_procs.dm +++ b/code/modules/mob/living/damage_procs.dm @@ -88,7 +88,7 @@ if(EFFECT_STUN) Stun(effect * hit_percent) if(EFFECT_KNOCKDOWN) - Knockdown(effect * hit_percent, override_stamdmg = knockdown_stammax ? CLAMP(knockdown_stamoverride, 0, knockdown_stammax-getStaminaLoss()) : knockdown_stamoverride) + DefaultCombatKnockdown(effect * hit_percent, override_stamdmg = knockdown_stammax ? CLAMP(knockdown_stamoverride, 0, knockdown_stammax-getStaminaLoss()) : knockdown_stamoverride) if(EFFECT_UNCONSCIOUS) Unconscious(effect * hit_percent) if(EFFECT_IRRADIATE) diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 041b367ebf..782b8331b0 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -258,7 +258,7 @@ if(H.get_num_arms() == 0) if(H.get_num_legs() != 0) message_param = "tries to point at %t with a leg, falling down in the process!" - H.Knockdown(20) + H.DefaultCombatKnockdown(20) else message_param = "bumps [user.p_their()] head on the ground trying to motion towards %t." H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5) @@ -362,7 +362,7 @@ . = ..() if(. && isliving(user)) var/mob/living/L = user - L.Knockdown(200) + L.DefaultCombatKnockdown(200) /datum/emote/living/sway key = "sway" diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index cbe57c2284..12bc5f925f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -53,7 +53,7 @@ /mob/living/proc/ZImpactDamage(turf/T, levels) visible_message("[src] crashes into [T] with a sickening noise!") adjustBruteLoss((levels * 5) ** 1.5) - Knockdown(levels * 50) + DefaultCombatKnockdown(levels * 50) /mob/living/proc/OpenCraftingMenu() @@ -1025,7 +1025,7 @@ "[C] trips over [src] and falls!", \ "[C] topples over [src]!", \ "[C] leaps out of [src]'s way!")]") - C.Knockdown(40) + C.DefaultCombatKnockdown(40) /mob/living/ConveyorMove() if((movement_type & FLYING) && !stat) diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index c727e100d8..14d3f5b256 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -7,7 +7,7 @@ if(. & EMP_PROTECT_SELF) return take_holo_damage(50/severity) - Knockdown(400/severity) + DefaultCombatKnockdown(400/severity) silent = max((3 MINUTES)/severity, silent) if(holoform) fold_in(force = TRUE) @@ -22,10 +22,10 @@ qdel(src) if(2) fold_in(force = 1) - Knockdown(400) + DefaultCombatKnockdown(400) if(3) fold_in(force = 1) - Knockdown(200) + DefaultCombatKnockdown(200) //ATTACK HAND IGNORING PARENT RETURN VALUE /mob/living/silicon/pai/attack_hand(mob/living/carbon/human/user) @@ -96,7 +96,7 @@ take_holo_damage(amount * 0.25) /mob/living/silicon/pai/adjustOrganLoss(slot, amount, maximum = 500) //I kept this in, unlike tg - Knockdown(amount * 0.2) + DefaultCombatKnockdown(amount * 0.2) /mob/living/silicon/pai/getBruteLoss() return emittermaxhealth - emitterhealth diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index ca8ad25713..1bb7ce2df3 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -32,7 +32,7 @@ var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) if(prob(damage)) for(var/mob/living/N in buckled_mobs) - N.Knockdown(20) + N.DefaultCombatKnockdown(20) unbuckle_mob(N) N.visible_message("[N] is knocked off of [src] by [M]!") switch(M.melee_damage_type) @@ -106,7 +106,7 @@ for(var/mob/living/M in buckled_mobs) if(prob(severity*50)) unbuckle_mob(M) - M.Knockdown(40) + M.DefaultCombatKnockdown(40) M.visible_message("[M] is thrown off of [src]!") flash_act(affect_silicon = 1) @@ -123,7 +123,7 @@ for(var/mob/living/M in buckled_mobs) M.visible_message("[M] is knocked off of [src]!") unbuckle_mob(M) - M.Knockdown(40) + M.DefaultCombatKnockdown(40) if(P.stun || P.knockdown) for(var/mob/living/M in buckled_mobs) unbuckle_mob(M) diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm index cbd985c358..bb94dbd0f1 100644 --- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm +++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm @@ -545,7 +545,7 @@ Auto Patrol[]"}, spawn(2) icon_state = "[lasercolor]ed209[on]" var/threat = 5 - C.Knockdown(100) + C.DefaultCombatKnockdown(100) C.stuttering = 5 if(ishuman(C)) var/mob/living/carbon/human/H = C diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 109c7b4636..07bfec986f 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -196,7 +196,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, C.stuttering = 20 C.adjustEarDamage(0, 5) //far less damage than the H.O.N.K. C.Jitter(50) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) var/mob/living/carbon/human/H = C if(client) //prevent spam from players.. spam_flag = TRUE @@ -215,7 +215,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, "[src] has honked you!") else C.stuttering = 20 - C.Knockdown(80) + C.DefaultCombatKnockdown(80) addtimer(CALLBACK(src, .proc/spam_flag_false), cooldowntime) @@ -358,7 +358,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, "[C] trips over [src] and falls!", \ "[C] topples over [src]!", \ "[C] leaps out of [src]'s way!")]") - C.Knockdown(10) + C.DefaultCombatKnockdown(10) playsound(loc, 'sound/misc/sadtrombone.ogg', 50, 1, -1) if(!client) speak("Honk!") diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index 426de81da0..8a67d5d6f7 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -635,7 +635,7 @@ if(!paicard) log_combat(src, L, "knocked down") visible_message("[src] knocks over [L]!") - L.Knockdown(160) + L.DefaultCombatKnockdown(160) return ..() // called from mob/living/carbon/human/Crossed() diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index ee770fc2ca..6cc74bd0f7 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -254,11 +254,11 @@ Auto Patrol: []"}, var/threat = 5 if(ishuman(C)) C.stuttering = 5 - C.Knockdown(100) + C.DefaultCombatKnockdown(100) var/mob/living/carbon/human/H = C threat = H.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) else - C.Knockdown(100) + C.DefaultCombatKnockdown(100) C.stuttering = 5 threat = C.assess_threat(judgement_criteria, weaponcheck=CALLBACK(src, .proc/check_for_weapons)) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index be900aa4ef..d0884d1300 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -353,7 +353,7 @@ if(!LAZYLEN(parts)) if(undismembermerable_limbs) //they have limbs we can't remove, and no parts we can, attack! return ..() - C.Knockdown(60) + C.DefaultCombatKnockdown(60) visible_message("[src] knocks [C] down!") to_chat(src, "\"Bring [C.p_them()] to me.\"") return FALSE diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm index 521f458e2f..06d83bf235 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm @@ -222,7 +222,7 @@ if(.) update_icons() -/mob/living/simple_animal/drone/cogscarab/Knockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) +/mob/living/simple_animal/drone/cogscarab/DefaultCombatKnockdown(amount, updating = TRUE, ignore_canknockdown = FALSE, override_hardstun, override_stamdmg) . = ..() if(.) update_icons() diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm index 2679c68b52..67401658b6 100644 --- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm +++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm @@ -160,7 +160,7 @@ M.visible_message("[M] tips over [src].", "You tip over [src].") to_chat(src, "You are tipped over by [M]!") - Knockdown(60,ignore_canknockdown = TRUE) + DefaultCombatKnockdown(60,ignore_canknockdown = TRUE) icon_state = icon_dead spawn(rand(20,50)) if(!stat && M) diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm index bc766f7409..947e8d1f56 100644 --- a/code/modules/mob/living/simple_animal/hostile/faithless.dm +++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm @@ -41,6 +41,6 @@ . = ..() if(. && prob(12) && iscarbon(target)) var/mob/living/carbon/C = target - C.Knockdown(60) + C.DefaultCombatKnockdown(60) C.visible_message("\The [src] knocks down \the [C]!", \ "\The [src] knocks you down!") diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 6866df01d5..b1542461da 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -71,7 +71,7 @@ var/atom/throw_target = get_edge_target_turf(L, dir) L.throw_at(throw_target, rand(1,2), 7, src) else - L.Knockdown(20) + L.DefaultCombatKnockdown(20) visible_message("[src] knocks [L] down!") /mob/living/simple_animal/hostile/gorilla/CanAttack(atom/the_target) diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index d1e8f1f49e..0cf21921a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -93,7 +93,7 @@ var/mob/living/L = AM if(!istype(L, /mob/living/simple_animal/hostile/jungle/leaper)) playsound(src,'sound/effects/snap.ogg',50, 1, -1) - L.Knockdown(50) + L.DefaultCombatKnockdown(50) if(iscarbon(L)) var/mob/living/carbon/C = L C.reagents.add_reagent("leaper_venom", 5) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index ca5323a978..a65a02a5ca 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -69,7 +69,7 @@ icon_state = initial(icon_state) if(prob(15) && iscarbon(target)) var/mob/living/carbon/C = target - C.Knockdown(40) + C.DefaultCombatKnockdown(40) C.visible_message("\The [src] knocks down \the [C]!", \ "\The [src] knocks you down!") @@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(protected_objects, list(/obj/structure/table, /obj/structure/ca . = ..() if(knockdown_people && . && prob(15) && iscarbon(target)) var/mob/living/carbon/C = target - C.Knockdown(40) + C.DefaultCombatKnockdown(40) C.visible_message("\The [src] knocks down \the [C]!", \ "\The [src] knocks you down!") diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index fc51b9afe4..4c3d66a937 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -56,7 +56,7 @@ if(iscarbon(target)) var/mob/living/carbon/C = target if(prob(15)) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) C.visible_message("\The [src] knocks down \the [C]!", \ "\The [src] knocks you down!") diff --git a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm index 29bc2cbff0..976f8df229 100644 --- a/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm +++ b/code/modules/mob/living/simple_animal/hostile/venus_human_trap.dm @@ -94,7 +94,7 @@ if(prob(grasp_pull_chance)) setDir(get_dir(src,L) )//staaaare step(L,get_dir(L,src)) //reel them in - L.Knockdown(60) //you can't get away now~ + L.DefaultCombatKnockdown(60) //you can't get away now~ if(grasping.len < max_grasps) grasping: diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index 6ed81b7aeb..d2bfb4c608 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -237,7 +237,7 @@ //Blanket /mob/living/proc/AllImmobility(amount, updating) Paralyze(amount, FALSE) - Knockdown(amount, FALSE) + DefaultCombatKnockdown(amount, FALSE) Stun(amount, FALSE) Immobilize(amount, FALSE) if(updating) diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm index 10fce3d74e..6553211c07 100644 --- a/code/modules/ninja/suit/ninjaDrainAct.dm +++ b/code/modules/ninja/suit/ninjaDrainAct.dm @@ -263,7 +263,7 @@ They *could* go in their appropriate files, but this is supposed to be modular visible_message("[H] electrocutes [src] with [H.p_their()] touch!", "[H] electrocutes you with [H.p_their()] touch!") electrocute_act(15, H) - Knockdown(G.stunforce) + DefaultCombatKnockdown(G.stunforce) adjustStaminaLoss(G.stunforce*0.1, affected_zone = (istype(H) ? H.zone_selected : BODY_ZONE_CHEST)) apply_effect(EFFECT_STUTTER, G.stunforce) SEND_SIGNAL(src, COMSIG_LIVING_MINOR_SHOCK) diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index f3f7e45378..d88d20ebe4 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -118,7 +118,7 @@ H.adjust_blurriness(6) if(eyes) eyes.applyOrganDamage(rand(6,8)) - H.Knockdown(40) + H.DefaultCombatKnockdown(40) H.emote("scream") /obj/item/paper/examine(mob/user) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index 3b0f7e7f6f..df268dffae 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -107,7 +107,7 @@ var/shock_damage = min(rand(30,40),rand(30,40)) if(iscarbon(user)) - user.Knockdown(300) + user.DefaultCombatKnockdown(300) user.electrocute_act(shock_damage, src, 1) else if(issilicon(user)) diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm index 31a5131804..3a74a59fe0 100644 --- a/code/modules/projectiles/guns/ballistic/revolver.dm +++ b/code/modules/projectiles/guns/ballistic/revolver.dm @@ -359,4 +359,4 @@ user.visible_message("[user] somehow manages to shoot [user.p_them()]self in the face!", "You somehow shoot yourself in the face! How the hell?!") user.emote("scream") user.drop_all_held_items() - user.Knockdown(80) + user.DefaultCombatKnockdown(80) diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index 791db320a2..2b894a9189 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -529,7 +529,7 @@ else used = 1 victim.take_overall_damage(30,30) - victim.Knockdown(60) + victim.DefaultCombatKnockdown(60) explosion(src, -1, -1, -1, -1, FALSE, FALSE, 5) /obj/item/projectile/magic/nuclear/Destroy() diff --git a/code/modules/projectiles/projectile/special/hallucination.dm b/code/modules/projectiles/projectile/special/hallucination.dm index 5814e7138e..af11638781 100644 --- a/code/modules/projectiles/projectile/special/hallucination.dm +++ b/code/modules/projectiles/projectile/special/hallucination.dm @@ -166,7 +166,7 @@ hal_impact_effect_wall = null /obj/item/projectile/hallucination/taser/hal_apply_effect() - hal_target.Knockdown(100) + hal_target.DefaultCombatKnockdown(100) hal_target.stuttering += 20 if(hal_target.dna && hal_target.dna.check_mutation(HULK)) hal_target.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ), forced = "hulk") @@ -199,7 +199,7 @@ hal_impact_effect_wall = null /obj/item/projectile/hallucination/ebow/hal_apply_effect() - hal_target.Knockdown(100) + hal_target.DefaultCombatKnockdown(100) hal_target.stuttering += 5 hal_target.adjustStaminaLoss(8) diff --git a/code/modules/projectiles/projectile/special/neurotoxin.dm b/code/modules/projectiles/projectile/special/neurotoxin.dm index 1d359585c0..2dba44817e 100644 --- a/code/modules/projectiles/projectile/special/neurotoxin.dm +++ b/code/modules/projectiles/projectile/special/neurotoxin.dm @@ -10,5 +10,5 @@ nodamage = TRUE else if(iscarbon(target)) var/mob/living/L = target - L.Knockdown(100, TRUE, FALSE, 30, 25) + L.DefaultCombatKnockdown(100, TRUE, FALSE, 30, 25) return ..() diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 64e693a326..2e6bc62673 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -335,7 +335,7 @@ victim.blind_eyes(2) victim.confused = max(M.confused, 3) victim.damageoverlaytemp = 60 - victim.Knockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 3, 15)) + victim.DefaultCombatKnockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 3, 15)) return else if ( eyes_covered ) // Eye cover is better than mouth cover victim.blur_eyes(3) @@ -348,7 +348,7 @@ victim.blind_eyes(3) victim.confused = max(M.confused, 6) victim.damageoverlaytemp = 75 - victim.Knockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 5, 25)) + victim.DefaultCombatKnockdown(80, override_hardstun = 0.1, override_stamdmg = min(reac_volume * 5, 25)) victim.update_damage_hud() /datum/reagent/consumable/condensedcapsaicin/on_mob_life(mob/living/carbon/M) diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index d8ff084227..52e4568b06 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -1466,7 +1466,7 @@ datum/reagent/medicine/styptic_powder/overdose_start(mob/living/M) if(prob(20)) to_chat(M, "You have a sudden fit!") M.emote("moan") - M.Knockdown(20, 1, 0) // you should be in a bad spot at this point unless epipen has been used + M.DefaultCombatKnockdown(20, 1, 0) // you should be in a bad spot at this point unless epipen has been used if(81) to_chat(M, "You feel too exhausted to continue!") // at this point you will eventually die unless you get charcoal M.adjustOxyLoss(0.1*REM, 0) diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index bd6eb4244c..550b9490fc 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -634,7 +634,7 @@ return to_chat(H, "You crumple in agony as your flesh wildly morphs into new forms!") H.visible_message("[H] falls to the ground and screams as [H.p_their()] skin bubbles and froths!") //'froths' sounds painful when used with SKIN. - H.Knockdown(60) + H.DefaultCombatKnockdown(60) addtimer(CALLBACK(src, .proc/mutate, H), 30) return diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index f97204b45e..cc72917bd0 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -553,7 +553,7 @@ var/picked_option = rand(1,3) switch(picked_option) if(1) - C.Knockdown(60, 0) + C.DefaultCombatKnockdown(60, 0) . = TRUE if(2) C.losebreath += 10 @@ -700,7 +700,7 @@ /datum/reagent/toxin/curare/on_mob_life(mob/living/carbon/M) if(current_cycle >= 11) - M.Knockdown(60, 0) + M.DefaultCombatKnockdown(60, 0) M.adjustOxyLoss(1*REM, 0) . = 1 ..() @@ -872,7 +872,7 @@ holder.remove_reagent(id, actual_metaboliztion_rate * M.metabolism_efficiency) M.adjustToxLoss(actual_toxpwr*REM, 0) if(prob(10)) - M.Knockdown(20, 0) + M.DefaultCombatKnockdown(20, 0) . = 1 ..() diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index ad1efc1da7..f42974f163 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -76,7 +76,7 @@ for(var/mob/living/carbon/C in get_hearers_in_view(round(created_volume/48,1),get_turf(holder.my_atom))) if(iscultist(C)) to_chat(C, "The divine explosion sears you!") - C.Knockdown(40) + C.DefaultCombatKnockdown(40) C.adjust_fire_stacks(5) C.IgniteMob() ..(holder, created_volume, T) @@ -252,7 +252,7 @@ for(var/mob/living/carbon/C in get_hearers_in_view(range, location)) if(C.flash_act()) if(get_dist(C, location) < 4) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) else C.Stun(100) holder.remove_reagent("flash_powder", created_volume*3) @@ -273,7 +273,7 @@ for(var/mob/living/carbon/C in get_hearers_in_view(range, location)) if(C.flash_act()) if(get_dist(C, location) < 4) - C.Knockdown(60) + C.DefaultCombatKnockdown(60) else C.Stun(100) diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index 7025a649e6..fa1126cecb 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -389,7 +389,7 @@ /obj/machinery/disposal/bin/shove_act(mob/living/target, mob/living/user) if(!can_stuff_mob_in(target, user, TRUE)) return FALSE - target.Knockdown(SHOVE_KNOCKDOWN_SOLID) + target.DefaultCombatKnockdown(SHOVE_KNOCKDOWN_SOLID) target.forceMove(src) user.visible_message("[user.name] shoves [target.name] into \the [src]!", "You shove [target.name] into \the [src]!", null, COMBAT_MESSAGE_RANGE) diff --git a/code/modules/research/nanites/nanite_programs/rogue.dm b/code/modules/research/nanites/nanite_programs/rogue.dm index 287aed36fe..cd9b30bee9 100644 --- a/code/modules/research/nanites/nanite_programs/rogue.dm +++ b/code/modules/research/nanites/nanite_programs/rogue.dm @@ -116,4 +116,4 @@ host_mob.drop_all_held_items() else if(prob(4)) to_chat(host_mob, "You can't feel your legs!") - host_mob.Knockdown(30) + host_mob.DefaultCombatKnockdown(30) diff --git a/code/modules/research/nanites/nanite_programs/suppression.dm b/code/modules/research/nanites/nanite_programs/suppression.dm index a6225fd337..2ad708b587 100644 --- a/code/modules/research/nanites/nanite_programs/suppression.dm +++ b/code/modules/research/nanites/nanite_programs/suppression.dm @@ -55,7 +55,7 @@ if(!..()) return playsound(host_mob, "sparks", 75, 1, -1) - host_mob.Knockdown(80) + host_mob.DefaultCombatKnockdown(80) /datum/nanite_program/pacifying name = "Pacification" diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 121ee2e07f..ccef46842e 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -318,7 +318,7 @@ All ShuttleMove procs go here var/knockdown = movement_force["KNOCKDOWN"] if(knockdown) - Knockdown(knockdown) + DefaultCombatKnockdown(knockdown) /mob/living/simple_animal/hostile/megafauna/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock) diff --git a/code/modules/shuttle/special.dm b/code/modules/shuttle/special.dm index 2d17a8e55a..f05adb9309 100644 --- a/code/modules/shuttle/special.dm +++ b/code/modules/shuttle/special.dm @@ -186,7 +186,7 @@ // No climbing on the bar please var/mob/living/M = AM var/throwtarget = get_edge_target_turf(src, boot_dir) - M.Knockdown(40) + M.DefaultCombatKnockdown(40) M.throw_at(throwtarget, 5, 1) to_chat(M, "No climbing on the bar please.") else diff --git a/code/modules/spells/spell_types/devil.dm b/code/modules/spells/spell_types/devil.dm index d97d466e4d..3952a347e0 100644 --- a/code/modules/spells/spell_types/devil.dm +++ b/code/modules/spells/spell_types/devil.dm @@ -198,7 +198,7 @@ if(H.anti_magic_check(FALSE, TRUE)) continue H.mind.add_antag_datum(/datum/antagonist/sintouched) - H.Knockdown(400) + H.DefaultCombatKnockdown(400) /obj/effect/proc_holder/spell/targeted/summon_dancefloor diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm index 8108b121ae..d7f5395e1b 100644 --- a/code/modules/spells/spell_types/godhand.dm +++ b/code/modules/spells/spell_types/godhand.dm @@ -123,9 +123,9 @@ M.SetSleeping(0) M.stuttering += 20*mul M.adjustEarDamage(0, 30*mul) - M.Knockdown(60*mul) + M.DefaultCombatKnockdown(60*mul) if(prob(40)) - M.Knockdown(200*mul) + M.DefaultCombatKnockdown(200*mul) else M.Jitter(500*mul) diff --git a/code/modules/spells/spell_types/inflict_handler.dm b/code/modules/spells/spell_types/inflict_handler.dm index 3ccc039285..2f78bb83fa 100644 --- a/code/modules/spells/spell_types/inflict_handler.dm +++ b/code/modules/spells/spell_types/inflict_handler.dm @@ -46,7 +46,7 @@ if(!amt_knockdown && amt_dam_stam) target.adjustStaminaLoss(amt_dam_stam) else - target.Knockdown(amt_knockdown, override_hardstun = amt_hardstun, override_stamdmg = amt_dam_stam) + target.DefaultCombatKnockdown(amt_knockdown, override_hardstun = amt_hardstun, override_stamdmg = amt_dam_stam) target.Unconscious(amt_unconscious) target.Stun(amt_stun) diff --git a/code/modules/spells/spell_types/lichdom.dm b/code/modules/spells/spell_types/lichdom.dm index 0cbb3a8272..4a3621a52b 100644 --- a/code/modules/spells/spell_types/lichdom.dm +++ b/code/modules/spells/spell_types/lichdom.dm @@ -135,7 +135,7 @@ lich.hardset_dna(null,null,lich.real_name,null, new /datum/species/skeleton/space) to_chat(lich, "Your bones clatter and shudder as you are pulled back into this world!") var/turf/body_turf = get_turf(old_body) - lich.Knockdown(200 + 200*resurrections) + lich.DefaultCombatKnockdown(200 + 200*resurrections) resurrections++ if(old_body && old_body.loc) if(iscarbon(old_body)) diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index c4d2c34a71..885f88d09c 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -287,14 +287,14 @@ if(distfromcaster == 0) if(isliving(AM)) var/mob/living/M = AM - M.Knockdown(100, override_hardstun = 20) + M.DefaultCombatKnockdown(100, override_hardstun = 20) M.adjustBruteLoss(5) to_chat(M, "You're slammed into the floor by [user]!") else new sparkle_path(get_turf(AM), get_dir(user, AM)) //created sparkles will disappear on their own if(isliving(AM)) var/mob/living/M = AM - M.Knockdown(stun_amt, override_hardstun = stun_amt * 0.2) + M.DefaultCombatKnockdown(stun_amt, override_hardstun = stun_amt * 0.2) to_chat(M, "You're thrown back by [user]!") AM.throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user)//So stuff gets tossed around at the same time. diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index 161461d099..08ba28332a 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -272,7 +272,7 @@ cooldown = COOLDOWN_STUN for(var/V in listeners) var/mob/living/L = V - L.Knockdown(60 * power_multiplier) + L.DefaultCombatKnockdown(60 * power_multiplier) //SLEEP else if((findtext(message, sleep_words))) @@ -1215,7 +1215,7 @@ var/datum/status_effect/chem/enthrall/E = L.has_status_effect(/datum/status_effect/chem/enthrall) switch(E.phase) if(2 to INFINITY) - L.Knockdown(30 * power_multiplier * E.phase) + L.DefaultCombatKnockdown(30 * power_multiplier * E.phase) E.cooldown += 8 addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "You suddenly drop to the ground!"), 5) to_chat(user, "You encourage [L] to drop down to the ground.") diff --git a/code/modules/vehicles/cars/clowncar.dm b/code/modules/vehicles/cars/clowncar.dm index 1415604aff..0e9a7e76af 100644 --- a/code/modules/vehicles/cars/clowncar.dm +++ b/code/modules/vehicles/cars/clowncar.dm @@ -52,7 +52,7 @@ var/mob/living/L = M if(iscarbon(L)) var/mob/living/carbon/C = L - C.Knockdown(40) //I play to make sprites go horizontal + C.DefaultCombatKnockdown(40) //I play to make sprites go horizontal L.visible_message("[src] rams into [L] and sucks him up!") //fuck off shezza this isn't ERP. mob_forced_enter(L) playsound(src, pick('sound/vehicles/clowncar_ram1.ogg', 'sound/vehicles/clowncar_ram2.ogg', 'sound/vehicles/clowncar_ram3.ogg'), 75) diff --git a/code/modules/vehicles/scooter.dm b/code/modules/vehicles/scooter.dm index 0dd7ff32a8..cb53574653 100644 --- a/code/modules/vehicles/scooter.dm +++ b/code/modules/vehicles/scooter.dm @@ -71,7 +71,7 @@ var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinals)) unbuckle_mob(H) H.throw_at(throw_target, 4, 3) - H.Knockdown(100) + H.DefaultCombatKnockdown(100) H.adjustStaminaLoss(40) var/head_slot = H.get_item_by_slot(SLOT_HEAD) if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) @@ -199,7 +199,7 @@ var/atom/throw_target = get_edge_target_turf(H, pick(GLOB.cardinals)) unbuckle_mob(H) H.throw_at(throw_target, 4, 3) - H.Knockdown(30) + H.DefaultCombatKnockdown(30) H.adjustStaminaLoss(10) var/head_slot = H.get_item_by_slot(SLOT_HEAD) if(!head_slot || !(istype(head_slot,/obj/item/clothing/head/helmet) || istype(head_slot,/obj/item/clothing/head/hardhat))) diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index 30ae49ecd2..fc81e2ec00 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -93,7 +93,7 @@ mob_exit(i, null, randomstep) if(iscarbon(i)) var/mob/living/carbon/Carbon = i - Carbon.Knockdown(40) + Carbon.DefaultCombatKnockdown(40) /obj/vehicle/sealed/proc/DumpSpecificMobs(flag, randomstep = TRUE) for(var/i in occupants) @@ -101,7 +101,7 @@ mob_exit(i, null, randomstep) if(iscarbon(i)) var/mob/living/carbon/C = i - C.Knockdown(40) + C.DefaultCombatKnockdown(40) /obj/vehicle/sealed/AllowDrop() diff --git a/code/modules/vehicles/speedbike.dm b/code/modules/vehicles/speedbike.dm index 6526e6d89a..a560cbb8f3 100644 --- a/code/modules/vehicles/speedbike.dm +++ b/code/modules/vehicles/speedbike.dm @@ -76,7 +76,7 @@ playsound(src, 'sound/effects/bang.ogg', 50, 1) if(ishuman(A)) var/mob/living/carbon/human/H = A - H.Knockdown(100) + H.DefaultCombatKnockdown(100) H.adjustStaminaLoss(30) H.apply_damage(rand(20,35), BRUTE) if(!crash_all) diff --git a/modular_citadel/code/datums/status_effects/chems.dm b/modular_citadel/code/datums/status_effects/chems.dm index 8adc7c0745..08e5a762a3 100644 --- a/modular_citadel/code/datums/status_effects/chems.dm +++ b/modular_citadel/code/datums/status_effects/chems.dm @@ -547,7 +547,7 @@ if (statusStrength < 0) status = null owner.remove_movespeed_modifier(MOVESPEED_ID_MKULTRA) - owner.Knockdown(50) + owner.DefaultCombatKnockdown(50) to_chat(owner, "Your body gives out as the adrenaline in your system runs out.") else statusStrength -= 1 @@ -643,7 +643,7 @@ C.adjustArousalLoss(5) C.jitteriness += 100 C.stuttering += 25 - C.Knockdown(60) + C.DefaultCombatKnockdown(60) C.Stun(60) to_chat(owner, "Your muscles seize up, then start spasming wildy!") diff --git a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm index 9d0757e26e..44b8067876 100644 --- a/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm +++ b/modular_citadel/code/game/objects/items/devices/radio/shockcollar.dm @@ -45,7 +45,7 @@ s.set_up(3, 1, L) s.start() - L.Knockdown(100) + L.DefaultCombatKnockdown(100) if(master) master.receive_signal() diff --git a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm b/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm index b7843727df..5b20fe048b 100644 --- a/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm +++ b/modular_citadel/code/game/objects/structures/beds_chairs/chair.dm @@ -14,7 +14,7 @@ user.visible_message("[user] pulls [src] out from under [poordude].", "You pull [src] out from under [poordude].") var/C = new item_chair(loc) user.put_in_hands(C) - poordude.Knockdown(20)//rip in peace + poordude.DefaultCombatKnockdown(20)//rip in peace user.adjustStaminaLoss(5) unbuckle_all_mobs(TRUE) qdel(src) diff --git a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm index 0b6903c9fe..d9544313e0 100644 --- a/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm +++ b/modular_citadel/code/modules/mob/living/carbon/human/human_movement.dm @@ -8,7 +8,7 @@ to_chat(src, "You trip off of the elevated surface!") for(var/obj/item/I in held_items) accident(I) - Knockdown(80) + DefaultCombatKnockdown(80) /mob/living/carbon/human/movement_delay() . = 0 diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm index 98de5eed14..6437834e92 100644 --- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm +++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm @@ -55,7 +55,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! var/cachedstam = M.getStaminaLoss() var/totalstuntime = cachedstam * stamtostunconversion * (M.lying ? 2 : 1) if(!M.resting) - M.Knockdown(cachedstam*2) //BORK BORK. GET DOWN. + M.DefaultCombatKnockdown(cachedstam*2) //BORK BORK. GET DOWN. M.Stun(totalstuntime) user.do_attack_animation(A, ATTACK_EFFECT_BITE) user.start_pulling(M, TRUE) //Yip yip. Come with. @@ -284,7 +284,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! to_chat(R, "Insufficent Power!") return L.Stun(4) // normal stunbaton is force 7 gimme a break good sir! - L.Knockdown(80) + L.DefaultCombatKnockdown(80) L.apply_effect(EFFECT_STUTTER, 4) L.visible_message("[R] has shocked [L] with its tongue!", \ "[R] has shocked you with its tongue!") @@ -426,13 +426,13 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! var/mob/living/L = A if(!L.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK)) L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") - L.Knockdown(iscarbon(L) ? 60 : 45, override_stamdmg = CLAMP(pounce_stamloss, 0, pounce_stamloss_cap-L.getStaminaLoss())) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice. + L.DefaultCombatKnockdown(iscarbon(L) ? 60 : 45, override_stamdmg = CLAMP(pounce_stamloss, 0, pounce_stamloss_cap-L.getStaminaLoss())) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice. playsound(src, 'sound/weapons/Egloves.ogg', 50, 1) sleep(2)//Runtime prevention (infinite bump() calls on hulks) step_towards(src,L) log_combat(src, L, "borg pounced") else - Knockdown(15, 1, 1) + DefaultCombatKnockdown(15, 1, 1) pounce_cooldown = !pounce_cooldown spawn(pounce_cooldown_time) //3s by default @@ -440,7 +440,7 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm ! else if(A.density && !A.CanPass(src)) visible_message("[src] smashes into [A]!", "You smash into [A]!") playsound(src, 'sound/items/trayhit1.ogg', 50, 1) - Knockdown(15, 1, 1) + DefaultCombatKnockdown(15, 1, 1) if(leaping) leaping = 0 diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm index 5f3fc61fa7..7f6e1ea983 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/eigentstasium.dm @@ -101,7 +101,7 @@ if(addiction_stage == 11) to_chat(M, "You start to convlse violently as you feel your consciousness split and merge across realities as your possessions fly wildy off your body.") M.Jitter(200) - M.Knockdown(200) + M.DefaultCombatKnockdown(200) M.Stun(80) var/items = M.get_contents() if(!LAZYLEN(items)) @@ -155,7 +155,7 @@ do_sparks(5,FALSE,M) M.Sleeping(100, 0) M.Jitter(50) - M.Knockdown(100) + M.DefaultCombatKnockdown(100) to_chat(M, "You feel your eigenstate settle, snapping an alternative version of yourself into reality. All your previous memories are lost and replaced with the alternative version of yourself. This version of you feels more [pick("affectionate", "happy", "lusty", "radical", "shy", "ambitious", "frank", "voracious", "sensible", "witty")] than your previous self, sent to god knows what universe.") M.emote("me",1,"flashes into reality suddenly, gasping as they gaze around in a bewildered and highly confused fashion!",TRUE) log_game("FERMICHEM: [M] ckey: [M.key] has become an alternative universe version of themselves.") diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm index 6732fb06a5..b03773984f 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm @@ -41,7 +41,7 @@ M.visible_message("A pair of breasts suddenly fly out of the [M]!") var/T2 = get_random_station_turf() M.adjustBruteLoss(25) - M.Knockdown(50) + M.DefaultCombatKnockdown(50) M.Stun(50) B.throw_at(T2, 8, 1) M.reagents.remove_reagent(id, volume) @@ -200,7 +200,7 @@ M.visible_message("A penis suddenly flies out of the [M]!") var/T2 = get_random_station_turf() M.adjustBruteLoss(25) - M.Knockdown(50) + M.DefaultCombatKnockdown(50) M.Stun(50) P.throw_at(T2, 8, 1) M.reagents.remove_reagent(id, volume) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm index b3ee8f5b7f..e742ceb2e8 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm @@ -96,7 +96,7 @@ if(method == INJECT) var/turf/T = get_turf(M) M.adjustOxyLoss(15) - M.Knockdown(50) + M.DefaultCombatKnockdown(50) M.Stun(50) M.emote("cough") var/obj/item/toy/plush/P = pick(subtypesof(/obj/item/toy/plush))