diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index f5a870878a8..e62624cd5eb 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -556,7 +556,6 @@ - /////////////////////////////////// //////// Internal damage //////// /////////////////////////////////// diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 5b98be4d224..2f8a1b4697a 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -44,16 +44,28 @@ smooth_icon_neighbors(src) /obj/structure/table/ex_act(severity, target) - ..() - if(severity == 3) - if(prob(25)) - table_destroy(1) + switch(severity) + if(1) + qdel(src) + if(2) + if(prob(50)) + table_destroy(1) + else + qdel(src) + if(3) + if(prob(25)) + table_destroy(1) /obj/structure/table/blob_act() if(prob(75)) table_destroy(1) return +/obj/structure/table/mech_melee_attack(obj/mecha/M) + visible_message("[M.name] smashes [src] apart!") + playsound(src.loc, 'sound/weapons/punch4.ogg', 50, 1) + table_destroy(1) + /obj/structure/table/attack_alien(mob/living/user) user.do_attack_animation(src) playsound(src.loc, 'sound/weapons/bladeslice.ogg', 50, 1) @@ -446,6 +458,10 @@ rack_destroy() return +/obj/structure/rack/mech_melee_attack(obj/mecha/M) + visible_message("[M.name] smashes [src] apart!") + rack_destroy(1) + /obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0) if(height==0) return 1 if(src.density == 0) //Because broken racks -Agouri |TODO: SPRITE!| diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index d7ad8f5fbc3..3d7f31004cf 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -91,7 +91,7 @@ if(M.damtype == "brute") playsound(src, 'sound/weapons/punch4.ogg', 50, 1) visible_message("[M.name] has hit [src]!") - if(prob(5) && M.force > 20) + if(prob(hardness) && M.force > 20) dismantle_wall(1) visible_message("[src.name] smashes through the wall!") playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)