diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 467e77cdaf5..c21adad6263 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -6,6 +6,7 @@ density = 1 opacity = FALSE anchored = 1 + move_resist = INFINITY resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags_2 = RAD_NO_CONTAMINATE_2 max_integrity = 200 @@ -532,6 +533,7 @@ icon_state = "shieldwall" anchored = 1 density = 1 + move_resist = INFINITY resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF light_range = 3 var/needs_power = 0 diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 7621ea4cbfe..edb19428a50 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -58,6 +58,7 @@ req_access = list(ACCESS_ENGINE_EQUIP) siemens_strength = 1 damage_deflection = 10 + move_resist = INFINITY var/area/area var/areastring = null var/obj/item/stock_parts/cell/cell diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 2531e8b8da0..40418a61517 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -194,8 +194,9 @@ ..() if(ismovable(target)) var/atom/movable/M = target - var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src))) - M.throw_at(throw_target, 3, 2) + if(M.move_resist < INFINITY) + var/atom/throw_target = get_edge_target_turf(M, get_dir(src, get_step_away(M, src))) + M.throw_at(throw_target, 3, 2) /obj/item/projectile/bullet/meteorshot/New() ..()