diff --git a/code/datums/components/knockback.dm b/code/datums/components/knockback.dm index 9c4cccd924..bd0d5ae352 100644 --- a/code/datums/components/knockback.dm +++ b/code/datums/components/knockback.dm @@ -60,4 +60,4 @@ throw_dir = turn(throw_dir, 180) throw_distance *= -1 var/atom/throw_target = get_edge_target_turf(throwee, throw_dir) - throwee.safe_throw_at(throw_target, throw_distance, 1, thrower, gentle = throw_gentle) + throwee.safe_throw_at(throw_target, throw_distance, 1, thrower) //, gentle = throw_gentle) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6b50df97dc..d2d72193b7 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -314,6 +314,3 @@ current_skin = choice icon_state = unique_reskin[choice] to_chat(M, "[src] is now skinned as '[choice]'.") - -/obj/proc/plunger_act(obj/item/plunger/P, mob/living/user, reinforced) - return diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm index 67ea32b7d4..3d106021de 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/demonic_frost_miner.dm @@ -354,6 +354,7 @@ Difficulty: Extremely Hard return COMPONENT_MOVABLE_BLOCK_PRE_MOVE /datum/status_effect/ice_block_talisman/on_remove() + . = ..() if(!owner.stat) to_chat(owner, "The cube melts!") owner.cut_overlay(cube) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 89693b0ffc..8eadf08abb 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -129,7 +129,7 @@ Difficulty: Hard continue to_chat(L, "[src]'s ground slam shockwave sends you flying!") var/turf/thrownat = get_ranged_target_turf_direct(src, L, 8, rand(-10, 10)) - L.throw_at(thrownat, 8, 2, src, TRUE, force = MOVE_FORCE_OVERPOWERING, gentle = TRUE) + L.throw_at(thrownat, 8, 2, src, TRUE) //, force = MOVE_FORCE_OVERPOWERING, gentle = TRUE) L.apply_damage(20, BRUTE) shake_camera(L, 2, 1) all_turfs -= T