diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index f0543e75ff..914f2a149a 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -192,7 +192,7 @@ Code:
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/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index b6695e0bc6..1cbf829bc6 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -110,7 +110,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)
@@ -612,4 +612,4 @@
icon_state = "sofacorner"
/obj/structure/chair/sofa/corner/handle_layer() //only the armrest/back of this chair should cover the mob.
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 6660b797bf..fa9c052aa3 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -147,7 +147,7 @@
/obj/structure/trap/cult/trap_effect(mob/living/L)
to_chat(L, "With a crack, the hostile constructs come out of hiding, stunning you!")
L.electrocute_act(10, src, safety = TRUE) // electrocute act does a message.
- L.Knockdown(20)
+ L.DefaultCombatKnockdown(20)
new /mob/living/simple_animal/hostile/construct/proteon/hostile(loc)
new /mob/living/simple_animal/hostile/construct/proteon/hostile(loc)
- QDEL_IN(src, 30)
\ No newline at end of file
+ QDEL_IN(src, 30)
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index c4c7ab2d7b..066249505d 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -272,7 +272,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/mob/living/simple_animal/hostile/sharks.dm b/code/modules/mob/living/simple_animal/hostile/sharks.dm
index c94e49b286..4e16a1f7bd 100644
--- a/code/modules/mob/living/simple_animal/hostile/sharks.dm
+++ b/code/modules/mob/living/simple_animal/hostile/sharks.dm
@@ -44,7 +44,7 @@
var/mob/living/carbon/L = .
if(istype(L))
if(prob(25))
- L.Knockdown(20)
+ L.DefaultCombatKnockdown(20)
L.visible_message("\the [src] knocks down \the [L]!")
diff --git a/code/modules/pool/pool_main.dm b/code/modules/pool/pool_main.dm
index f557500240..40aac0e88d 100644
--- a/code/modules/pool/pool_main.dm
+++ b/code/modules/pool/pool_main.dm
@@ -121,10 +121,10 @@
H.visible_message("[H] falls in the water!",
"You fall in the water!")
playsound(src, 'sound/effects/splash.ogg', 60, TRUE, 1)
- H.Knockdown(20)
+ H.DefaultCombatKnockdown(20)
return
else
- H.Knockdown(60)
+ H.DefaultCombatKnockdown(60)
H.adjustOxyLoss(5)
H.emote("cough")
H.visible_message("[H] falls in and takes a drink!",
@@ -135,19 +135,19 @@
H.visible_message("[H] falls in the drained pool!",
"You fall in the drained pool!")
H.adjustBruteLoss(7)
- H.Knockdown(80)
+ H.DefaultCombatKnockdown(80)
playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
else
H.visible_message("[H] falls in the drained pool, and cracks his skull!",
"You fall in the drained pool, and crack your skull!")
H.apply_damage(15, BRUTE, "head")
- H.Knockdown(200) // This should hurt. And it does.
+ H.DefaultCombatKnockdown(200) // This should hurt. And it does.
playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
playsound(src, 'sound/misc/crack.ogg', 100, TRUE)
else
H.visible_message("[H] falls in the drained pool, but had an helmet!",
"You fall in the drained pool, but you had an helmet!")
- H.Knockdown(40)
+ H.DefaultCombatKnockdown(40)
playsound(src, 'sound/effects/woodhit.ogg', 60, TRUE, 1)
else if(filled)
victim.adjustStaminaLoss(1)
diff --git a/code/modules/pool/pool_structures.dm b/code/modules/pool/pool_structures.dm
index 92350abf44..4cea485237 100644
--- a/code/modules/pool/pool_structures.dm
+++ b/code/modules/pool/pool_structures.dm
@@ -119,7 +119,7 @@
"You misstep!")
var/atom/throw_target = get_edge_target_turf(src, dir)
jumper.throw_at(throw_target, 0, 1, callback = CALLBACK(src, .proc/on_finish_jump, jumper))
- jumper.Knockdown(100)
+ jumper.DefaultCombatKnockdown(100)
jumper.adjustBruteLoss(10)
if(91 to 100)
@@ -156,4 +156,4 @@
to_chat(victim, "That was stupid of you..")
victim.visible_message("[victim] smashes into the ground!")
victim.apply_damage(50)
- victim.Knockdown(200)
+ victim.DefaultCombatKnockdown(200)