From 21e8a74105911e9da95dcb2f303eeb40c4b2310a Mon Sep 17 00:00:00 2001 From: Adrer Date: Fri, 2 Jun 2023 20:00:33 +0200 Subject: [PATCH] Projectiles no longer have a chance to get blocked by broken grilles (#21138) * Projectiles no longer have a chance to get blocked by broken grilles * Better code is better * Removes errant space --------- Co-authored-by: adrermail@gmail.com --- code/game/objects/structures/grille.dm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 14990b6d649..3721c0f9c9e 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -110,15 +110,13 @@ take_damage(20, BRUTE, MELEE, 1) /obj/structure/grille/CanPass(atom/movable/mover, turf/target, height=0) + . = !density if(height==0) - return 1 + return TRUE if(istype(mover) && mover.checkpass(PASSGRILLE)) - return 1 - else - if(istype(mover, /obj/item/projectile)) - return prob(30) - else - return !density + return TRUE + if(istype(mover, /obj/item/projectile)) + return (prob(30) || !density) /obj/structure/grille/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE) . = !density