diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a7ea7d3c82..1f1d667648 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -141,7 +141,7 @@ target.Knockdown(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.throw_at(target_table, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check + target.throw_at(src, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check log_combat(user, target, "shoved", "onto [src] (table)") return TRUE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index e1835a2b1e..7f3f7fae40 100755 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -382,7 +382,7 @@ if(ismob(A) || .) A.ratvar_act() -/turf/proc/shove_act(mob/living/target, mob/living/user) +/turf/shove_act(mob/living/target, mob/living/user) for(var/obj/O in contents) if(O.shove_act(target, user)) return TRUE