diff --git a/code/game/objects/structures/stool_bed_chair_nest/stools.dm b/code/game/objects/structures/stool_bed_chair_nest/stools.dm index 1b344d01f3..a2f18e8d81 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/stools.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/stools.dm @@ -49,7 +49,7 @@ icon = 'icons/obj/objects.dmi' icon_state = "stool" force = 10 - throwforce = 20 + throwforce = 10 w_class = 5.0 var/obj/structure/stool/origin = null diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 525c6203f4..5f4b3d7395 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -323,8 +323,8 @@ var/mob/living/M = G.affecting if (G.state < 2) if(user.a_intent == "hurt") - if (prob(5)) M.Weaken(3) - M.apply_damage(10) + if (prob(5)) M.Weaken(5) + M.apply_damage(6) visible_message("\red [G.assailant] slams [G.affecting] against \the [src]!") playsound(src.loc, 'sound/weapons/tablehit1.ogg', 50, 1) else @@ -591,4 +591,4 @@ visible_message("[user] smashes [src] apart!") new /obj/item/weapon/rack_parts(loc) density = 0 - del(src) + del(src) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e004099266..e1df286a2c 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -152,17 +152,18 @@ del(W) //gotta delete it here because if window breaks, it won't get deleted switch (state) if(1) - M.apply_damage(10) + M.apply_damage(7) hit(10) visible_message("\red [user] slams [M] against \the [src]!") if(2) - M.Weaken(2) - M.apply_damage(15) + if (prob(50)) + M.Weaken(1) + M.apply_damage(10) hit(25) visible_message("\red [user] bashes [M] against \the [src]!") if(3) - M.Weaken(10) - M.apply_damage(25) + M.Weaken(5) + M.apply_damage(20) hit(50) visible_message("\red [user] crushes [M] against \the [src]!") return